From 6acca0e4d9f9e432a795ac261dd8fa02bcc583cd Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 21 Nov 2018 09:20:56 +0100
Subject: [PATCH] doc: Clarify use of clear and nodefault in the AKL.

--

(cherry picked from commit e5c3a6999a374813134a9e68744444c25c3017f6)
---
 doc/gpg.texi | 4 +++-
 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
 
diff --git a/g10/gpg.c b/g10/gpg.c
index e18eefe72..b316e856d 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -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();