X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=a02e1fd757023f6d2ae10d855fb9537cca74e6e4;hp=22be1c9e2199244acf697bb747d1ed4c3fff1d43;hb=0060e3befbe283c90dcf6017ac8261168a6efe10;hpb=1d01e5ebb230a058093afa0058cde2429545fc54

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 22be1c9e..a02e1fd7 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -42,7 +42,7 @@ or which you aren't going to be able to upstream soon,
 it might be preferable to
 maintain the delta as a rebasing patch series.
 For such a workflow see for example
-dgit-maint-gbp(7).
+dgit-maint-debrebase(7) and dgit-maint-gbp(7).
 
 =head1 INITIAL DEBIANISATION
 
@@ -211,6 +211,8 @@ and obtain the corresponding orig.tar from the archive:
     % cd foo
     % origtargz
 
+=back
+
 Now dump any existing patch queue:
 
 =over 4
@@ -298,9 +300,14 @@ A single combined diff, containing all the changes, follows.
 
 =back
 
-Alternatively, this text could be added to README.source. However,
-this might distract from more important information present in the
-latter file.
+If you are using the version 1.0 source package format, this text
+should be added to README.source instead.  The version 1.0 source
+package format ignores debian/source/patch-header.
+
+If you're using the version 3.0 (quilt) source package format, you
+could add this text to README.source instead of
+debian/source/patch-header, but this might distract from more
+important information present in README.source.
 
 =head1 BUILDING AND UPLOADING