[PATCH 1/3] Fix spelling/grammar
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Tue Aug 2 04:19:15 CEST 2016
* agent/learncard.c: s/coccured/occurred/
* doc/dirmngr.texi: s/ommitted/omitted/, s/orginally/originally/,
s/reponses/responses/i
* doc/gpg-agent.texi, doc/dirmngr.texi, doc/gpg.texi: , fix "allows
to" to more conventional english usage
* doc/tools.texi, g10/gpgcommpose.c, tests/openpgp/armor.scm,
tests/openpgp/armor.test: s/occured/occurred/
* tools/gpgsplit.c: s/calcualting/calculating/
* sm/server.c: s/formated/formatted/
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
agent/learncard.c | 6 +++---
doc/dirmngr.texi | 14 +++++++-------
doc/gpg-agent.texi | 10 +++++-----
doc/gpg.texi | 6 +++---
doc/tools.texi | 2 +-
g10/gpgcompose.c | 2 +-
sm/server.c | 2 +-
tests/openpgp/armor.scm | 2 +-
tests/openpgp/armor.test | 2 +-
tools/gpgsplit.c | 2 +-
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/agent/learncard.c b/agent/learncard.c
index e0f2340..e9304fb 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -133,7 +133,7 @@ kpinfo_cb (void *opaque, const char *line)
char *p;
if (parm->error)
- return; /* no need to gather data after an error coccured */
+ return; /* no need to gather data after an error occurred */
if ((parm->error = agent_write_status (parm->ctrl, "PROGRESS",
"learncard", "k", "0", "0", NULL)))
@@ -190,7 +190,7 @@ certinfo_cb (void *opaque, const char *line)
char *p, *pend;
if (parm->error)
- return; /* no need to gather data after an error coccured */
+ return; /* no need to gather data after an error occurred */
if ((parm->error = agent_write_status (parm->ctrl, "PROGRESS",
"learncard", "c", "0", "0", NULL)))
@@ -232,7 +232,7 @@ sinfo_cb (void *opaque, const char *keyword, size_t keywordlen,
SINFO item;
if (sparm->error)
- return; /* no need to gather data after an error coccured */
+ return; /* no need to gather data after an error occurred */
item = xtrycalloc (1, sizeof *item + keywordlen + 1 + strlen (data));
if (!item)
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index e87442f..033b5d3 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -321,9 +321,9 @@ whether @option{--honor-http-proxy} has been set.
@item --ldap-proxy @var{host}[:@var{port}]
@opindex ldap-proxy
Use @var{host} and @var{port} to connect to LDAP servers. If @var{port}
-is ommitted, port 389 (standard LDAP port) is used. This overrides any
+is omitted, port 389 (standard LDAP port) is used. This overrides any
specified host and port part in a LDAP URL and will also be used if host
-and port have been ommitted from the URL.
+and port have been omitted from the URL.
@item --only-ldap-proxy
@opindex only-ldap-proxy
@@ -346,12 +346,12 @@ This server list file contains one LDAP server per line in the format
Lines starting with a @samp{#} are comments.
Note that as usual all strings entered are expected to be UTF-8 encoded.
-Obviously this will lead to problems if the password has orginally been
+Obviously this will lead to problems if the password has originally been
encoded as Latin-1. There is no other solution here than to put such a
password in the binary encoding into the file (i.e. non-ascii characters
won't show up readable). at footnote{The @command{gpgconf} tool might be
-helpful for frontends as it allows to edit this configuration file using
-percent escaped strings.}
+helpful for frontends as it enables editing this configuration file using
+percent-escaped strings.}
@item --ldaptimeout @var{secs}
@@ -474,7 +474,7 @@ In the deprecated system daemon mode the second directory is used instead.
@item /etc/gnupg/trusted-certs
This directory should be filled with certificates of Root CAs you
-are trusting in checking the CRLs and signing OCSP Reponses.
+are trusting in checking the CRLs and signing OCSP Responses.
Usually these are the same certificates you use with the applications
making use of dirmngr. It is expected that each of these certificate
@@ -496,7 +496,7 @@ This directory may contain extra certificates which are preloaded
into the interal cache on startup. Applications using dirmngr (e.g. gpgsm)
can request cached certificates to complete a trust chain.
This is convenient in cases you have a couple intermediate CA certificates
-or certificates ususally used to sign OCSP reponses.
+or certificates ususally used to sign OCSP responses.
These certificates are first tried before going
out to the net to look for them. These certificates must also be
@acronym{DER} encoded and suffixed with @file{.crt} or @file{.der}.
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index cd5d751..b481dd6 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -540,8 +540,8 @@ Also listen on native gpg-agent connections on the given socket. The
intended use for this extra socket is to setup a Unix domain socket
forwarding from a remote machine to this socket on the local machine.
A @command{gpg} running on the remote machine may then connect to the
-local gpg-agent and use its private keys. This allows to decrypt or
-sign data on a remote machine without exposing the private keys to the
+local gpg-agent and use its private keys. This enables decrypting or
+signing data on a remote machine without exposing the private keys to the
remote machine.
@@ -633,7 +633,7 @@ agent. By default they may all be found in the current home directory
lines are ignored. To mark a key as trusted you need to enter its
fingerprint followed by a space and a capital letter @code{S}. Colons
may optionally be used to separate the bytes of a fingerprint; this
- allows to cut and paste the fingerprint from a key listing output. If
+ enables cutting and pasting the fingerprint from a key listing output. If
the line is prefixed with a @code{!} the key is explicitly marked as
not trusted.
@@ -1041,8 +1041,8 @@ Here is an example session:
@subsection Generating a Key
This is used to create a new keypair and store the secret key inside the
-active PSE --- which is in most cases a Soft-PSE. An not yet defined
-option allows to choose the storage location. To get the secret key out
+active PSE --- which is in most cases a Soft-PSE. A not-yet-defined
+option allows choosing the storage location. To get the secret key out
of the PSE, a special export tool has to be used.
@example
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 38f417e..3be401f 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1678,7 +1678,7 @@ mechanisms, in the order they are to be tried:
may be used here to query that particular keyserver.
@item local
- Locate the key using the local keyrings. This mechanism allows to
+ Locate the key using the local keyrings. This mechanism allows the user to
select the order a local key lookup is done. Thus using
@samp{--auto-key-locate local} is identical to
@option{--no-auto-key-locate}.
@@ -2110,7 +2110,7 @@ Use @var{name} as the key to sign with. Note that this option overrides
@opindex try-secret-key
For hidden recipients GPG needs to know the keys to use for trial
decryption. The key set with @option{--default-key} is always tried
-first, but this is often not sufficient. This option allows to set more
+first, but this is often not sufficient. This option allows setting more
keys to be used for trial decryption. Although any valid user-id
specification may be used for @var{name} it makes sense to use at least
the long keyid to avoid ambiguities. Note that gpg-agent might pop up a
@@ -2791,7 +2791,7 @@ to display the message. This option overrides @option{--set-filename}.
@itemx --no-use-embedded-filename
@opindex use-embedded-filename
Try to create a file with a name as embedded in the data. This can be
-a dangerous option as it allows to overwrite files. Defaults to no.
+a dangerous option as it enables overwriting files. Defaults to no.
@item --cipher-algo @code{name}
@opindex cipher-algo
diff --git a/doc/tools.texi b/doc/tools.texi
index 577df8e..e52d6a7 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -1749,7 +1749,7 @@ The possible exit status codes of @command{symcryptrun} are:
@item 0
Success.
@item 1
- Some error occured.
+ Some error occurred.
@item 2
No valid passphrase was provided.
@item 3
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c
index cd5346f..e3bb013 100644
--- a/g10/gpgcompose.c
+++ b/g10/gpgcompose.c
@@ -1317,7 +1317,7 @@ sig_notation (const char *option, int argc, char *argv[], void *cookie)
else
notation = string_to_notation (p, 1);
if (! notation)
- log_fatal ("creating notation: an unknown error occured.\n");
+ log_fatal ("creating notation: an unknown error occurred.\n");
notation->next = si->notations;
si->notations = notation;
diff --git a/sm/server.c b/sm/server.c
index 8b4a29c..cdccff3 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -1039,7 +1039,7 @@ static const char hlp_getauditlog[] =
"If --data is used, the output is send using D-lines and not to the\n"
"file descriptor given by an OUTPUT command.\n"
"\n"
- "If --html is used the output is formated as an XHTML block. This is\n"
+ "If --html is used the output is formatted as an XHTML block. This is\n"
"designed to be incorporated into a HTML document.";
static gpg_error_t
cmd_getauditlog (assuan_context_t ctx, char *line)
diff --git a/tests/openpgp/armor.scm b/tests/openpgp/armor.scm
index 5b4ea14..578e248 100755
--- a/tests/openpgp/armor.scm
+++ b/tests/openpgp/armor.scm
@@ -749,7 +749,7 @@ wg7Md81a5RI3F2FG8747t9gX
")
;; Bug 1179 solved 2010-05-12:
-;; It occured for messages of a multiple of the iobuf block size where
+;; It occurred for messages of a multiple of the iobuf block size where
;; the last line had no pad character. Due to premature poppng of thea
;; rmor filter gpg swalled the CRC line and passed the '-----END...'
;; line on to the decryption layer.
diff --git a/tests/openpgp/armor.test b/tests/openpgp/armor.test
index ce5939c..72831e3 100755
--- a/tests/openpgp/armor.test
+++ b/tests/openpgp/armor.test
@@ -742,7 +742,7 @@ wg7Md81a5RI3F2FG8747t9gX
'
# Bug 1179 solved 2010-05-12:
-# It occured for messages of a multiple of the iobuf block size where
+# It occurred for messages of a multiple of the iobuf block size where
# the last line had no pad character. Due to premature poppng of thea
# rmor filter gpg swalled the CRC line and passed the '-----END...'
# line on to the decryption layer.
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index 2451ab3..93dd8ed 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -577,7 +577,7 @@ write_part (FILE *fpin, unsigned long pktlen,
len = public_key_length (blob, pktlen);
if (!len)
{
- log_error ("error calcualting public key length\n");
+ log_error ("error calculating public key length\n");
g10_exit (1);
}
if ( (hdr[0] & 0x40) )
--
2.8.1
More information about the Gnupg-devel
mailing list