diff options
author | Yuri Chornoivan <[email protected]> | 2017-02-20 21:19:50 +0000 |
---|---|---|
committer | Daniel Kahn Gillmor <[email protected]> | 2017-02-21 18:11:46 +0000 |
commit | 24cf0606b43038c7ce5e9c6ccb921895619c04f0 (patch) | |
tree | 4888dfeb4ed52052e71158b948499b12b4b04ec9 /doc | |
parent | dirmngr: Add special treatment for the standard hkps pool to ntbtls. (diff) | |
download | gnupg-24cf0606b43038c7ce5e9c6ccb921895619c04f0.tar.gz gnupg-24cf0606b43038c7ce5e9c6ccb921895619c04f0.zip |
Clean up word replication.
--
This fixes extra word repetitions (like "the the" or "is is") in the
code and docs.
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/DETAILS | 6 | ||||
-rw-r--r-- | doc/TRANSLATE | 2 | ||||
-rw-r--r-- | doc/dirmngr.texi | 6 | ||||
-rw-r--r-- | doc/faq.org | 4 | ||||
-rw-r--r-- | doc/gpg-agent.texi | 6 | ||||
-rw-r--r-- | doc/gpg.texi | 4 | ||||
-rw-r--r-- | doc/gpgsm.texi | 2 | ||||
-rw-r--r-- | doc/scdaemon.texi | 2 | ||||
-rw-r--r-- | doc/vuln-announce-2007-multiple-message.txt | 2 | ||||
-rw-r--r-- | doc/whats-new-in-2.1.txt | 6 |
10 files changed, 20 insertions, 20 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index ac599fc62..d9b1fa673 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -187,7 +187,7 @@ described here. only filled if the issuer certificate is available. The root has been reached if this is the same string as the fingerprint. The advantage of using this value is that it is guaranteed to have - been been build by the same lookup algorithm as gpgsm uses. + been built by the same lookup algorithm as gpgsm uses. For "uid" records this field lists the preferences in the same way gpg's --edit-key menu does. @@ -702,7 +702,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: VALIDATION_MODEL describes the algorithm used to check the validity of the key. The defaults are the standard Web of Trust - model for gpg and the the standard X.509 model for gpgsm. The + model for gpg and the standard X.509 model for gpgsm. The defined values are - pgp :: The standard PGP WoT. @@ -796,7 +796,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: recent message was verified 4 seconds ago.' *** PKA_TRUST_ - This is is one: + This is one of: - PKA_TRUST_GOOD <addr-spec> - PKA_TRUST_BAD <addr-spec> diff --git a/doc/TRANSLATE b/doc/TRANSLATE index 7c3e54468..9bd9b089c 100644 --- a/doc/TRANSLATE +++ b/doc/TRANSLATE @@ -37,7 +37,7 @@ are disabled like this .#gpgsm.some.help-item This string is not translated. -After translation you should remove the the hash mark so that the +After translation you should remove the hash mark so that the entry looks like. .gpgsm.some.help-item diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi index 7fc11a2aa..7a6ba47b4 100644 --- a/doc/dirmngr.texi +++ b/doc/dirmngr.texi @@ -775,7 +775,7 @@ configuration. @end table If DirMngr has not enough information about the given certificate (which -is the case for not yet cached certificates), it will will inquire the +is the case for not yet cached certificates), it will inquire the missing data: @example @@ -1038,7 +1038,7 @@ as a binary blob. @c c) No authorityKeyIdentifier exits: The certificate is retrieved @c using @code{find_cert_bysubject} without the key ID argument. If @c the certificate is in the certificate cache the first one with a -@c matching subject is is directly returned. Then the requester is +@c matching subject is directly returned. Then the requester is @c asked via the Assuan inquiry ``SENDCERT'' and an exact @c specification of the subject whether he can @c provide this certificate. If this succeed the returned @@ -1115,7 +1115,7 @@ as a binary blob. @c respectively. The have already been described above under the @c description of @code{crl_cache_insert}. If no certificate was found @c or with no authorityKeyIdentifier, only the cache is consulted using -@c @code{get_cert_bysubject}. The latter is is done under the assumption +@c @code{get_cert_bysubject}. The latter is done under the assumption @c that a matching certificate has explicitly been put into the @c certificate cache. If the issuer's certificate could not be found, @c the validation terminates with the error code @code{GPG_ERR_MISSING_CERT}. diff --git a/doc/faq.org b/doc/faq.org index 8fc3775bb..f03850804 100644 --- a/doc/faq.org +++ b/doc/faq.org @@ -1462,7 +1462,7 @@ update this FAQ in the next month. See the section "Changes" for recent updates : | sort | uniq | xargs echo gpg --recv-keys Note that the invocation of sort is also required to wait for the - of the listing before before starting the import. + of the listing before starting the import. * Bug reporting and hacking @@ -1491,7 +1491,7 @@ details. GnuPG has originally been developed in Germany because we have been able to do that without being affected by the US export restrictions. We had to reject any contributions from US citizens or from people -living the the US. That changed by end of 2000 when the export +living in the US. That changed by end of 2000 when the export restrictions were basically dropped for all kind of freely available software. However there are still some requirements in the US. Quoting David Shaw: mail diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index 3177af46d..b72892c2a 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -77,7 +77,7 @@ the included Secure Shell Agent you may start the agent using: @c @c The rationale for this separation is that it allows access to the @c secret key to be tightly controlled and audited, and it doesn't permit -@c the the supplicant to either copy the key or to override the owner's +@c the supplicant to either copy the key or to override the owner's @c intentions. @example @@ -1412,7 +1412,7 @@ numbers in the range @code{0} to @code{UINT_MAX} and wrapping around to 0. The actual values should not be relied upon; they shall only be used to detect a change. -The currently defined counters are are: +The currently defined counters are: @table @code @item ANY Incremented with any change of any of the other counters. @@ -1508,7 +1508,7 @@ following values are defined: @item cache-ttl-opt-preset This option sets the cache TTL for new entries created by GENKEY and -PASSWD commands when using the @option{--preset} option. It it is not +PASSWD commands when using the @option{--preset} option. It is not used a default value is used. @item s2k-count diff --git a/doc/gpg.texi b/doc/gpg.texi index 16c9674c5..78dd6516c 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1430,7 +1430,7 @@ Note that this adds a keyring to the current list. If the intent is to use the specified keyring alone, use @option{--keyring} along with @option{--no-default-keyring}. -If the the option @option{--no-keyring} has been used no keyrings will +If the option @option{--no-keyring} has been used no keyrings will be used at all. @@ -3391,7 +3391,7 @@ For existing users a small helper script is provided to create these files (@pxref{addgnupghome}). For internal purposes @command{@gpgname} creates and maintains a few other -files; They all live in in the current home directory (@pxref{option +files; They all live in the current home directory (@pxref{option --homedir}). Only the @command{@gpgname} program may modify these files. diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index b92eaea43..1d0083976 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -898,7 +898,7 @@ start up with a working configuration. For existing users a small helper script is provided to create these files (@pxref{addgnupghome}). For internal purposes @command{gpgsm} creates and maintains a few other files; -they all live in in the current home directory (@pxref{option +they all live in the current home directory (@pxref{option --homedir}). Only @command{gpgsm} may modify these files. diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi index 161780178..4c6bb93b6 100644 --- a/doc/scdaemon.texi +++ b/doc/scdaemon.texi @@ -225,7 +225,7 @@ This option appends a thread ID to the PID in the log output. @efindex ASSUAN_DEBUG Changes the active Libassuan logging categories to @var{cats}. The value for @var{cats} is an unsigned integer given in usual C-Syntax. -A value of of 0 switches to a default category. If this option is not +A value of 0 switches to a default category. If this option is not used the categories are taken from the environment variable @code{ASSUAN_DEBUG}. Note that this option has only an effect if the Assuan debug flag has also been with the option @option{--debug}. For diff --git a/doc/vuln-announce-2007-multiple-message.txt b/doc/vuln-announce-2007-multiple-message.txt index 16c08d422..154b27403 100644 --- a/doc/vuln-announce-2007-multiple-message.txt +++ b/doc/vuln-announce-2007-multiple-message.txt @@ -81,7 +81,7 @@ Here the PLAINTEXT status lines clearly identify the start of a new message. Note, that using gpg on the command line is in almost all cases not -done with redirection but by letting gpg save the the signed message. +done with redirection but by letting gpg save the signed message. In this case gpg will save the message to different files or in case the file names are identical, prompt the over to overwrite the first one again. diff --git a/doc/whats-new-in-2.1.txt b/doc/whats-new-in-2.1.txt index 19ed8b9fc..4b7349ada 100644 --- a/doc/whats-new-in-2.1.txt +++ b/doc/whats-new-in-2.1.txt @@ -103,7 +103,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html • The scripts to create a Windows installer are now part of GnuPG. Now for the detailed description of these new features. Note that the - examples assume that that /gpg/ is installed as /gpg/. Your + examples assume that /gpg/ is installed as /gpg/. Your installation may have it installed under the name /gpg2/. @@ -510,7 +510,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html at login time and use an environment variable (`GPG_AGENT_INFO') to tell the other GnuPG modules how to connect to the agent. However, correctly managing the start up and this environment variable is - cumbersome so that that an easier method is required. Since GnuPG + cumbersome so that an easier method is required. Since GnuPG 2.0.16 the `--use-standard-socket' option already allowed to start the agent on the fly; however the environment variable was still required. @@ -535,7 +535,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html A deficit of the OpenPGP protocol is that signatures carry only a limited indication on which public key has been used to create a signature. Thus a verification engine may only use this “long key id” - to look up the the key in its own store or from a public keyserver. + to look up the key in its own store or from a public keyserver. Unfortunately it has now become possible to create a key with a long key id matching the key id of another key. Importing a key with a long key id already used by another key in gpg’s local key store was |