Merge ~cjwatson/launchpad:codespell-2.2.5 into launchpad:master

[Colin Watson]

Upgrade to codespell 2.2.5

This involved a number of spelling corrections, and ignoring "optiona" which legitimately turns up in `lib/lp/registry/stories/team-polls/edit-options.rst` (as "OptionA") but looks like a misspelling of "optional".

[Guruprasad (lgp171188)]

LGTM 👍

review: Approve

diff --git a/.codespell-ignore b/.codespell-ignore
index 1d1422b..7af0ae1 100644
--- a/.codespell-ignore
+++ b/.codespell-ignore
@@ -7,6 +7,7 @@ fpr
 importd
 iterm
 lightening
+optiona
 serieses
 sting
 tread
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dab74e2..ead3e42 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -82,7 +82,7 @@ repos:
     hooks:
     -   id: shellcheck
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.2.2
+    rev: v2.2.5
     hooks:
     -   id: codespell
         args: ["-I", ".codespell-ignore"]
diff --git a/lib/lp/answers/tests/emailinterface.rst b/lib/lp/answers/tests/emailinterface.rst
index fa182bc..d8fa1f3 100644
--- a/lib/lp/answers/tests/emailinterface.rst
+++ b/lib/lp/answers/tests/emailinterface.rst
@@ -242,8 +242,8 @@ From the Expired state:
 
 From the Expired state, the other possibility is the less probable
 explaining that the owner solved their problem. Again, to minimize
-confusion, the outoing notification contain a footer explaining what
-will happen if one reply to the message.
+confusion, the outgoing notification contain a footer explaining what
+will happen if one replies to the message.
 
 Solved and Invalid
 ..................
diff --git a/lib/lp/app/javascript/tests/test_lp_client.js b/lib/lp/app/javascript/tests/test_lp_client.js
index 5c00536..b99cd13 100644
--- a/lib/lp/app/javascript/tests/test_lp_client.js
+++ b/lib/lp/app/javascript/tests/test_lp_client.js
@@ -519,7 +519,7 @@ YUI.add('lp.client.test', function (Y) {
                 null, this.response, this.args);
 
             // If the response does not include a notifications header, then
-                // any pre-existing notifiactions are not removed.
+            // any pre-existing notifications are not removed.
             this.response.setResponseHeader('X-Lazr-Notifications', null);
             Y.lp.client.wrap_resource_on_success(
                 null, this.response, this.args);
diff --git a/lib/lp/blueprints/stories/blueprints/xx-superseding-within-projects.rst b/lib/lp/blueprints/stories/blueprints/xx-superseding-within-projects.rst
index 365caa3..ed2e705 100644
--- a/lib/lp/blueprints/stories/blueprints/xx-superseding-within-projects.rst
+++ b/lib/lp/blueprints/stories/blueprints/xx-superseding-within-projects.rst
@@ -1,5 +1,5 @@
-Superseeding blueprints
-=======================
+Superseding blueprints
+======================
 
 Bueprints can only be superseded by other blueprints in the same project.
 The user interface code for the superseding form passes blueprints by their
diff --git a/lib/lp/registry/javascript/tests/test_structural_subscription.js b/lib/lp/registry/javascript/tests/test_structural_subscription.js
index 2bd6853..dbec3e9 100644
--- a/lib/lp/registry/javascript/tests/test_structural_subscription.js
+++ b/lib/lp/registry/javascript/tests/test_structural_subscription.js
@@ -1054,7 +1054,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
     }));
 
     tests.suite.add(new Y.Test.Case({
-        name: 'Structural Subscription: add subcription workflow',
+        name: 'Structural Subscription: add subscription workflow',
 
         setUp: function() {
             var TestBugFilter = function() {};
@@ -1176,7 +1176,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
 
         test_description_is_added: function() {
             // If we add a subscription on a page that doesn't display
-            // subcription details then we need to add an "informational
+            // subscription details then we need to add an "informational
             // message" describing the just-added subscription.
             var handler;
             var config = {add_filter_description: false};
@@ -1190,7 +1190,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
     }));
 
     tests.suite.add(new Y.Test.Case({
-        name: 'Structural Subscription: edit subcription workflow',
+        name: 'Structural Subscription: edit subscription workflow',
 
         setUp: function() {
             var TestBugFilter = function(data) {
diff --git a/lib/lp/registry/stories/announcements/xx-announcements.rst b/lib/lp/registry/stories/announcements/xx-announcements.rst
index 9161479..a051a28 100644
--- a/lib/lp/registry/stories/announcements/xx-announcements.rst
+++ b/lib/lp/registry/stories/announcements/xx-announcements.rst
@@ -411,7 +411,7 @@ any links to show announcements.
     >>> count_show_links(anon_browser.contents)
     0
 
-Distribution pages may have the link in the annoucements portlet,
+Distribution pages may have the link in the announcements portlet.
 
     >>> anon_browser.open("http://launchpad.test/ubuntu")
     >>> count_show_links(anon_browser.contents)
diff --git a/lib/lp/services/doc/sprites.rst b/lib/lp/services/doc/sprites.rst
index a582bd1..c6c0270 100644
--- a/lib/lp/services/doc/sprites.rst
+++ b/lib/lp/services/doc/sprites.rst
@@ -41,7 +41,7 @@ A SpriteUtil object currently can only process a single group.
 Loading the CSS Template
 ------------------------
 
-Instatiating a new SpriteUtil object will parse the css template and
+Instantiating a new SpriteUtil object will parse the css template and
 find all the css rules for the specified group. The url_prefix_substitutions
 parameter allows you to convert url prefixes into file paths relative
 to the directory passed into combineImages(). The space between sprites
diff --git a/lib/lp/soyuz/doc/archive.rst b/lib/lp/soyuz/doc/archive.rst
index 3c14ec2..00b89b5 100644
--- a/lib/lp/soyuz/doc/archive.rst
+++ b/lib/lp/soyuz/doc/archive.rst
@@ -1019,15 +1019,15 @@ package copy request:
     >>> from lp.testing.factory import (
     ...     remove_security_proxy_and_shout_at_engineer,
     ... )
-    >>> requestor = factory.makePerson(name="me-copy")
+    >>> requester = factory.makePerson(name="me-copy")
     >>> copy_target = factory.makeCopyArchiveLocation(
-    ...     distribution=ubuntu, name="my-copy-archive", owner=requestor
+    ...     distribution=ubuntu, name="my-copy-archive", owner=requester
     ... )
     >>> naked_copy_target = remove_security_proxy_and_shout_at_engineer(
     ...     copy_target
     ... )
     >>> pcr = ubuntu.main_archive.requestPackageCopy(
-    ...     naked_copy_target, requestor
+    ...     naked_copy_target, requester
     ... )
     >>> print(pcr)
     Package copy request
@@ -1041,7 +1041,7 @@ package copy request:
 The requestPackageCopy method can also take an optional suite name:
 
     >>> package_copy_request = ubuntu.main_archive.requestPackageCopy(
-    ...     naked_copy_target, requestor, suite="hoary-updates"
+    ...     naked_copy_target, requester, suite="hoary-updates"
     ... )
     >>> print(package_copy_request)
     Package copy request
diff --git a/lib/lp/soyuz/stories/webservice/xx-archive.rst b/lib/lp/soyuz/stories/webservice/xx-archive.rst
index a2a2242..b53d7d3 100644
--- a/lib/lp/soyuz/stories/webservice/xx-archive.rst
+++ b/lib/lp/soyuz/stories/webservice/xx-archive.rst
@@ -1484,7 +1484,7 @@ be able to access Celso's private PPA.
     ... )
 
 Note that the 'description' and the 'signing_key_fingerprint'
-attributes are only exposed when the requestor has View permission in
+attributes are only exposed when the requester has View permission in
 the IArchive context, in this case only Celso has it.
 
     >>> pprint_entry(