[Pkg-gnupg-commit] [gnupg1] 08/15: fix spelling and grammar
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Aug 3 18:58:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg1.
commit 5630578ae2e31f773d28aec872c64ca92c9f3188
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Aug 3 11:58:02 2016 -0400
fix spelling and grammar
---
...4-Fix-spelling-occured-should-be-occurred.patch | 114 +++++++++++++++++++++
debian/patches/0015-Clean-up-allow-to.patch | 102 ++++++++++++++++++
debian/patches/series | 2 +
3 files changed, 218 insertions(+)
diff --git a/debian/patches/0014-Fix-spelling-occured-should-be-occurred.patch b/debian/patches/0014-Fix-spelling-occured-should-be-occurred.patch
new file mode 100644
index 0000000..7b14973
--- /dev/null
+++ b/debian/patches/0014-Fix-spelling-occured-should-be-occurred.patch
@@ -0,0 +1,114 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Wed, 3 Aug 2016 11:45:22 -0400
+Subject: Fix spelling: "occured" should be "occurred"
+
+* checks/armor.test, cipher/des.c, g10/ccid-driver.c, g10/pkclist.c,
+ util/regcomp.c, util/regex_internal.c: correct the spelling of
+ "occured" to "occurred"
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+---
+ checks/armor.test | 2 +-
+ cipher/des.c | 2 +-
+ g10/ccid-driver.c | 2 +-
+ g10/pkclist.c | 2 +-
+ util/regcomp.c | 4 ++--
+ util/regex_internal.c | 4 ++--
+ 6 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/checks/armor.test b/checks/armor.test
+index cfd2359..a23f8d8 100755
+--- a/checks/armor.test
++++ b/checks/armor.test
+@@ -734,7 +734,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 popping of the
+ # armor filter gpg swalled the CRC line and passed the '-----END...'
+ # line on to the decryption layer.
+diff --git a/cipher/des.c b/cipher/des.c
+index 670ba65..7eaa2df 100644
+--- a/cipher/des.c
++++ b/cipher/des.c
+@@ -104,7 +104,7 @@
+ *
+ * if ( (error_msg = selftest()) )
+ * {
+- * fprintf(stderr, "An error in the DES/Tripple-DES implementation occured: %s\n", error_msg);
++ * fprintf(stderr, "An error in the DES/Tripple-DES implementation occurred: %s\n", error_msg);
+ * abort();
+ * }
+ */
+diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
+index 515b15a..6f7c9b2 100644
+--- a/g10/ccid-driver.c
++++ b/g10/ccid-driver.c
+@@ -2264,7 +2264,7 @@ ccid_poll (ccid_driver_t handle)
+ }
+ else if (msg[0] == RDR_to_PC_HardwareError)
+ {
+- DEBUGOUT ("hardware error occured\n");
++ DEBUGOUT ("hardware error occurred\n");
+ }
+ else
+ {
+diff --git a/g10/pkclist.c b/g10/pkclist.c
+index 198e307..b78070e 100644
+--- a/g10/pkclist.c
++++ b/g10/pkclist.c
+@@ -952,7 +952,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned int use )
+ }
+
+ /* Do group expand here too. The trick here is to continue
+- the loop if any expansion occured. The code above will
++ the loop if any expansion occurred. The code above will
+ then list all expanded keys. */
+ if (expand_id(answer,&backlog,0))
+ continue;
+diff --git a/util/regcomp.c b/util/regcomp.c
+index 6964df9..aafb9c8 100644
+--- a/util/regcomp.c
++++ b/util/regcomp.c
+@@ -1764,7 +1764,7 @@ peek_token_bracket (token, input, syntax)
+
+ /* Entry point of the parser.
+ Parse the regular expression REGEXP and return the structure tree.
+- If an error is occured, ERR is set by error code, and return NULL.
++ If an error is occurred, ERR is set by error code, and return NULL.
+ This function build the following tree, from regular expression <reg_exp>:
+ CAT
+ / \
+@@ -3349,7 +3349,7 @@ build_word_op (dfa, not, err)
+ /* This is intended for the expressions like "a{1,3}".
+ Fetch a number from `input', and return the number.
+ Return -1, if the number field is empty like "{,1}".
+- Return -2, If an error is occured. */
++ Return -2, If an error is occurred. */
+
+ static int
+ fetch_number (input, token, syntax)
+diff --git a/util/regex_internal.c b/util/regex_internal.c
+index 6f3a96e..4349f1b 100644
+--- a/util/regex_internal.c
++++ b/util/regex_internal.c
+@@ -793,7 +793,7 @@ re_node_set_merge (dest, src)
+
+ /* Insert the new element ELEM to the re_node_set* SET.
+ return 0 if SET already has ELEM,
+- return -1 if an error is occured, return 1 otherwise. */
++ return -1 if an error is occurred, return 1 otherwise. */
+
+ static int
+ re_node_set_insert (set, elem)
+@@ -909,7 +909,7 @@ re_node_set_remove_at (set, idx)
+
+
+ /* Add the token TOKEN to dfa->nodes, and return the index of the token.
+- Or return -1, if an error will be occured. */
++ Or return -1, if an error will be occurred. */
+
+ static int
+ re_dfa_add_node (dfa, token, mode)
diff --git a/debian/patches/0015-Clean-up-allow-to.patch b/debian/patches/0015-Clean-up-allow-to.patch
new file mode 100644
index 0000000..b682da3
--- /dev/null
+++ b/debian/patches/0015-Clean-up-allow-to.patch
@@ -0,0 +1,102 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Wed, 3 Aug 2016 11:52:27 -0400
+Subject: Clean up "allow to"
+
+* README, cipher/cipher.c, cipher/pubkey.c, doc/gpg.texi: replace
+ "allow to" with clearer text
+
+In standard English, the normal construction is "${XXX} allows ${YYY}
+to" -- that is, the subject (${XXX}) of the sentence is allowing the
+object (${YYY}) to do something. When the object is missing, the
+phrasing sounds awkward, even if the object is implied by context.
+There's almost always a better construction that isn't as awkward.
+
+These changes should make the language a bit clearer.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+---
+ README | 2 +-
+ cipher/cipher.c | 4 ++--
+ cipher/pubkey.c | 2 +-
+ doc/gpg.texi | 6 +++---
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/README b/README
+index 85b29d0..1a331fb 100644
+--- a/README
++++ b/README
+@@ -632,7 +632,7 @@
+ is in general the preferable solution. However
+ the code is new and under some cirumstances it may
+ give different output than with the limited old
+- support. This option allows to explicity disable
++ support. This option explicitly disables
+ the use of iconv. Note, that iconv is also
+ disabled if gettext has been disabled.
+
+diff --git a/cipher/cipher.c b/cipher/cipher.c
+index 4ef0d81..f55ce8b 100644
+--- a/cipher/cipher.c
++++ b/cipher/cipher.c
+@@ -586,7 +586,7 @@ do_cfb_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
+
+ /* Now we can process complete blocks. We use a loop as long as we
+ have at least 2 blocks and use conditions for the rest. This
+- also allows to use a bulk encryption function if available. */
++ also allows use of a bulk encryption function if available. */
+ #ifdef USE_AES
+ if (nbytes >= blocksize_x_2
+ && (c->algo == CIPHER_ALGO_AES
+@@ -677,7 +677,7 @@ do_cfb_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
+
+ /* Now we can process complete blocks. We use a loop as long as we
+ have at least 2 blocks and use conditions for the rest. This
+- also allows to use a bulk encryption function if available. */
++ also allows use of a bulk encryption function if available. */
+ #ifdef USE_AES
+ if (nbytes >= blocksize_x_2
+ && (c->algo == CIPHER_ALGO_AES
+diff --git a/cipher/pubkey.c b/cipher/pubkey.c
+index 02c096e..60d855c 100644
+--- a/cipher/pubkey.c
++++ b/cipher/pubkey.c
+@@ -276,7 +276,7 @@ check_pubkey_algo2( int algo, unsigned use )
+ int i;
+
+ /* Map type 20 Elgamal algorithm to type 16 if it is used for
+- decryption. This allows to use legacy type 20 Elgamal keys for
++ decryption. This allows use of legacy type 20 Elgamal keys for
+ decryption. */
+ if (algo == PUBKEY_ALGO_ELGAMAL && use == PUBKEY_USAGE_ENC)
+ algo = PUBKEY_ALGO_ELGAMAL_E;
+diff --git a/doc/gpg.texi b/doc/gpg.texi
+index ee756d8..a41ab8e 100644
+--- a/doc/gpg.texi
++++ b/doc/gpg.texi
+@@ -1211,7 +1211,7 @@ Use @code{file} to access the smartcard reader. The current default is
+ @item --disable-ccid
+ @opindex disable-ccid
+ Disable the integrated support for CCID compliant readers. This
+-allows to fall back to one of the other drivers even if the internal
++allows falling back to one of the other drivers even if the internal
+ CCID driver can handle the reader. Note, that CCID support is only
+ available if libusb was available at build time.
+
+@@ -1438,7 +1438,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}.
+@@ -2416,7 +2416,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/debian/patches/series b/debian/patches/series
index f9a2d7c..6a0c4d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@
0011-g10-Fix-list-packets.patch
0012-g10-Fix-keysize-with-expert.patch
0013-gpgv-Tweak-default-options-for-extra-security.patch
+0014-Fix-spelling-occured-should-be-occurred.patch
+0015-Clean-up-allow-to.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg1.git
More information about the Pkg-gnupg-commit
mailing list