Spelling fixes in docs and comments.

--

In addition, fix trailing spaces in tests/inittests.

GnuPG-bug-id: 3121
Reported-by: ka7 (klemens)
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

7 files changed, 7 insertions, 7 deletions

diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index f20d33145..00482a32e 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -839,7 +839,7 @@ add_definq (char *line, int is_var, int is_prog)
 }
 
 
-/* Show all inquiry defintions. */
+/* Show all inquiry definitions. */
 static void
 show_definq (void)
 {
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 0ef3cb434..f608f7a2c 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1389,7 +1389,7 @@ gc_component_reload (int component)
 
 /* More or less Robust version of dgettext.  It has the side effect of
    switching the codeset to utf-8 because this is what we want to
-   output.  In theory it is posible to keep the original code set and
+   output.  In theory it is possible to keep the original code set and
    switch back for regular disgnostic output (redefine "_(" for that)
    but given the natur of this tool, being something invoked from
    other pograms, it does not make much sense.  */
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index d6bf9a26a..223655567 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -329,7 +329,7 @@ query_swdb (estream_t out, const char *name, const char *current_version)
       goto leave;
     }
 
-  /* Note that the parser uses the first occurance of a matching
+  /* Note that the parser uses the first occurrence of a matching
    * values and ignores possible duplicated values.  */
 
   maxlen = 2048; /* Set limit.  */
diff --git a/tools/mail-signed-keys b/tools/mail-signed-keys
index 3c564f11c..263b8e535 100755
--- a/tools/mail-signed-keys
+++ b/tools/mail-signed-keys
@@ -9,7 +9,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# FIXME: Use only valid email addreses, extract only given keys
+# FIXME: Use only valid email addresses, extract only given keys
 
 dryrun=0
 if [ "$1" = "--dry-run" ]; then
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index 563e56bc3..54976cae5 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -432,7 +432,7 @@ confucius_copy_file (char *infile, char *outfile, int plain)
 /* Get a passphrase in secure storage (if possible).  If AGAIN is
    true, then this is a repeated attempt.  If CANCELED is not a null
    pointer, it will be set to true or false, depending on if the user
-   canceled the operation or not.  On error (including cancelation), a
+   canceled the operation or not.  On error (including cancellation), a
    null pointer is returned.  The passphrase must be deallocated with
    confucius_drop_pass.  CACHEID is the ID to be used for passphrase
    caching and can be NULL to disable caching.  */
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index f8b6fdc60..fc58d1428 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -446,7 +446,7 @@ main (int argc, char **argv)
       client_t client;
 
       /* Usually we don't have that many connections, thus it is okay
-         to set them allways from scratch and don't maintain an active
+         to set them always from scratch and don't maintain an active
          fd_set. */
       FD_ZERO (&rfds);
       max_fd = -1;
diff --git a/tools/wks-util.c b/tools/wks-util.c
index d78e01d00..8eab8344b 100644
--- a/tools/wks-util.c
+++ b/tools/wks-util.c
@@ -1,4 +1,4 @@
-/* wks-utils.c - Common helper fucntions for wks tools
+/* wks-utils.c - Common helper functions for wks tools
  * Copyright (C) 2016 g10 Code GmbH
  *
  * This file is part of GnuPG.