[git] GnuPG - branch, master, updated. gnupg-2.1.15-111-g167273e

[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  167273ee9d3c04f29835aa2d12fde52eebf61efb (commit)
       via  7fafc3c49901c118b47d4d13a41fb3575c1f9e4b (commit)
      from  68eb5fbd37c31ed7c0c916656131eea7bb58d13d (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 167273ee9d3c04f29835aa2d12fde52eebf61efb
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Sep 14 17:21:19 2016 -0400

    spelling: conenction should be connection
    
    * dirmngr/server.c, sm/server.c: s/conenction/connection/
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/dirmngr/server.c b/dirmngr/server.c
index b29628a..e5cf2c3 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -304,7 +304,7 @@ strcpy_escaped_plus (char *d, const unsigned char *s)
 
 
 /* This function returns true if a Tor server is running.  The sattus
-   is cached for the current conenction.  */
+   is cached for the current connection.  */
 static int
 is_tor_running (ctrl_t ctrl)
 {
diff --git a/sm/server.c b/sm/server.c
index ce8085d..b4fcb43 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -1099,7 +1099,7 @@ static const char hlp_getinfo[] =
   "  agent-check - Return success if the agent is running.\n"
   "  cmd_has_option CMD OPT\n"
   "              - Returns OK if the command CMD implements the option OPT.\n"
-  "  offline     - Returns OK if the conenction is in offline mode.";
+  "  offline     - Returns OK if the connection is in offline mode.";
 static gpg_error_t
 cmd_getinfo (assuan_context_t ctx, char *line)
 {

commit 7fafc3c49901c118b47d4d13a41fb3575c1f9e4b
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Sep 14 17:23:09 2016 -0400

    spelling: correct achived to achieved
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 8107100..118066a 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2198,7 +2198,7 @@ opposite meaning. The options are:
   a formerly deleted key does not automatically gain an ownertrust
   values merely due to import.  On the other hand it is sometimes
   necessary to re-import a trusted set of keys again but keeping
-  already assigned ownertrust values.  This can be achived by using
+  already assigned ownertrust values.  This can be achieved by using
   this option.
 
   @item repair-pks-subkey-bug

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

Summary of changes:
 dirmngr/server.c | 2 +-
 doc/gpg.texi     | 2 +-
 sm/server.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


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