From 108e8f622ef9cfa256707debec1d379ce3cf21ca Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Tue, 3 Apr 2012 20:53:21 -0400
Subject: [PATCH] Document GENKEY options.

---
 doc/gpg-agent.texi | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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