[git] GnuPG - branch, master, updated. gnupg-2.1.22-23-ga611cba

[by Daniel Kahn Gillmor]

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  a611cba142470c52f3303c512f77ae7d195cc41f (commit)
      from  f011d8763a009612c858a287cf7cc6a1f1a6d32a (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 a611cba142470c52f3303c512f77ae7d195cc41f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Aug 7 03:34:03 2017 -0400

    Fix spelling.
    
    * doc/gpg.texi: s/occured/occurred/
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 19398e6..ba7f5a5 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1644,7 +1644,7 @@ Set what trust model GnuPG should follow. The models are:
   time a key is seen, it is memorized.  If later another key with a
   user id with the same email address is seen, both keys are marked as
   suspect.  In that case, the next time either is used, a warning is
-  displayed describing the conflict, why it might have occured
+  displayed describing the conflict, why it might have occurred
   (either the user generated a new key and failed to cross sign the
   old and new keys, the key is forgery, or a man-in-the-middle attack
   is being attempted), and the user is prompted to manually confirm

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

Summary of changes:
 doc/gpg.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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