aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--agent/ChangeLog-20112
-rw-r--r--common/ChangeLog-20112
-rw-r--r--common/ttyio.c2
-rw-r--r--doc/dirmngr.texi2
-rw-r--r--doc/tools.texi2
-rw-r--r--kbx/keybox-search.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/agent/ChangeLog-2011 b/agent/ChangeLog-2011
index f56be1f44..d32d69cd8 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 7fed0a742..4b95b351d 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 0f8c780c8..3b409e995 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 073cbc2e7..06da87ed6 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
-@c also at CRLs to check whether tehse other certificates and well, the
+@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 1dd1b35e9..425790e9d 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 cb07c97fd..a0b778f1b 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,