dgit-maint-merge(7): updates re #852090: suggestions by me

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

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 47ac4a07143e75144dc9220615b4bdcfa4c0be46..b0f395d926e3952c9223dcb32cb0f94e8d0140bf 100644 (file)
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -238,16 +238,16 @@ source package format.
 
 =head2 Sample text for debian/source/patch-header
 
 
 =head2 Sample text for debian/source/patch-header
 

-It is a good idea to explain how a user can obtain a break down of the
+It is a good idea to explain how a user can obtain a breakdown of the

 changes to the upstream source:
 
 =over 4
 
 The Debian packaging of foo is maintained in git,
 using the merging workflow described in dgit-maint-merge(7).
 changes to the upstream source:
 
 =over 4
 
 The Debian packaging of foo is maintained in git,
 using the merging workflow described in dgit-maint-merge(7).

-An automatically generated representation of the Debian changes follows.
+There isn't a patch queue that can be represented as a quilt series.

 
 

-A detailed break down of these changes is available from their
+A detailed breakdown of the changes is available from their

 canonical representation -
 git commits in the packaging repository.
 For example, to see the changes made by the Debian maintainer in the
 canonical representation -
 git commits in the packaging repository.
 For example, to see the changes made by the Debian maintainer in the


@@ -265,6 +265,8 @@ See dgit-maint-merge(7) for more information.
 (If you have dgit, use dgit clone foo,
 rather than plain git clone.)
 
 (If you have dgit, use dgit clone foo,
 rather than plain git clone.)
 

+A single combined diff, representating all the changes, follows.
+

 =back
 
 Alternatively, this text could be added to README.source. However,
 =back
 
 Alternatively, this text could be added to README.source. However,