aboutsummaryrefslogtreecommitdiffstats
path: root/doc/gpg.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/gpg.texi')
-rw-r--r--doc/gpg.texi6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index e894f5c18..cfd46a6cf 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -3312,12 +3312,18 @@ control statements must be given. For GnuPG 2.1 and later
@item %ask-passphrase
@itemx %no-ask-passphrase
+@ifclear gpgtwoone
Enable (or disable) a mode where the command @option{passphrase} is
ignored and instead the usual passphrase dialog is used. This does
not make sense for batch key generation; however the unattended key
generation feature is also used by GUIs and this feature relinquishes
the GUI from implementing its own passphrase entry code. These are
global control statements and affect all future key genrations.
+@end ifclear
+@ifset gpgtwoone
+This option is a no-op for GnuPG 2.1 and later.
+@end ifset
+
@item %no-protection
Since GnuPG version 2.1 it is not anymore possible to specify a