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 <dkg@fifthhorseman.net>
2024-12-22 10:19:57 +01:00 · 2017-02-20 16:19:50 -05:00 · 2017-02-20 16:19:50 -05:00 · 24cf0606b4
commit 24cf0606b4
parent 831d014550
95 changed files with 136 additions and 136 deletions
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@ -50,7 +50,7 @@
 /* Definition of module local data of the CTRL structure.  */
 struct scd_local_s
 {
-  /* We keep a list of all allocated context with a an achnor at
+  /* We keep a list of all allocated context with an achnor at
     SCD_LOCAL_LIST (see below). */
  struct scd_local_s *next_local;

--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@ -2721,7 +2721,7 @@ data_hash (unsigned char *data, size_t data_n,
 }


-/* This function signs the data described by CTRL. If HASH is is not
+/* This function signs the data described by CTRL. If HASH is not
   NULL, (HASH,HASHLEN) overrides the hash stored in CTRL.  This is to
   allow the use of signature algorithms that implement the hashing
   internally (e.g. Ed25519).  On success the created signature is
@ -3654,7 +3654,7 @@ start_command_handler_ssh (ctrl_t ctrl, gnupg_fd_t sock_client)

 #ifdef HAVE_W32_SYSTEM
 /* Serve one ssh-agent request.  This is used for the Putty support.
-   REQUEST is the the mmapped memory which may be accessed up to a
+   REQUEST is the mmapped memory which may be accessed up to a
   length of MAXREQLEN.  Returns 0 on success which also indicates
   that a valid SSH response message is now in REQUEST.  */
 int
@ -3749,7 +3749,7 @@ serve_mmapped_ssh_request (ctrl_t ctrl,
    size_t response_size;

    /* NB: In contrast to the request-stream, the response stream
-       includes the the message type byte.  */
+       includes the message type byte.  */
    if (es_fclose_snatch (response_stream, &response_data, &response_size))
      {
        log_error ("snatching ssh response failed: %s",
--- a/agent/command.c
+++ b/agent/command.c
@ -434,7 +434,7 @@ leave_cmd (assuan_context_t ctx, gpg_error_t err)
 static const char hlp_geteventcounter[] =
  "GETEVENTCOUNTER\n"
  "\n"
-  "Return a a status line named EVENTCOUNTER with the current values\n"
+  "Return a status line named EVENTCOUNTER with the current values\n"
  "of all event counters.  The values are decimal numbers in the range\n"
  "0 to UINT_MAX and wrapping around to 0.  The actual values should\n"
  "not be relied upon, they shall only be used to detect a change.\n"
@ -2007,7 +2007,7 @@ static const char hlp_keywrap_key[] =
  "KEYWRAP_KEY [--clear] <mode>\n"
  "\n"
  "Return a key to wrap another key.  For now the key is returned\n"
-  "verbatim and and thus makes not much sense because an eavesdropper on\n"
+  "verbatim and thus makes not much sense because an eavesdropper on\n"
  "the gpg-agent connection will see the key as well as the wrapped key.\n"
  "However, this function may either be equipped with a public key\n"
  "mechanism or not used at all if the key is a pre-shared key.  In any\n"
@ -2631,7 +2631,7 @@ static const char hlp_putval[] =
  "try to connect to that daemon.  Only if that fails they may start\n"
  "an own instance of the service daemon. \n"
  "\n"
-  "KEY is an an arbitrary symbol with the same syntax rules as keys\n"
+  "KEY is an arbitrary symbol with the same syntax rules as keys\n"
  "for shell environment variables.  PERCENT_ESCAPED_VALUE is the\n"
  "corresponding value; they should be similar to the values of\n"
  "envronment variables but gpg-agent does not enforce any\n"
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@ -387,7 +387,7 @@ divert_pksign (ctrl_t ctrl,
 }


-/* Decrypt the the value given asn an S-expression in CIPHER using the
+/* Decrypt the value given asn an S-expression in CIPHER using the
   key identified by SHADOW_INFO and return the plaintext in an
   allocated buffer in R_BUF.  The padding information is stored at
   R_PADDING with -1 for not known.  */
--- a/agent/findkey.c
+++ b/agent/findkey.c
@ -1289,7 +1289,7 @@ agent_public_key_from_file (ctrl_t ctrl,



-/* Check whether the the secret key identified by GRIP is available.
+/* Check whether the secret key identified by GRIP is available.
   Returns 0 is the key is available.  */
 int
 agent_key_available (const unsigned char *grip)
--- a/agent/genkey.c
+++ b/agent/genkey.c
@ -220,7 +220,7 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw,
    }

  /* Now check the constraints and collect the error messages unless
-     in in silent mode which returns immediately.  */
+     in silent mode which returns immediately.  */
  if (utf8_charcount (pw, -1) < minlen )
    {
      if (!failed_constraint)
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@ -2394,7 +2394,7 @@ handle_signal (int signo)
 }
 #endif

-/* Check the nonce on a new connection.  This is a NOP unless we we
+/* Check the nonce on a new connection.  This is a NOP unless we
   are using our Unix domain socket emulation under Windows.  */
 static int
 check_nonce (ctrl_t ctrl, assuan_sock_nonce_t *nonce)
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@ -133,7 +133,7 @@ The currently defined protection modes are:

 *** openpgp-s2k3-sha1-aes-cbc

-  This describes an algorithm using using AES in CBC mode for
+  This describes an algorithm using AES in CBC mode for
  encryption, SHA-1 for integrity protection and the String to Key
  algorithm 3 from OpenPGP (rfc4880).

@ -182,7 +182,7 @@ The currently defined protection modes are:

 *** openpgp-s2k3-ocb-aes

-  This describes an algorithm using using AES-128 in OCB mode, a nonce
+  This describes an algorithm using AES-128 in OCB mode, a nonce
  of 96 bit, a taglen of 128 bit, and the String to Key algorithm 3
  from OpenPGP (rfc4880).

@ -311,7 +311,7 @@ This format is used to transfer keys between gpg and gpg-agent.
 * PROTALGO is a Libgcrypt style cipher algorithm name
 * IV is the initialization verctor.
 * S2KMODE is the value from RFC-4880.
- * S2KHASH is a a libgcrypt style hash algorithm identifier.
+ * S2KHASH is a libgcrypt style hash algorithm identifier.
 * S2KSALT is the 8 byte salt
 * S2KCOUNT is the count value from RFC-4880.

--- a/agent/preset-passphrase.c
+++ b/agent/preset-passphrase.c
@ -239,7 +239,7 @@ main (int argc, char **argv)
  else
    usage (1);

-  /* Tell simple-pwquery about the the standard socket name.  */
+  /* Tell simple-pwquery about the standard socket name.  */
  {
    char *tmp = make_filename (gnupg_socketdir (), GPG_AGENT_SOCK_NAME, NULL);
    simple_pw_set_socket (tmp);
--- a/agent/protect.c
+++ b/agent/protect.c
@ -690,7 +690,7 @@ agent_protect (const unsigned char *plainkey, const char *passphrase,
    return rc;

  /* Now create the protected version of the key.  Note that the 10
-     extra bytes are for for the inserted "protected-" string (the
+     extra bytes are for the inserted "protected-" string (the
     beginning of the plaintext reads: "((11:private-key(" ).  The 35
     term is the space for (12:protected-at15:<timestamp>).  */
  *resultlen = (10
--- a/common/argparse.c
+++ b/common/argparse.c
@ -61,7 +61,7 @@
 /* GnuPG uses GPLv3+ but a standalone version of this defaults to
   GPLv2+ because that is the license of this file.  Change this if
   you include it in a program which uses GPLv3.  If you don't want to
-   set a a copyright string for your usage() you may also hardcode it
+   set a copyright string for your usage() you may also hardcode it
   here.  */
 #ifndef GNUPG_MAJOR_VERSION

@ -571,7 +571,7 @@ optfile_parse (FILE *fp, const char *filename, unsigned *lineno,
  int unread_buf[3];  /* We use an int so that we can store EOF.  */
  int unread_buf_count = 0;

-  if (!fp) /* Divert to to arg_parse() in this case.  */
+  if (!fp) /* Divert to arg_parse() in this case.  */
    return arg_parse (arg, opts);

  initialize (arg, filename, lineno);
--- a/common/asshelp.c
+++ b/common/asshelp.c
@ -414,7 +414,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,

      /* If the agent has been configured for use with a standard
         socket, an environment variable is not required and thus
-         we we can savely start the agent here.  */
+         we can safely start the agent here.  */
      i = 0;
      argv[i++] = "--homedir";
      argv[i++] = abs_homedir;
--- a/common/dotlock.c
+++ b/common/dotlock.c
@ -411,7 +411,7 @@ struct dotlock_handle
 };


-/* A list of of all lock handles.  The volatile attribute might help
+/* A list of all lock handles.  The volatile attribute might help
   if used in an atexit handler.  Note that [UN]LOCK_all_lockfiles
   must not change ERRNO. */
 static volatile dotlock_t all_lockfiles;
@ -913,7 +913,7 @@ dotlock_create (const char *file_to_lock, unsigned int flags)



-/* Convenience function to store a file descriptor (or any any other
+/* Convenience function to store a file descriptor (or any other
   integer value) in the context of handle H.  */
 void
 dotlock_set_fd (dotlock_t h, int fd)
@ -921,7 +921,7 @@ dotlock_set_fd (dotlock_t h, int fd)
  h->extra_fd = fd;
 }

-/* Convenience function to retrieve a file descriptor (or any any other
+/* Convenience function to retrieve a file descriptor (or any other
   integer value) stored in the context of handle H.  */
 int
 dotlock_get_fd (dotlock_t h)
--- a/common/iobuf.c
+++ b/common/iobuf.c
@ -2502,7 +2502,7 @@ iobuf_get_fname_nonnull (iobuf_t a)
 * Enable or disable partial body length mode (RFC 4880 4.2.2.4).
 *
 * If LEN is 0, this disables partial block mode by popping the
- * partial body length filter, which which must be the most recently
+ * partial body length filter, which must be the most recently
 * added filter.
 *
 * If LEN is non-zero, it pushes a partial body length filter.  If
--- a/common/membuf.c
+++ b/common/membuf.c
@ -67,7 +67,7 @@ init_membuf_secure (membuf_t *mb, int initiallen)
 }


-/* Shift the the content of the membuf MB by AMOUNT bytes.  The next
+/* Shift the content of the membuf MB by AMOUNT bytes.  The next
   operation will then behave as if AMOUNT bytes had not been put into
   the buffer.  If AMOUNT is greater than the actual accumulated
   bytes, the membuf is basically reset to its initial state.  */
--- a/common/name-value.c
+++ b/common/name-value.c
@ -59,7 +59,7 @@ struct name_value_entry
  /* The name.  Comments and blank lines have NAME set to NULL.  */
  char *name;

-  /* The value as stored in the file.  We store it when when we parse
+  /* The value as stored in the file.  We store it when we parse
     a file so that we can reproduce it.  */
  strlist_t raw_value;

--- a/common/session-env.c
+++ b/common/session-env.c
@ -317,7 +317,7 @@ session_env_getenv (session_env_t se, const char *name)
   long it has not been removed or updated by a call to
   session_env_putenv.  If the variable does not exist, the function
   tries to return the value trough a call to getenv; if that returns
-   a value, this value is recorded and and used.  If no value could be
+   a value, this value is recorded and used.  If no value could be
   found, returns NULL.  The caller must not change the returned
   value. */
 char *
--- a/common/sexp-parse.h
+++ b/common/sexp-parse.h
@ -89,7 +89,7 @@ sskip (unsigned char const **buf, int *depth)
 }


-/* Check whether the the string at the address BUF points to matches
+/* Check whether the string at the address BUF points to matches
   the token.  Return true on match and update BUF to point behind the
   token.  Return false and do not update the buffer if it does not
   match. */
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@ -352,7 +352,7 @@ default_inq_cb (void *opaque, const char *line)

 /* Ask the gpg-agent for a passphrase and present the user with a
   DESCRIPTION, a PROMPT and optionally with a TRYAGAIN extra text.
-   If a CACHEID is not NULL it is used to locate the passphrase in in
+   If a CACHEID is not NULL it is used to locate the passphrase in
   the cache and store it under this ID.  If OPT_CHECK is true
   gpg-agent is asked to apply some checks on the passphrase security.
   If ERRORCODE is not NULL it should point a variable receiving an
--- a/common/simple-pwquery.h
+++ b/common/simple-pwquery.h
@ -42,7 +42,7 @@

 /* Ask the gpg-agent for a passphrase and present the user with a
   DESCRIPTION, a PROMPT and optiaonlly with a TRYAGAIN extra text.
-   If a CACHEID is not NULL it is used to locate the passphrase in in
+   If a CACHEID is not NULL it is used to locate the passphrase in
   the cache and store it under this ID.  If OPT_CHECK is true
   gpg-agent is asked to apply some checks on the passphrase security.
   If ERRORCODE is not NULL it should point a variable receiving an
--- a/common/ttyio.c
+++ b/common/ttyio.c
@ -602,7 +602,7 @@ tty_get( const char *prompt )
    return do_get ( prompt, 0 );
 }

-/* Variable argument version of tty_get.  The prompt is is actually a
+/* Variable argument version of tty_get.  The prompt is actually a
   format string with arguments.  */
 char *
 tty_getf (const char *promptfmt, ... )
--- a/common/utf8conv.c
+++ b/common/utf8conv.c
@ -160,7 +160,7 @@ set_native_charset (const char *newset)
      const char *aliases;

      /* We are a console program thus we need to use the
-         GetConsoleOutputCP function and not the the GetACP which
+         GetConsoleOutputCP function and not the GetACP which
         would give the codepage for a GUI program.  Note this is not
         a bulletproof detection because GetConsoleCP might return a
         different one for console input.  Not sure how to cope with
--- a/common/yesno.c
+++ b/common/yesno.c
@ -114,7 +114,7 @@ answer_is_yes_no_quit ( const char *s )
 }

 /*
-   Return 1 for okay, 0 for for cancel or DEF_ANSWER for default.
+   Return 1 for okay, 0 for cancel or DEF_ANSWER for default.
 */
 int
 answer_is_okay_cancel (const char *s, int def_answer)
--- a/dirmngr/certcache.c
+++ b/dirmngr/certcache.c
@ -251,7 +251,7 @@ clean_cache_slot (cert_item_t ci)
 *
 * FROM_CONFIG indicates that CERT is a permanent certificate and
 * should stay in the cache.  IS_TRUSTED requests that the trusted
- * flag is set for the certificate; a value of 1 indicates the the
+ * flag is set for the certificate; a value of 1 indicates the
 * cert is trusted due to GnuPG mechanisms, a value of 2 indicates
 * that it is trusted because it has been taken from the system's
 * store of trusted certificates.  If FPR_BUFFER is not NULL the
@ -1002,7 +1002,7 @@ get_cert_bysubject (const char *subject_dn, unsigned int seq)



-/* Return a value describing the the class of PATTERN.  The offset of
+/* Return a value describing the class of PATTERN.  The offset of
   the actual string to be used for the comparison is stored at
   R_OFFSET.  The offset of the serialnumer is stored at R_SN_OFFSET. */
 static enum pattern_class
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@ -44,7 +44,7 @@
        Field 1: Constant "v"
        Field 2: Version number of this file.  Must be 1.

-        This record must be the first non-comment record record and
+        This record must be the first non-comment record and
        there shall only exist one record of this type.

   1.3. CRL cache record
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@ -881,7 +881,7 @@ resolve_name_standard (const char *name, unsigned short port,
  else
    *portstr = 0;

-  /* We can't use the the AI_IDN flag because that does the conversion
+  /* We can't use the AI_IDN flag because that does the conversion
     using the current locale.  However, GnuPG always used UTF-8.  To
     support IDN we would need to make use of the libidn API.  */
  ret = getaddrinfo (name, *portstr? portstr : NULL, &hints, &aibuf);
@ -1680,7 +1680,7 @@ get_dns_cert_standard (const char *name, int want_certtype,
   found, the malloced data is returned at (R_KEY, R_KEYLEN) and
   the other return parameters are set to NULL/0.  If an IPGP CERT
   record was found the fingerprint is stored as an allocated block at
-   R_FPR and its length at R_FPRLEN; an URL is is allocated as a
+   R_FPR and its length at R_FPRLEN; an URL is allocated as a
   string and returned at R_URL.  If WANT_CERTTYPE is 0 this function
   returns the first CERT found with a supported type; it is expected
   that only one CERT record is used.  If WANT_CERTTYPE is one of the
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@ -1157,7 +1157,7 @@ http_get_status_code (http_t hd)
 /* Return information pertaining to TLS.  If TLS is not in use for HD,
   NULL is returned.  WHAT is used ask for specific information:

-     (NULL) := Only check whether TLS is is use.  Returns an
+     (NULL) := Only check whether TLS is in use.  Returns an
               unspecified string if TLS is in use.  That string may
               even be the empty string.
 */
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@ -1471,7 +1471,7 @@ modlist_dump (LDAPMod **modlist, estream_t output)
 	  for ((ptr = (*m)->mod_values), (i = 1); ptr && *ptr; ptr++, i ++)
 	    {
 	      /* Assuming terminals are about 80 characters wide,
-		 display at most most about 10 lines of debugging
+		 display at most about 10 lines of debugging
 		 output.  If we do trim the buffer, append '...' to
 		 the end.  */
 	      const int max_len = 10 * 70;
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@ -190,7 +190,7 @@ data_line_write (assuan_context_t ctx, const void *buffer_arg, size_t size)
  const char *buffer = buffer_arg;
  gpg_error_t err;

-  /* If we do not want logging, enable it it here.  */
+  /* If we do not want logging, enable it here.  */
  if (ctrl && ctrl->server_local && ctrl->server_local->inhibit_data_logging)
    ctrl->server_local->inhibit_data_logging_now = 1;

--- 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>
--- 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
--- 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}.
--- 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
--- 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
--- 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.


--- 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.


--- 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
--- 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.
--- 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
--- a/g10/armor.c
+++ b/g10/armor.c
@ -1294,7 +1294,7 @@ armor_filter( void *opaque, int control,
 	    c = bintoasc[radbuf[2]&077];
 	    iobuf_put(a, c);
 	    iobuf_writestr(a,afx->eol);
-	    /* and the the trailer */
+	    /* and the trailer */
 	    if( afx->what >= DIM(tail_strings) )
 		log_bug("afx->what=%d", afx->what);
 	    iobuf_writestr(a, "-----");
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@ -621,7 +621,7 @@ calc_plaintext( PKT_plaintext *pt )
   is assumed to have been enabled on OUT.  On success, partial block
   mode is disabled.

-   If PT->BUF is NULL, the the caller must write out the data.  In
+   If PT->BUF is NULL, the caller must write out the data.  In
   this case, if PT->LEN was 0, then partial body length mode was
   enabled and the caller must disable it by calling
   iobuf_set_partial_body_length_mode (out, 0).  */
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@ -340,7 +340,7 @@ unescape_status_string (const unsigned char *s)
 }


-/* Take a 20 byte hexencoded string and put it into the the provided
+/* Take a 20 byte hexencoded string and put it into the provided
   20 byte buffer FPR in binary format. */
 static int
 unhexify_fpr (const char *hexstr, unsigned char *fpr)
--- a/g10/card-util.c
+++ b/g10/card-util.c
@ -72,7 +72,7 @@ write_sc_op_status (gpg_error_t err)
 }


-/* Change the PIN of a an OpenPGP card.  This is an interactive
+/* Change the PIN of an OpenPGP card.  This is an interactive
   function. */
 void
 change_pin (int unblock_v2, int allow_admin)
--- a/g10/compress.c
+++ b/g10/compress.c
@ -182,7 +182,7 @@ do_uncompress( compress_filter_context_t *zfx, z_stream *zs,
 	    nread = iobuf_read( a, zfx->inbuf + n, count );
 	    if( nread == -1 ) nread = 0;
 	    n += nread;
-	    /* Algo 1 has no zlib header which requires us to to give
+	    /* Algo 1 has no zlib header which requires us to give
 	     * inflate an extra dummy byte to read. To be on the safe
 	     * side we allow for up to 4 ff bytes.  */
 	    if( nread < count && zfx->algo == 1 && zfx->algo1hack < 4) {
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@ -319,7 +319,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey)
           && !overflow && opt.verbose)
        log_info(_("WARNING: '%s' is an empty file\n"), filename );
      /* We can't encode the length of very large files because
-         OpenPGP uses only 32 bit for file sizes.  So if the the
+         OpenPGP uses only 32 bit for file sizes.  So if the
         size of a file is larger than 2^32 minus some bytes for
         packet headers, we switch to partial length encoding. */
      if ( tmpsize < (IOBUF_FILELENGTH_LIMIT - 65536) )
@ -461,7 +461,7 @@ write_symkey_enc (STRING2KEY *symkey_s2k, DEK *symkey_dek, DEK *dek,
 * The caller may provide a checked list of public keys in
 * PROVIDED_PKS; if not the function builds a list of keys on its own.
 *
- * Note that FILEFD is currently only used by cmd_encrypt in the the
+ * Note that FILEFD is currently only used by cmd_encrypt in the
 * not yet finished server.c.
 */
 int
@ -659,7 +659,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
           && !overflow && opt.verbose)
        log_info(_("WARNING: '%s' is an empty file\n"), filename );
      /* We can't encode the length of very large files because
-         OpenPGP uses only 32 bit for file sizes.  So if the the size
+         OpenPGP uses only 32 bit for file sizes.  So if the size
         of a file is larger than 2^32 minus some bytes for packet
         headers, we switch to partial length encoding. */
      if (tmpsize < (IOBUF_FILELENGTH_LIMIT - 65536) )
--- a/g10/export.c
+++ b/g10/export.c
@ -1022,7 +1022,7 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
          err = gpg_error (GPG_ERR_UNKNOWN_CURVE);
          goto leave;
        }
-      /* Put the curve's OID into into the MPI array.  This requires
+      /* Put the curve's OID into the MPI array.  This requires
         that we shift Q and D.  For ECDH also insert the KDF parms. */
      if (is_ecdh)
        {
--- a/g10/getkey.c
+++ b/g10/getkey.c
@ -1143,7 +1143,7 @@ key_byname (GETKEY_CTX *retctx, strlist_t namelist,

 /* Find a public key identified by NAME.
 *
- * If name appears to be a valid valid RFC822 mailbox (i.e., email
+ * If name appears to be a valid RFC822 mailbox (i.e., email
 * address) and auto key lookup is enabled (no_akl == 0), then the
 * specified auto key lookup methods (--auto-key-lookup) are used to
 * import the key into the local keyring.  Otherwise, just the local
--- a/g10/import.c
+++ b/g10/import.c
@ -76,7 +76,7 @@ struct import_stats_s
 #define NODE_FLAG_A  8


-/* A an object and a global instance to store selectors created from
+/* An object and a global instance to store selectors created from
 * --import-filter keep-uid=EXPR.
 * --import-filter drop-sig=EXPR.
 *
--- a/g10/keydb.c
+++ b/g10/keydb.c
@ -1092,7 +1092,7 @@ unlock_all (KEYDB_HANDLE hd)
 *   keydb_get_keyblock (hd, ...);  // -> Result 1.
 *
 * Note: it is only possible to save a single save state at a time.
- * In other words, the the save stack only has room for a single
+ * In other words, the save stack only has room for a single
 * instance of the state.  */
 void
 keydb_push_found_state (KEYDB_HANDLE hd)
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@ -1080,7 +1080,7 @@ trustsig_prompt (byte * trust_value, byte * trust_depth, char **regexp)


 /*
- * Loop over all LOCUSR and and sign the uids after asking.  If no
+ * Loop over all LOCUSR and sign the uids after asking.  If no
 * user id is marked, all user ids will be signed; if some user_ids
 * are marked only those will be signed.  If QUICK is true the
 * function won't ask the user and use sensible defaults.
@ -5186,7 +5186,7 @@ change_primary_uid_cb (PKT_signature * sig, void *opaque)
 * Set the primary uid flag for the selected UID.  We will also reset
 * all other primary uid flags.  For this to work with have to update
 * all the signature timestamps.  If we would do this with the current
- * time, we lose quite a lot of information, so we use a a kludge to
+ * time, we lose quite a lot of information, so we use a kludge to
 * do this: Just increment the timestamp by one second which is
 * sufficient to updated a signature during import.
 */
--- a/g10/keygen.c
+++ b/g10/keygen.c
@ -1786,7 +1786,7 @@ ask_key_flags (int algo, int subkey, unsigned int current)
              else if (!subkey && *s == 'c')
                {
                  /* Accept 'c' for the primary key because USAGE_CERT
-                     will will be set anyway.  This is for folks who
+                     will be set anyway.  This is for folks who
                     want to experiment with a cert-only primary key.  */
                  current |= PUBKEY_USAGE_CERT;
                }
--- a/g10/keyid.c
+++ b/g10/keyid.c
@ -202,7 +202,7 @@ hash_public_key (gcry_md_hd_t md, PKT_public_key *pk)
    }

  gcry_md_putc ( md, 0x99 );     /* ctb */
-  /* What does it mean if n is greater than than 0xFFFF ? */
+  /* What does it mean if n is greater than 0xFFFF ? */
  gcry_md_putc ( md, n >> 8 );   /* 2 byte length header */
  gcry_md_putc ( md, n );
  gcry_md_putc ( md, pk->version );
--- a/g10/keyring.c
+++ b/g10/keyring.c
@ -777,7 +777,7 @@ prepare_search (KEYRING_HANDLE hd)


 /* A map of the all characters valid used for word_match()
- * Valid characters are in in this table converted to uppercase.
+ * Valid characters are in this table converted to uppercase.
 * because the upper 128 bytes have special meaning, we assume
 * that they are all valid.
 * Note: We must use numerical values here in case that this program
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@ -78,7 +78,7 @@ struct mainproc_context
     signature. */
  struct
  {
-    /* A file descriptor of the the signed data.  Only used if not -1. */
+    /* A file descriptor of the signed data.  Only used if not -1. */
    int data_fd;
    /* A list of filenames with the data files or NULL. This is only
       used if DATA_FD is -1. */
@ -1997,7 +1997,7 @@ check_sig_and_print (CTX c, kbnode_t node)

      log_assert (mainpk);

-      /* In case we did not found a valid valid textual userid above
+      /* In case we did not found a valid textual userid above
         we print the first user id packet or a "[?]" instead along
         with the "Good|Expired|Bad signature" line.  */
      if (!count)
--- a/g10/misc.c
+++ b/g10/misc.c
@ -522,7 +522,7 @@ openpgp_cipher_blocklen (cipher_algo_t algo)
     block length.  This is so that the packet parsing code works even
     for unknown algorithms (for which we assume 8 due to tradition).

-     NOTE: If you change the the returned blocklen above 16, check
+     NOTE: If you change the returned blocklen above 16, check
     the callers because they may use a fixed size buffer of that
     size. */
  switch (algo)
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@ -818,7 +818,7 @@ expand_group (strlist_t input)
 * success the new key is added to PK_LIST_ADDR.  NAME is the user id
 * of the key.  USE the requested usage and a set MARK_HIDDEN will
 * mark the key in the updated list as a hidden recipient.  If
- * FROM_FILE is true, NAME is is not a user ID but the name of a file
+ * FROM_FILE is true, NAME is not a user ID but the name of a file
 * holding a key. */
 gpg_error_t
 find_and_check_key (ctrl_t ctrl, const char *name, unsigned int use,
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@ -211,7 +211,7 @@ get_it (PKT_pubkey_enc *enc, DEK *dek, PKT_public_key *sk, u32 *keyid)

  /* Now get the DEK (data encryption key) from the frame
   *
-   * Old versions encode the DEK in in this format (msb is left):
+   * Old versions encode the DEK in this format (msb is left):
   *
   *     0  1  DEK(16 bytes)  CSUM(2 bytes)  0  RND(n bytes) 2
   *
--- a/g10/revoke.c
+++ b/g10/revoke.c
@ -442,7 +442,7 @@ gen_desig_revoke (ctrl_t ctrl, const char *uname, strlist_t locusr)
   to stdout or the filename given by --output.  REASON describes the
   revocation reason.  PSK is the public primary key - we expect that
   a corresponding secret key is available.  KEYBLOCK is the entire
-   KEYBLOCK which is used in PGP mode to write a a minimal key and not
+   KEYBLOCK which is used in PGP mode to write a minimal key and not
   just the naked revocation signature; it may be NULL.  If LEADINTEXT
   is not NULL, it is written right before the (armored) output.*/
 static int
--- a/g10/rmd160.c
+++ b/g10/rmd160.c
@ -17,7 +17,7 @@
 * along with this program; if not, see <https://www.gnu.org/licenses/>.
 */

-/* For historic reasons gpg uses RIPE-MD160 to to identify names in
+/* For historic reasons gpg uses RIPE-MD160 to identify names in
   the trustdb.  It would be better to change that to SHA-1, to take
   advantage of a SHA-1 hardware operation provided by some CPUs.
   This would break trustdb compatibility and thus we don't want to do
--- a/g10/tofu.c
+++ b/g10/tofu.c
@ -2949,7 +2949,7 @@ write_stats_status (estream_t fp,
 *
 * POLICY is the key's policy (as returned by get_policy).
 *
- * Returns 0 if if ONLY_STATUS_FD is set.  Otherwise, returns whether
+ * Returns 0 if ONLY_STATUS_FD is set.  Otherwise, returns whether
 * the caller should call show_warning after iterating over all user
 * ids.
 */
--- a/g10/trust.c
+++ b/g10/trust.c
@ -186,7 +186,7 @@ get_ownertrust (PKT_public_key *pk)

 /*
 * Same as get_ownertrust but this takes the minimum ownertrust value
- * into into account, and will bump up the value as needed.
+ * into account, and will bump up the value as needed.
 */
 static int
 get_ownertrust_with_min (PKT_public_key *pk)
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@ -222,7 +222,7 @@ tdb_register_trusted_key( const char *string )

 /*
 * Helper to add a key to the global list of ultimately trusted keys.
- * Retruns: true = inserted, false = already in in list.
+ * Retruns: true = inserted, false = already in list.
 */
 static int
 add_utk (u32 *kid)
--- a/g13/g13-syshelp.h
+++ b/g13/g13-syshelp.h
@ -32,7 +32,7 @@ struct tab_item_s
  char *label;       /* Optional malloced label for that entry.  */
  char *mountpoint;  /* NULL or a malloced mountpoint.  */
  char blockdev[1];  /* String with the name of the block device.  If
-                        it starts with a slash is is a regular device
+                        it starts with a slash it is a regular device
                        name, otherwise it is a PARTUUID.  */
 };

--- a/kbx/keybox-blob.c
+++ b/kbx/keybox-blob.c
@ -123,7 +123,7 @@
          IDs go here.
   - bN   Space for the keyblock or certificate.
   - bN   RFU.  This is the remaining space after keyblock and before
-          the checksum.  Is is not covered by the checksum.
+          the checksum.  It is not covered by the checksum.
   - b20  SHA-1 checksum (useful for KS syncronisation?)
          Note, that KBX versions before GnuPG 2.1 used an MD5
          checksum.  However it was only created but never checked.
@ -589,7 +589,7 @@ create_blob_header (KEYBOXBLOB blob, int blobtype, int as_ephemeral)
  put32 ( a, 0 );  /* size of reserved space */
  /* reserved space (which is currently of size 0) */

-  /* space where we write keyIDs and and other stuff so that the
+  /* space where we write keyIDs and other stuff so that the
     pointers can actually point to somewhere */
  if (blobtype == KEYBOX_BLOBTYPE_PGP)
    {
--- a/m4/autobuild.m4
+++ b/m4/autobuild.m4
@ -7,7 +7,7 @@
 # that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
-# This file can can be used in projects which are not available under
+# This file can be used in projects which are not available under
 # the GNU General Public License or the GNU Library General Public
 # License but which still want to provide support for Autobuild.

--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@ -4,13 +4,13 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.

 dnl Authors:
--- a/m4/intl.m4
+++ b/m4/intl.m4
@ -4,13 +4,13 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.

 dnl Authors:
--- a/m4/intldir.m4
+++ b/m4/intldir.m4
@ -4,13 +4,13 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.

 AC_PREREQ(2.52)
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@ -4,13 +4,13 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.

 dnl Authors:
--- a/m4/nls.m4
+++ b/m4/nls.m4
@ -4,13 +4,13 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.

 dnl Authors:
--- a/m4/po.m4
+++ b/m4/po.m4
@ -4,13 +4,13 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.

 dnl Authors:
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@ -4,13 +4,13 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.

 dnl Authors:
--- a/scd/apdu.c
+++ b/scd/apdu.c
@ -2017,7 +2017,7 @@ open_pcsc_reader_wrapped (const char *portstr)
  unsigned int dummy_status;

  /* Note that we use the constant and not the function because this
-     code won't be be used under Windows.  */
+     code won't be used under Windows.  */
  const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper";

  if (access (wrapperpgm, X_OK))
--- a/scd/app-dinsig.c
+++ b/scd/app-dinsig.c
@ -416,7 +416,7 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
    return gpg_error (GPG_ERR_INV_VALUE);

  /* Check that the provided ID is vaid.  This is not really needed
-     but we do it to to enforce correct usage by the caller. */
+     but we do it to enforce correct usage by the caller. */
  if (strncmp (keyidstr, "DINSIG.", 7) )
    return gpg_error (GPG_ERR_INV_ID);
  keyidstr += 7;
--- a/scd/app-geldkarte.c
+++ b/scd/app-geldkarte.c
@ -288,7 +288,7 @@ app_select_geldkarte (app_t app)
    goto leave;

  /* Read the first record of EF_ID (SFI=0x17).  We require this
-     record to be at least 24 bytes with the the first byte 0x67 and a
+     record to be at least 24 bytes with the first byte 0x67 and a
     correct filler byte. */
  err = iso7816_read_record (slot, 1, 1, ((0x17 << 3)|4), &result, &resultlen);
  if (err)
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@ -1004,7 +1004,7 @@ do_decipher (app_t app, const char *keyidstr,
    return gpg_error (GPG_ERR_INV_VALUE);

  /* Check that the provided ID is valid.  This is not really needed
-     but we do it to to enforce correct usage by the caller. */
+     but we do it to enforce correct usage by the caller. */
  if (!strncmp (keyidstr, "NKS-NKS3.", 9) )
    ;
  else if (!strncmp (keyidstr, "NKS-DF01.", 9) )
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@ -619,7 +619,7 @@ count_bits (const unsigned char *a, size_t len)
    The lsb is here the rightmost bit.  Defined flags bits are:

      Bit 0 = CHV1 and CHV2 are not syncronized
-      Bit 1 = CHV2 has been been set to the default PIN of "123456"
+      Bit 1 = CHV2 has been set to the default PIN of "123456"
              (this implies that bit 0 is also set).

    P=<pinpad-request>
@ -1874,7 +1874,7 @@ check_pinpad_request (app_t app, pininfo_t *pininfo, int admin_pin)
 }


-/* Verify a CHV either using using the pinentry or if possible by
+/* Verify a CHV either using the pinentry or if possible by
   using a pinpad.  PINCB and PINCB_ARG describe the usual callback
   for the pinentry.  CHVNO must be either 1 or 2. SIGCOUNT is only
   used with CHV1.  PINVALUE is the address of a pointer which will
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@ -961,7 +961,7 @@ parse_ccid_descriptor (ccid_driver_t handle, unsigned short bcd_device,
     The
         0x5117 - SCR 3320 USB ID-000 reader
     seems to be very slow but enabling this workaround boosts the
-     performance to a a more or less acceptable level (tested by David).
+     performance to a more or less acceptable level (tested by David).

  */
  if (handle->id_vendor == VENDOR_SCM
@ -1302,7 +1302,7 @@ scan_or_find_usb_device (int scan_mode,

   With READERNO >= 0 or READERID is not NULL find mode is used.  This
   uses the same algorithm as the scan mode but stops and returns at
-   the entry number READERNO and return the handle for the the opened
+   the entry number READERNO and return the handle for the opened
   USB device. If R_RID is not NULL it will receive the reader ID of
   that device.  If R_DEV is not NULL it will the device pointer of
   that device.  If IFCDESC_EXTRA is NOT NULL it will receive a
--- a/scd/command.c
+++ b/scd/command.c
@ -900,7 +900,7 @@ cmd_getattr (assuan_context_t ctx, char *line)
 static const char hlp_setattr[] =
  "SETATTR <name> <value> \n"
  "\n"
-  "This command is used to store data on a a smartcard.  The allowed\n"
+  "This command is used to store data on a smartcard.  The allowed\n"
  "names and values are depend on the currently selected smartcard\n"
  "application.  NAME and VALUE must be percent and '+' escaped.\n"
  "\n"
@ -954,7 +954,7 @@ static const char hlp_writecert[] =
  "application. The actual certifciate is requested using the inquiry\n"
  "\"CERTDATA\" and needs to be provided in its raw (e.g. DER) form.\n"
  "\n"
-  "In almost all cases a a PIN will be requested.  See the related\n"
+  "In almost all cases a PIN will be requested.  See the related\n"
  "writecert function of the actually used application (app-*.c) for\n"
  "details.";
 static gpg_error_t
@ -1007,7 +1007,7 @@ cmd_writecert (assuan_context_t ctx, char *line)
 static const char hlp_writekey[] =
  "WRITEKEY [--force] <keyid> \n"
  "\n"
-  "This command is used to store a secret key on a a smartcard.  The\n"
+  "This command is used to store a secret key on a smartcard.  The\n"
  "allowed keyids depend on the currently selected smartcard\n"
  "application. The actual keydata is requested using the inquiry\n"
  "\"KEYDATA\" and need to be provided without any protection.  With\n"
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@ -430,7 +430,7 @@ inq_certificate (void *opaque, const char *line)
 }


-/* Take a 20 byte hexencoded string and put it into the the provided
+/* Take a 20 byte hexencoded string and put it into the provided
   20 byte buffer FPR in binary format. */
 static int
 unhexify_fpr (const char *hexstr, unsigned char *fpr)
--- a/sm/certchain.c
+++ b/sm/certchain.c
@ -2120,7 +2120,7 @@ get_regtp_ca_info (ctrl_t ctrl, ksba_cert_t cert, int *chainlen)
    }

  /* If this is a German signature law issued certificate, we store
-     additional additional information. */
+     additional information. */
  if (!gpgsm_is_in_qualified_list (NULL, array[depth-1], country)
      && !strcmp (country, "de"))
    {
--- a/sm/certdump.c
+++ b/sm/certdump.c
@ -492,7 +492,7 @@ print_dn_part (estream_t stream,
        {
          /* Forward to the last multi-valued RDN, so that we can
             print them all in reverse in the correct order.  Note
-             that this overrides the the standard sequence but that
+             that this overrides the standard sequence but that
             seems to a reasonable thing to do with multi-valued
             RDNs. */
          while (dn->multivalued && dn[1].key)
--- a/sm/certlist.c
+++ b/sm/certlist.c
@ -336,7 +336,7 @@ gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
            {
              if (!first_subject)
                {
-                  /* Save the the subject and the issuer for key usage
+                  /* Save the subject and the issuer for key usage
                     and ambiguous name tests. */
                  first_subject = ksba_cert_get_subject (cert, 0);
                  first_issuer = ksba_cert_get_issuer (cert, 0);
--- a/sm/keydb.c
+++ b/sm/keydb.c
@ -265,7 +265,7 @@ keydb_add_resource (ctrl_t ctrl, const char *url, int force, int *auto_created)

  /* Do we have an URL?
     gnupg-kbx:filename := this is a plain keybox
-     filename := See what is is, but create as plain keybox.
+     filename := See what it is, but create as plain keybox.
  */
  if (strlen (resname) > 10)
    {
--- a/sm/keylist.c
+++ b/sm/keylist.c
@ -1280,7 +1280,7 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret,
 }


-/* Same as standard mode mode list all certifying certs too. */
+/* Same as standard mode list all certifying certs too. */
 static void
 list_cert_chain (ctrl_t ctrl, KEYDB_HANDLE hd,
                 ksba_cert_t cert, int raw_mode,
--- a/tests/gpgscm/main.c
+++ b/tests/gpgscm/main.c
@ -88,7 +88,7 @@ parse_arguments (ARGPARSE_ARGS *pargs, ARGPARSE_OPTS *popts)
    }
 }

-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
 static const char *
 my_strusage( int level )
 {
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@ -29,7 +29,7 @@
 (define usrpass3 "")

 (define dsa-usrname1 "pgp5")
-;; we use the sub key because we do not yet have the logic to to derive
+;; we use the sub key because we do not yet have the logic to derive
 ;; the first encryption key from a keyblock (I guess) (Well of course
 ;; we have this by now and the notation below will lookup the primary
 ;; first and then search for the encryption subkey.)
--- a/tests/openpgp/verify.scm
+++ b/tests/openpgp/verify.scm
@ -269,7 +269,7 @@ well.  (And post to comp.std.mumps, since they hardly get any articles
 there, and a \"comp\" group will propagate your article further.)
 	You may also find it is more fun to post the article once in each
 group.  If you list all the newsgroups in the same article, some newsreaders
-will only show the the article to the reader once!  Don't tolerate this.
+will only show the article to the reader once!  Don't tolerate this.
 		-- Emily Postnews Answers Your Questions on Netiquette
 -----BEGIN PGP SIGNATURE-----

--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@ -187,7 +187,7 @@ static assuan_context_t start_agent (void);



-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
 static const char *
 my_strusage( int level )
 {
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@ -129,7 +129,7 @@ static gpg_error_t command_receive_cb (void *opaque,



-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
 static const char *
 my_strusage( int level )
 {
--- a/tools/gpg-wks-server.c
+++ b/tools/gpg-wks-server.c
@ -133,7 +133,7 @@ static gpg_error_t command_cron (void);



-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
 static const char *
 my_strusage( int level )
 {
@ -1105,7 +1105,7 @@ process_new_key (server_ctx_t ctx, estream_t key)

      if (policybuf.auth_submit)
        {
-          /* Bypass the confirmation stuff and publish the the key as is.  */
+          /* Bypass the confirmation stuff and publish the key as is.  */
          log_info ("publishing address '%s'\n", sl->d);
          /* FIXME: We need to make sure that we do this only for the
           * address in the mail.  */
@ -1525,7 +1525,7 @@ command_receive_cb (void *opaque, const char *mediatype,


 /* Return a list of all configured domains.  ECh list element is the
- * top directory for for the domain.  To figure out the actual domain
+ * top directory for the domain.  To figure out the actual domain
 * name strrchr(name, '/') can be used.  */
 static gpg_error_t
 get_domain_list (strlist_t *r_list)
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@ -109,7 +109,7 @@ static ARGPARSE_OPTS opts[] =
  };


-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
 static const char *
 my_strusage( int level )
 {
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@ -137,7 +137,7 @@ static ARGPARSE_OPTS tar_opts[] = {



-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
 static const char *
 my_strusage( int level )
 {
@ -507,7 +507,7 @@ main (int argc, char **argv)

 /* Read the next record from STREAM.  RECORD is a buffer provided by
   the caller and must be at leadt of size RECORDSIZE.  The function
-   return 0 on success and and error code on failure; a diagnostic
+   return 0 on success and error code on failure; a diagnostic
   printed as well.  Note that there is no need for an EOF indicator
   because a tarball has an explicit EOF record. */
 gpg_error_t
--- a/tools/mail-signed-keys
+++ b/tools/mail-signed-keys
@ -41,7 +41,7 @@ if [ -z "$signedby" ]; then
 fi

 if [ "$dryrun" = "0" ]; then
-  echo "About to send the the keys signed by $signedby" >&2
+  echo "About to send the keys signed by $signedby" >&2
  echo -n "to their owners.  Do you really want to do this? (y/N)" >&2
  read
  [ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@ -191,7 +191,7 @@ struct
 } opt;


-/* Print usage information and and provide strings for help.  */
+/* Print usage information and provide strings for help.  */
 static const char *
 my_strusage (int level)
 {
@ -997,7 +997,7 @@ main (int argc, char **argv)
  setup_libgcrypt_logging ();
  gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);

-  /* Tell simple-pwquery about the the standard socket name.  */
+  /* Tell simple-pwquery about the standard socket name.  */
  {
    char *tmp = make_filename (gnupg_socketdir (), GPG_AGENT_SOCK_NAME, NULL);
    simple_pw_set_socket (tmp);