aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Kibbey <[email protected]>2012-04-04 00:53:21 +0000
committerWerner Koch <[email protected]>2012-04-04 09:56:48 +0000
commit108e8f622ef9cfa256707debec1d379ce3cf21ca (patch)
treea88396cc1b235ebd2271dd5ce9731a125bc6ebd1
parentDocument PRESET_PASSPHRASE. (diff)
downloadgnupg-108e8f622ef9cfa256707debec1d379ce3cf21ca.tar.gz
gnupg-108e8f622ef9cfa256707debec1d379ce3cf21ca.zip
Document GENKEY options.
-rw-r--r--doc/gpg-agent.texi12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index eb5b334f6..a7b9865da 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -976,7 +976,12 @@ option allows to choose the storage location. To get the secret key out
of the PSE, a special export tool has to be used.
@example
+@ifset gpgtwoone
+ GENKEY [--no-protection] [--preset] [<cache_nonce>]
+@end ifset
+@ifclear gpgtwoone
GENKEY
+@end ifclear
@end example
Invokes the key generation process and the server will then inquire
@@ -1021,6 +1026,13 @@ Here is an example session:
S OK key created
@end example
+@ifset gpgtwoone
+The @option{--no-protection} option may be used to prevent prompting for a
+passphrase to protect the secret key while leaving the secret key unprotected.
+The @option{--preset} option may be used to add the passphrase to the cache
+using the default cache parameters.
+@end ifset
+
@node Agent IMPORT
@subsection Importing a Secret Key