Merge lp:~jelmer/brz/doc-typos into lp:brz

[Jelmer Vernooij]

Fix two typos in command help.

Fix two typos in command help.

Found by lintian.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/_known_graph_pyx.pyx'
--- breezy/_known_graph_pyx.pyx	2018-07-01 22:21:53 +0000
+++ breezy/_known_graph_pyx.pyx	2019-01-27 18:59:14 +0000
@@ -649,7 +649,7 @@
     def get_parent_keys(self, key):
         """Get the parents for a key
 
-        Returns a list containg the parents keys. If the key is a ghost,
+        Returns a list containing the parents keys. If the key is a ghost,
         None is returned. A KeyError will be raised if the key is not in
         the graph.
 
@@ -661,7 +661,7 @@
     def get_child_keys(self, key):
         """Get the children for a key
 
-        Returns a list containg the children keys. A KeyError will be raised
+        Returns a list containing the children keys. A KeyError will be raised
         if the key is not in the graph.
 
         :param keys: Key to check (eg revision_id)
 
=== modified file 'breezy/_patiencediff_c.c'
--- breezy/_patiencediff_c.c	2018-07-12 18:25:59 +0000
+++ breezy/_patiencediff_c.c	2019-01-27 18:59:14 +0000
@@ -963,7 +963,7 @@
 static char PatienceSequenceMatcher_get_grouped_opcodes_doc[] =
     "Isolate change clusters by eliminating ranges with no changes.\n"
     "\n"
-    "Return a list of groups with upto n lines of context.\n"
+    "Return a list of groups with up to n lines of context.\n"
     "Each group is in the same format as returned by get_opcodes().\n"
     "\n"
     ">>> from pprint import pprint\n"
 
=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2019-01-04 21:21:12 +0000
+++ breezy/builtins.py	2019-01-27 18:59:14 +0000
@@ -3479,7 +3479,7 @@
 
     :Things to note:
 
-      If you accidentially commit the wrong changes or make a spelling
+      If you accidentally commit the wrong changes or make a spelling
       mistake in the commit message say, you can use the uncommit command
       to undo it. See ``brz help uncommit`` for details.
 
@@ -4798,7 +4798,7 @@
     update command.
 
     Uncommitted changes to files that are reverted will be discarded.
-    Howver, by default, any files that have been manually changed will be
+    However, by default, any files that have been manually changed will be
     backed up first.  (Files changed only by merge are not backed up.)  Backup
     files have '.~#~' appended to their name, where # is a number.
 
 
=== modified file 'breezy/bzr/_dirstate_helpers_pyx.pyx'
--- breezy/bzr/_dirstate_helpers_pyx.pyx	2018-09-11 02:50:43 +0000
+++ breezy/bzr/_dirstate_helpers_pyx.pyx	2019-01-27 18:59:14 +0000
@@ -262,7 +262,7 @@
     children appear. But all grandchildren come after all children.
 
     In other words, all entries in a directory are sorted together, and
-    directorys are sorted in cmp_by_dirs order.
+    directories are sorted in cmp_by_dirs order.
 
     :param path1: first path
     :param path2: the second path