From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 14 Aug 2015 11:30:04 +0000 (+0100)
Subject: In manpage move dgit.default.* to main CONFIGURATION section.
X-Git-Tag: debian/1.2~18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=dd476485489c3044a8f603d0b4f0123ef33f9bd1

In manpage move dgit.default.* to main CONFIGURATION section.
---

diff --git a/debian/changelog b/debian/changelog
index 442b2557..c577e024 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dgit (1.2~~) UNRELEASED; urgency=low
     are used for authenticating pushes.
   * Correct manpage cross-reference to point to browse.d.d.o.
   * Honour *.clean-mode configuration setting for --clean= mode.
+  * In manpage move dgit.default.* to main CONFIGURATION section.
 
  --
 
diff --git a/dgit.1 b/dgit.1
index ffb67468..b56a8fd7 100644
--- a/dgit.1
+++ b/dgit.1
@@ -634,6 +634,11 @@ which is involved.  The config used is thereafter that for the distro.
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.
 .TP
+.BR dgit.default. *
+for each
+.BR dgit-distro. \fIdistro\fR . *,
+the default value used if there is no distro-specific setting.
+.TP
 .BR dgit-distro. \fIdistro\fR .clean-mode
 One of the values for the command line --clean= option; used if
 --clean is not specified.
@@ -730,10 +735,6 @@ or when pushing and
 .BR dgit-distro. \fIdistro\fR . ( git | sshpsql ) - ( user | host | user-force )
 .TP
 .BI dgit-distro. distro .backports-quirk
-.TP
-.BR dgit.default. *
-for each
-.BR dgit-distro. \fIdistro\fR . *
 .SH ENVIRONMENT VARIABLES
 .TP
 .BR DGIT_SSH ", " GIT_SSH