summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2007-07-17 20:11:24 +0200
committerWerner Koch <wk@gnupg.org>2007-07-17 20:11:24 +0200
commit11573b09c4a00c94107edd40ec84c7de4008151e (patch)
treec98e84d1c790a82ec0e94be1b7d86f7cbb24981f /doc
parent2007-07-16 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-11573b09c4a00c94107edd40ec84c7de4008151e.tar.xz
gnupg2-11573b09c4a00c94107edd40ec84c7de4008151e.zip
Typo fixes.
Made --default-key work for gpgsm Add --default-key and --encrypt-to to gpgconf.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/gpgsm.texi8
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ec629cbaa..b74589576 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-17 Werner Koch <wk@g10code.com>
+
+ * gpgsm.texi (Input and Output): Document --default-key.
+
2007-07-04 Werner Koch <wk@g10code.com>
* gpl.texi: Updated to GPLv3.
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index b318ab877..23e88afeb 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -457,6 +457,14 @@ that @command{gpgsm} itself automagically imports any file with a
passphrase encoded to the most commonly used encodings.
+@item --default-key @var{user_id}
+@opindex default-key
+Use @var{user_id} as the standard key for signing. This key is used if
+no other key has been defined as a signing key. Note, that the first
+@option{--local-users} option also sets this key if it has not yet been
+set; however @option{--default-key} always overrides this.
+
+
@item --local-user @var{user_id}
@item -u @var{user_id}
@opindex local-user