diff options
author | Werner Koch <[email protected]> | 2018-11-21 08:20:56 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2018-11-21 08:20:56 +0000 |
commit | e5c3a6999a374813134a9e68744444c25c3017f6 (patch) | |
tree | 5f3a992eb59446dfd66d18ac75f1c98467f4603c | |
parent | gpg: Start using OCB mode by default with Libgcrypt 1.9. (diff) | |
download | gnupg-e5c3a6999a374813134a9e68744444c25c3017f6.tar.gz gnupg-e5c3a6999a374813134a9e68744444c25c3017f6.zip |
doc: Clarify use of clear and nodefault in the AKL.
--
-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 dedb8cc42..58672c9e0 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 @@ -3554,7 +3554,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(); |