X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-nmu-simple.7.pod;h=057f1c8511c16e2ce46242d287c5905090c0a875;hp=56b399a6d683aed654ee8217485b9c9043dbfcfe;hb=257cbdd6d28d62dc41650774054d2e2dd923c91a;hpb=c4dea463ddc76cf7e39612dbdce3b18a5a0db957

diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod
index 56b399a6..057f1c85 100644
--- a/dgit-nmu-simple.7.pod
+++ b/dgit-nmu-simple.7.pod
@@ -15,7 +15,7 @@ The Debian Developers' Reference has some
 (sometimes questionable) guidance on this.
 
 Conversely, you do not need to know anything
-about the usual maintainer's workflow.
+about the usual maintainer's git workflow.
 If appropriate, you can work on many different packages,
 making similar changes,
 without worrying about the individual maintainers' git practices.
@@ -39,10 +39,11 @@ consult the appropriate C<dgit-maint-*(7)> workflow tutorial,
     % dgit clone glibc jessie
     % cd glibc
     % git am ~/glibc-security-fix.diff
-    [ edit debian/changelog to introduce a ~ version, and commit it ]
+    % dch --nmu Apply upstream's fix for foo bug.
+    % git add debian/changelog && git commit -m"NMU changelog entry"
     % dpkg-buildpackage -uc -b
     [ run your tests ]
-    [ edit debian/changelog to prepare for release, and commit it ]
+    % dch -r && git add debian/changelog && git commit -m"Finalise NMU"
     % dgit -wgf sbuild -A -c jessie
     [ final tests on generated .debs ]
     % dgit -wgf push jessie