Test suite: orig-include-exclude: Remove some commented-out obsolete bit

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index a26f6bc0dea545af6d7742829fd6303f7d4e27e3..0d395ff5d374156d85b80dbdecb6cfb283203a2a 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -38,8 +38,8 @@ lb l.
 dgit-user(7)   for users: editing, building and sharing packages
 dgit-nmu-simple(7)     for DDs: doing a straightforward NMU
 dgit-maint-native(7)   for maintainers of Debian-native packages
 dgit-user(7)   for users: editing, building and sharing packages
 dgit-nmu-simple(7)     for DDs: doing a straightforward NMU
 dgit-maint-native(7)   for maintainers of Debian-native packages

-dgit-maint-merge(7)    for maintainers: using a merging git workflow
-dgit-maint-gbp(7)      for maintainers: using git-buildpackage
+dgit-maint-merge(7)    for maintainers who want a pure git workflow
+dgit-maint-gbp(7)      for maintainers already using git-buildpackage

 dgit-sponsorship(7)    for sponsors and sponsored contributors
 .TE
 .LP
 dgit-sponsorship(7)    for sponsors and sponsored contributors
 .TE
 .LP


@@ -710,6 +710,8 @@ Specifies a single additional option to pass to
 .BR sbuild ,
 .BR ssh ,
 .BR dgit ,
 .BR sbuild ,
 .BR ssh ,
 .BR dgit ,

+.BR apt-get ,
+.BR apt-cache ,

 .BR gbp-pq ,
 .BR gbp-build ,
 or
 .BR gbp-pq ,
 .BR gbp-build ,
 or


@@ -755,6 +757,8 @@ Specifies alternative programs to use instead of
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,

+.BR apt-get ,
+.BR apt-cache ,

 .BR git ,
 .BR gbp-pq ,
 .BR gbp-build ,
 .BR git ,
 .BR gbp-pq ,
 .BR gbp-build ,


@@ -879,6 +883,9 @@ Settings likely to be useful for an end user include:
 Specifies the distro for a suite.  dgit keys off the suite name (which
 appears in changelogs etc.), and uses that to determine the distro
 which is involved.  The config used is thereafter that for the distro.
 Specifies the distro for a suite.  dgit keys off the suite name (which
 appears in changelogs etc.), and uses that to determine the distro
 which is involved.  The config used is thereafter that for the distro.

+
+.I suite
+may be a glob pattern.

 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.
 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.