diff options
author | Werner Koch <[email protected]> | 2018-11-21 08:20:56 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2018-11-21 08:22:00 +0000 |
commit | 6acca0e4d9f9e432a795ac261dd8fa02bcc583cd (patch) | |
tree | 583bd736d029ad250d1755072016abcf21afb4f9 | |
parent | tools: Let gpg-zip print a deprecation warning. (diff) | |
download | gnupg-6acca0e4d9f9e432a795ac261dd8fa02bcc583cd.tar.gz gnupg-6acca0e4d9f9e432a795ac261dd8fa02bcc583cd.zip |
doc: Clarify use of clear and nodefault in the AKL.
--
(cherry picked from commit e5c3a6999a374813134a9e68744444c25c3017f6)
-rw-r--r-- | doc/gpg.texi | 4 | ||||
-rw-r--r-- | g10/gpg.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index ffcdaf21e..8f1b8ce04 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1783,7 +1783,9 @@ list. The default is "local,wkd". @item clear Clear all defined mechanisms. This is useful to override - mechanisms given in a config file. + mechanisms given in a config file. Note that a @code{nodefault} in + @var{mechanisms} will also be cleared unless it is given after the + @code{clear}. @end table @@ -3487,7 +3487,7 @@ main (int argc, char **argv) case oAutoKeyLocate: if (default_akl) { - /* This is the first time --aito-key-locate is seen. + /* This is the first time --auto-key-locate is seen. * We need to reset the default akl. */ default_akl = 0; release_akl(); |