From d0a1aaa277603f5e2df546481fecee5a6ab05772 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Mon, 9 Feb 2004 19:23:58 +0000
Subject: [PATCH] * gpg.sgml: Clarify -u/--local-user and --default-key.

---
 doc/ChangeLog |  4 ++++
 doc/gpg.sgml  | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 84fd27320..39509b40a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-09  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.sgml: Clarify -u/--local-user and --default-key.
+
 2004-02-03  David Shaw  <dshaw@jabberwocky.com>
 
 	* gnupg.7: Clarify that 'gpgv' doesn't encrypt, and that's not a
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index abc6b2091..851c7bb4e 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -798,21 +798,18 @@ non-Windows platforms.
 <varlistentry>
 <term>-u, --local-user &ParmName;</term>
 <listitem><para>
-Use &ParmName; as the user ID to sign with.  This option is silently
-ignored for the list commands, so that it can be used in an options
-file.
+Use &ParmName; as the key to sign with.  Note that this option
+overrides --default-key.
 </para></listitem></varlistentry>
 
-
 <varlistentry>
 <term>--default-key &ParmName;</term>
 <listitem><para>
-Use &ParmName; as default user ID for signatures.  If this
-is not used the default user ID is the first user ID
-found in the secret keyring.
+Use &ParmName; as the default key to sign with.  If this option is not
+used, the default key is the first key found in the secret keyring.
+Note that -u or --local-user overrides this option.
 </para></listitem></varlistentry>
 
-
 <varlistentry>
 <term>-r, --recipient &ParmName;</term>
 <term></term>
@@ -882,8 +879,8 @@ Try to be as quiet as possible.
 <term>-z &ParmN;, --compress-level &ParmN;</term>
 <listitem><para>
 Set compression level to &ParmN;. A value of 0 for &ParmN; disables
-compression. Default is to use the default compression level of zlib
-(normally 6).
+compression.  The default is to use the default compression level of
+zlib (normally 6).
 </para></listitem></varlistentry>
 
 
@@ -2313,7 +2310,7 @@ option is intended for external programs that call GnuPG to perform
 tasks, and is thus not generally useful.  See the file
 <filename>doc/DETAILS</filename> in the source distribution for the
 details of which configuration items may be listed.  --list-config is
-only useful with --with-colons set.
+only usable with --with-colons set.
 </para></listitem></varlistentry>
 
 </variablelist>