Skip to content

Commit

Permalink
oda spelling check on branches doc
Browse files Browse the repository at this point in the history
  • Loading branch information
gerryRcom authored and jugmac00 committed Jul 17, 2024
1 parent dbdde8d commit e952eb0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .custom_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ POFileTranslator
PolicyandProcess
PolicyAndProcess
PolicyForDocumentingCustomDistributions
poller
POMsgID
pooler
portlets
Expand Down Expand Up @@ -485,6 +486,7 @@ wgrant's
whitespace
wildcherry
Wishlist
WorkingWithDbDevel
WorkingWithReviews
worktrees
wsgi
Expand Down
2 changes: 1 addition & 1 deletion .sphinx/spellingcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ matrix:
- .custom_wordlist.txt
output: .sphinx/.wordlist.dic
sources:
- _build/**/*.html|!_build/explanation/branches/index.html|!_build/explanation/code/index.html|!_build/explanation/security-policy/index.html|!_build/explanation/database-performance/index.html|!_build/explanation/url-traversal/index.html|!_build/explanation/navigation-menus/index.html|!_build/explanation/storm-migration-guide/index.html
- _build/**/*.html|!_build/explanation/code/index.html|!_build/explanation/security-policy/index.html|!_build/explanation/database-performance/index.html|!_build/explanation/url-traversal/index.html|!_build/explanation/navigation-menus/index.html|!_build/explanation/storm-migration-guide/index.html
pipeline:
- pyspelling.filters.html:
comments: false
Expand Down
10 changes: 5 additions & 5 deletions explanation/branches.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ It is also possible to submit directly to the **db-devel** branch.
Let's Try That in Words
-----------------------

Database changes can be destabilizing to other work, so we isolate them
Database changes can be destabilising to other work, so we isolate them
out into a separate branch (**db-devel**). Then there are two arenas for
stabilizing changes for deployment: **stable** (which ends up on
stabilising changes for deployment: **stable** (which ends up on
`qastaging <https://qastaging.launchpad.net>`__ and is fed from the
**master** branch), and **db-stable** (which ends up on
`staging <https://staging.launchpad.net>`__ and is fed from the
Expand All @@ -79,7 +79,7 @@ In summary:
with **db-devel**, sent as if it came from the Launchpad list. The
Launchpad list will be informed of merge failures, and Launchpad
developers will collectively be responsible for correcting them.
(***TODO: is this some internal list? Hmmm.***)
(***TODO: is this some internal list?***)

- Staging runs **db-stable**; qastaging runs **stable**. We will deploy
production DB schema changes from **db-stable**. (After a deployment,
Expand Down Expand Up @@ -155,8 +155,8 @@ Now create and land a merge proposal.
FAQ
---

Can I land a testfix before buildbot has finished a test run that has failed or will fail?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Can I land a test fix before buildbot has finished a test run that has failed or will fail?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Yes you can, and please do if appropriate, because this will mean that
other developers will not encounter a broken tree at all.
Expand Down

0 comments on commit e952eb0

Please sign in to comment.