From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Oct 2016 23:55:52 +0000 (+0000)
Subject: Merge remote-tracking branch 'spwhitton/wip.tutorials-new' into wip.tutorials
X-Git-Tag: archive/debian/2.9~12^2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6e7c6b8b8305f162cea9e3da85c24b3f21888a1a;hp=ff4921f5cad01048c3c97a06c4f0cc6ed08b9ae4

Merge remote-tracking branch 'spwhitton/wip.tutorials-new' into wip.tutorials
---

diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod
index 31da00bc..54407596 100644
--- a/dgit-maint-native.7.pod
+++ b/dgit-maint-native.7.pod
@@ -15,12 +15,16 @@ We expect that your git history is fast-forwarding.
 
 =item
 
-You must be prepared to tolerate a small amount of 
+You should be prepared to tolerate a small amount of
 ugliness in your git history
 in the form of merges which stitch
 the dgit-generated archive view
 into your maintainer history.
 
+This is to handle uploads that were not made with dgit,
+such as the uploads you made before switching to this workflow,
+or NMUs.
+
 =back
 
 =head2 Benefits