Merge lp:~cjwatson/launchpad/assorted-typos into lp:launchpad

[Colin Watson]

Fix an assortment of minor typos.

[William Grant (wgrant)]

But how

review: Approve (code)

=== modified file 'lib/lp/app/utilities/celebrities.py'
--- lib/lp/app/utilities/celebrities.py	2016-04-11 08:31:24 +0000
+++ lib/lp/app/utilities/celebrities.py	2018-12-04 15:06:53 +0000
@@ -22,7 +22,7 @@
 class MutatedCelebrityError(Exception):
     """A celebrity has had its id or name changed in the database.
 
-    This would indicate a major prodution screwup.
+    This would indicate a major production screwup.
     """
 
 
 
=== modified file 'lib/lp/archivepublisher/customupload.py'
--- lib/lp/archivepublisher/customupload.py	2018-05-06 08:52:34 +0000
+++ lib/lp/archivepublisher/customupload.py	2018-12-04 15:06:53 +0000
@@ -89,7 +89,7 @@
     """A build for this type, architecture, and version already exists."""
     def __init__(self, custom_type, arch, version):
         message = ('%s build %s for architecture %s already exists' %
-                   (custom_type, arch, version))
+                   (custom_type, version, arch))
         CustomUploadError.__init__(self, message)
 
 
 
=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py	2017-09-17 10:35:57 +0000
+++ lib/lp/archiveuploader/nascentupload.py	2018-12-04 15:06:53 +0000
@@ -343,7 +343,7 @@
             # by one.
             max += 1
         if len(considered_archs) > max:
-            self.reject("Upload has more architetures than it is supported.")
+            self.reject("Upload has more architectures than is supported.")
 
     def _matchDDEBs(self):
         """Check and link DEBs and DDEBs in the upload.
 
=== modified file 'lib/lp/code/interfaces/hasgitrepositories.py'
--- lib/lp/code/interfaces/hasgitrepositories.py	2015-03-05 16:23:26 +0000
+++ lib/lp/code/interfaces/hasgitrepositories.py	2018-12-04 15:06:53 +0000
@@ -17,7 +17,8 @@
     """An object that has related Git repositories.
 
     A project contains Git repositories, a source package on a distribution
-    contains branches, and a person contains "personal" branches.
+    contains Git repositories, and a person contains "personal" Git
+    repositories.
     """
 
     export_as_webservice_entry(
 
=== modified file 'lib/lp/registry/services/sharingservice.py'
--- lib/lp/registry/services/sharingservice.py	2015-10-01 10:25:19 +0000
+++ lib/lp/registry/services/sharingservice.py	2018-12-04 15:06:53 +0000
@@ -87,7 +87,7 @@
     """Service providing operations for adding and removing pillar grantees.
 
     Service is accessed via a url of the form
-    '/services/sharing?ws.op=...
+    '/+services/sharing?ws.op=...
     """
 
     @property
 
=== modified file 'lib/lp/soyuz/scripts/ppakeygenerator.py'
--- lib/lp/soyuz/scripts/ppakeygenerator.py	2015-09-26 02:02:11 +0000
+++ lib/lp/soyuz/scripts/ppakeygenerator.py	2018-12-04 15:06:53 +0000
@@ -19,7 +19,7 @@
 
 class PPAKeyGenerator(LaunchpadCronScript):
 
-    usage = '%prog [-p PPA owner]'
+    usage = '%prog [-A archive-reference]'
     description = 'Generate a GPG signing key for PPAs.'
 
     def add_my_options(self):