From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 20 Jul 2015 12:41:27 +0000 (+0100)
Subject: Manpage: Better cross-references for -k and keyid.
X-Git-Tag: debian/1.1~64
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b49212f0b194ccbb483e213d14e97ed53da36e2b

Manpage: Better cross-references for -k and keyid.
---

diff --git a/debian/changelog b/debian/changelog
index dfcfcbd1..dea72b5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ dgit (1.1) unstable; urgency=low
     to dgit history.
   * Remove stray sentence in config section of manpage.
   * Manpage: Clarify wording of readonly config.
+  * Manpage: Better cross-references for -k and keyid.
 
  --
 
diff --git a/dgit.1 b/dgit.1
index 05a9cd14..60e6a25d 100644
--- a/dgit.1
+++ b/dgit.1
@@ -243,7 +243,11 @@ servers.
 .BI -k keyid
 Use
 .I keyid
-for signing the tag and the upload.
+for signing the tag and the upload.  The default comes from the
+distro's
+.B keyid
+config setting (see CONFIGURATION, below), or failing that, gnupg's
+default.
 .TP
 .BR --no-sign
 does not sign tags or uploads (meaningful only with push).
@@ -459,7 +463,12 @@ Usually, for passing options to dpkg-genchanges, you should use
 See notes above regarding ssh and dgit.
 
 NB that --gpg:option is not supported (because debsign does not
-have that facility).  But see -k.
+have that facility).
+But see
+.B -k
+and the
+.B keyid
+distro config setting.
 .TP
 .BR -d "\fIdistro\fR | " --distro= \fIdistro\fR
 Specifies that the suite to be operated on is part of distro
@@ -612,6 +621,8 @@ but, setting this to false will avoid relying on the mirror of the dgit
 git repository server.
 .TP
 .BI dgit-distro. distro .keyid
+See also
+.BR -k .
 .TP
 .BI dgit-distro. distro .mirror " url"
 .TP