dgit-maint-merge(7): Tweak wording

[dgit.git] / dgit-maint-merge.7.pod

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 6d0db9919c356c56756094d91dc24b1c0c091ece..642b39ece3b39e8a55ec22e5413bd16f692c6dfe 100644 (file)
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -52,6 +52,16 @@ compress orig tarballs:
 
 =head1 INITIAL DEBIANISATION
 
+=head2 When upstream tags releases in git and releases identical tarballs
+
+Ideally upstream would make git tags, and tarball releases, which are
+completely identical to each other.  If this is the case then you can
+use the upstream tarballs directly.
+
+If you're not sure, use the procedure below under "When upstream
+releases only tarballs" only with a different upstream tag name.  Then
+use git diff to check that there are no differences.
+
 =head2 When upstream tags releases in git
 
 Suppose that the latest stable upstream release is 1.2.2, and this has
@@ -124,7 +134,7 @@ Now create I<debian/gbp.conf>:
 =over 4
 
     [DEFAULT]
-    upstream-branch = upsteram
+    upstream-branch = upstream
     debian-branch = master
     upstream-tag = %(version)s
 
@@ -184,7 +194,7 @@ changes to the upstream source:
 
 The Debian packaging of foo is maintained using dgit.  For the sake of
 an efficient workflow, Debian modifications to the upstream source are
-squashed into a single patch, rather than a series of quilt patches.
+squashed into a single diff, rather than a series of quilt patches.
 To obtain a patch queue for package version 1.2.3-1:
 
 =over 4
@@ -296,7 +306,11 @@ We create a DFSG-clean tag to merge to master:
 Before merging the new 1.2.3+dfsg tag to master, you should first
 determine whether it would be legally dangerous for the non-free
 material to be publicly accessible in the git history on
-B<dgit-repos>.  If it would be, pass B<--squash> to git-merge(1).
+B<dgit-repos>.
+If it would be dangerous, there is a big problem;
+in this case please consult your archive administrators
+(for Debian this is the dgit administrator dgit-owner@debian.org
+and the ftpmasters ftpmaster@ftp-master.debian.org).
 
 =head2 When upstream releases only tarballs