git-debrebase manpages: Fix typos and etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index c49a0abdf3b1b24ecfd8cb4de39536fbb9732b1c..a70ec3849edd9985f6ea6b5a3ef4a06b0f868def 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 dgit (5.1~) unstable; urgency=medium
 
-  * 
+  * git-debrebase manpages: Fix typos and etc.
 
  --
 

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 6168e144dc057e50c96c0c5c7f34747d81373f56..1c3e68128f0e4967e90d1bb9e219b43b075e57a9 100644 (file)
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -15,11 +15,11 @@ Debian packages based on upstream source code.
 
 This is the command line reference.
 Please read the tutorial
-L<dgit-maint-debrebase(5)>.
+L<dgit-maint-debrebase(7)>.
 For background, theory of operation,
 and definitions see L<git-debrebase(5)>.
 
-You should read this manpage in conjunction with
+You should read this manpage in cojnunction with
 L<git-debrebase(5)/TERMINOLOGY>,
 which defines many important terms used here.
 
@@ -57,10 +57,10 @@ to distinguish them from options for git-debrebase.
 
 =item git-debrebase status
 
-Analyise the current branch,
-both in terms of its conents,
+Analyses the current branch,
+both in terms of its contents,
 and the refs which are relevant to git-debrebase,
-and print a human-readable summary.
+and prints a human-readable summary.
 
 Please do not attempt to parse the output;
 it may be reformatted or reorganised in the future.
@@ -343,7 +343,7 @@ Turns snag(s) with id <snag-id> into warnings.
 Some troublesome things which git-debrebase encounters
 are B<snag>s.
 (The specific instances are discussed
-in the text for the relvant operation.)
+in the text for the relevant operation.)
 
 When a snag is detected,
 a message is printed to stderr containing the snag id

diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index 5cfa3761080eb5c6accffa98cfd6682b72cbffa0..e445c0e6001354bd337d8b01f7b8859ed98150d1 100644 (file)
--- a/git-debrebase.5.pod
+++ b/git-debrebase.5.pod
@@ -24,7 +24,7 @@ itself is not very suitable for use by Debian derivatives,
 to work on packages inherited from Debian,
 because it assumes that you want to throw away any packaging
 provided by your upstream.
-However, of git-debrebase in Debian does not make anything harder for
+However, use of git-debrebase in Debian does not make anything harder for
 derivatives, and it can make some things easier.
 
 =head1 TERMINOLOGY
@@ -177,7 +177,7 @@ known as B<unstitched>.
 While a branch is unstitched,
 it is not in interchange format.
 The previous interchange branch tip
-tip is recorded,
+is recorded,
 so that the previous history
 and the user's work
 can later be
@@ -381,8 +381,8 @@ general merges on any of the relevant branches.
 For this reason the tools will try to help the user
 avoid divergence of the interchange branch.
 
-See dgit-maint-rebase(7) XXX TBD
-for a discussio of what kinds of behaviours
+See dgit-maint-rebase(7)
+for a discussion of what kinds of behaviours
 should be be avoided
 because
 they might generate such merges.
@@ -401,7 +401,7 @@ Nonlinear (merging) history in the breakwater branch is
 in principle tolerable,
 but each of the parents would have to be, in turn,
 a breakwater,
-and difficult qeustions arise if they don't have the same anchor.
+and difficult questions arise if they don't have the same anchor.
 
 We use the commit message annotation to
 distinguish the special anchor merges from other general merges,
@@ -511,7 +511,8 @@ The full set of annotations is:
 
 Only anchor merges have the C<[git-debrebase anchor: ...]> tag.
 Single-parent anchors are not generated by git-debrebase,
-and when made manually should not be tagged.
+and when made manually should not
+contain any C<[git-debrebase ...]> annotation.
 
 The C<split mixed commit> and C<convert dgit import>
 tags are added to the pre-existing commit message,