aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/gpg.texi4
-rw-r--r--g10/gpg.c2
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
diff --git a/g10/gpg.c b/g10/gpg.c
index 110289243..9f96ef407 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -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();