aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/ChangeLog-20112
-rw-r--r--common/ttyio.c2
2 files changed, 2 insertions, 2 deletions
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";
}