dgit-maint-merge(7): Fix a typo "upsteram"

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

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index d9dcb51075fa91ddca8a74c4c5225df7ea5e622d..f8e33b22efca328879a9836edc9b11a8ab0086f0 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
 
@@ -362,4 +372,4 @@ dgit(1), dgit(7)
 
 =head1 AUTHOR
 
-This tutorial was written and is maintained by Sean Whitton <spwhitton@spwhitton.name>.
+This tutorial was written and is maintained by Sean Whitton <spwhitton@spwhitton.name>.  It contains contributions from other dgit contributors too - see the dgit copyright file.