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 31da00bc8a417239cac07e2e77b616261d32bfdd..54407596dc905585d50f7a6d5a875d193f9ed3b3 100644 (file)
--- 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