summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-08-14 12:30:04 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-08-14 18:34:58 +0100
commitdd476485489c3044a8f603d0b4f0123ef33f9bd1 (patch)
tree4828cd42167049bc0d5bd05f1da09a7351e2bb4c
parentd4bd3417c76450f248952606bff7e586600e34a8 (diff)
In manpage move dgit.default.* to main CONFIGURATION section.
-rw-r--r--debian/changelog1
-rw-r--r--dgit.19
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 442b255..c577e02 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 ffb6746..b56a8fd 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