From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 30 Oct 2016 23:54:35 +0000 (-0700)
Subject: dgit-maint-native(7): Soften warning about ugliness
X-Git-Tag: archive/debian/2.9~12^2^2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=da9ec7d77f9c3f691d19f87b1117b505b0d58c5b;p=dgit.git

dgit-maint-native(7): Soften warning about ugliness

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---

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