[git] GnuPG - branch, master, updated. gnupg-2.1.9-77-g1f872cb

[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  1f872cb4ad2d3dcc3598fed689504c9731600caa (commit)
       via  02dc518787c5d8525c18986947a59c8ef1bd41da (commit)
      from  949a5cfdabcafab93c1ac092c0459b59318805b9 (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 1f872cb4ad2d3dcc3598fed689504c9731600caa
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Oct 27 17:09:43 2015 -0400

    Fix typos
    
    --

diff --git a/agent/ChangeLog-2011 b/agent/ChangeLog-2011
index f56be1f..d32d69c 100644
--- a/agent/ChangeLog-2011
+++ b/agent/ChangeLog-2011
@@ -2654,7 +2654,7 @@
 	to the control struct so that they are per connection.
 	* gpg-agent.c (agent_init_default_ctrl): New.
 	(main): Assign those command line options to new default_* variables.
-	Reset DISPLAY in server mode so that tehre is no implicit default.
+	Reset DISPLAY in server mode so that there is no implicit default.
 	* command.c (start_command_handler): Initialize and deinitialize
 	the control values.
 	(option_handler): Work on the ctrl values and not on the opt.
diff --git a/common/ChangeLog-2011 b/common/ChangeLog-2011
index 7fed0a7..4b95b35 100644
--- a/common/ChangeLog-2011
+++ b/common/ChangeLog-2011
@@ -1600,7 +1600,7 @@
 	(SPWQ_NO_PIN_ENTRY): New.
 	* simple-pwquery.c (simple_pw_set_socket): New.
 	(agent_open): Use it if GPG_AGENT_INFO is not set.
-	(simple_pwquery): Extended to allow returning of otehyr error codes.
+	(simple_pwquery): Extended to allow returning of other error codes.
 
 	* util.h (GNUPG_MODULE_NAME_AGENT, GNUPG_MODULE_NAME_PINENTRY)
 	(GNUPG_MODULE_NAME_SCDAEMON, GNUPG_MODULE_NAME_DIRMNGR)
diff --git a/common/ttyio.c b/common/ttyio.c
index 0f8c780..3b409e9 100644
--- a/common/ttyio.c
+++ b/common/ttyio.c
@@ -134,7 +134,7 @@ tty_get_ttyname (void)
       got_name = 1;
     }
 #endif /*HAVE_CTERMID*/
-  /* Assume the standard tty on memory error or when tehre is no
+  /* Assume the standard tty on memory error or when there is no
      ctermid. */
   return name? name : "/dev/tty";
 }
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 073cbc2..06da87e 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -1002,7 +1002,7 @@ as a binary blob.
 @c
 @c Here we may encounter a recursive situation:
 @c @code{validate_cert_chain} needs to look at other certificates and
- at c also at CRLs to check whether tehse other certificates and well, the
+ at c also at CRLs to check whether these other certificates and well, the
 @c CRL issuer certificate itself are not revoked.  FIXME: We need to make
 @c sure that @code{validate_cert_chain} does not try to lookup the CRL we
 @c are currently processing. This would be a catch-22 and may indicate a
diff --git a/doc/tools.texi b/doc/tools.texi
index 1dd1b35..425790e 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -1500,7 +1500,7 @@ The return value of this command is
 
 @item 0
 The certificate under question is valid; i.e. there is a valid CRL
-available and it is not listed tehre or teh OCSP request returned that
+available and it is not listed there or the OCSP request returned that
 that certificate is valid.
 
 @item 1
diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c
index cb07c97..a0b778f 100644
--- a/kbx/keybox-search.c
+++ b/kbx/keybox-search.c
@@ -171,7 +171,7 @@ _keybox_get_flag_location (const unsigned char *buffer, size_t length,
 
 
 
-/* Return one of the flags WHAT in VALUE from teh blob BUFFER of
+/* Return one of the flags WHAT in VALUE from the blob BUFFER of
    LENGTH bytes.  Return 0 on success or an raw error code. */
 static gpg_err_code_t
 get_flag_from_image (const unsigned char *buffer, size_t length,

commit 02dc518787c5d8525c18986947a59c8ef1bd41da
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Oct 27 17:09:40 2015 -0400

    agent: Clarify agent's KEYWRAP_KEY description.
    
    --
    
    Signed-Off-By: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/agent/command.c b/agent/command.c
index f09a2ff..509f457 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1978,7 +1978,7 @@ static const char hlp_keywrap_key[] =
   "mechanism or not used at all if the key is a pre-shared key.  In any\n"
   "case wrapping the import and export of keys is a requirement for\n"
   "certain cryptographic validations and thus useful.  The key persists\n"
-  "a RESET command but may be cleared using the option --clear.\n"
+  "until a RESET command but may be cleared using the option --clear.\n"
   "\n"
   "Supported modes are:\n"
   "  --import  - Return a key to import a key into gpg-agent\n"

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

Summary of changes:
 agent/ChangeLog-2011  | 2 +-
 agent/command.c       | 2 +-
 common/ChangeLog-2011 | 2 +-
 common/ttyio.c        | 2 +-
 doc/dirmngr.texi      | 2 +-
 doc/tools.texi        | 2 +-
 kbx/keybox-search.c   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)


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