[git] GnuPG - branch, master, updated. gnupg-2.2.7-281-ge5c3a69

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  e5c3a6999a374813134a9e68744444c25c3017f6 (commit)
      from  1e700961ddf4c54ec5a03a697fe00d7eb606fdff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e5c3a6999a374813134a9e68744444c25c3017f6
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 21 09:20:56 2018 +0100

    doc: Clarify use of clear and nodefault in the AKL.
    
    --

diff --git a/doc/gpg.texi b/doc/gpg.texi
index dedb8cc..58672c9 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 1102892..9f96ef4 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();

-----------------------------------------------------------------------

Summary of changes:
 doc/gpg.texi | 4 +++-
 g10/gpg.c    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org