diff options
Diffstat (limited to '')
| -rw-r--r-- | doc/dirmngr.texi | 4 | ||||
| -rw-r--r-- | doc/gpg-agent.texi | 2 | ||||
| -rw-r--r-- | doc/gpg-card.texi | 4 | ||||
| -rw-r--r-- | doc/gpg.texi | 4 | ||||
| -rw-r--r-- | g10/call-keyboxd.c | 2 | ||||
| -rw-r--r-- | tools/gpg-card.c | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi index aaa30ec50..f5558689a 100644 --- a/doc/dirmngr.texi +++ b/doc/dirmngr.texi @@ -320,7 +320,7 @@ provided. These are the same as the @option{--keyserver-options} of @command{gpg}, but apply only to this particular keyserver. Most keyservers synchronize with each other, so there is generally no -need to send keys to more than one server. Somes keyservers use round +need to send keys to more than one server. Some keyservers use round robin DNS to give a different keyserver each time you use it. If exactly two keyservers are configured and only one is a Tor hidden @@ -751,7 +751,7 @@ allow-ocsp To make sure that new options are read or that after the installation of a new GnuPG versions the right dirmngr version is running, you should kill an existing dirmngr so that a new instance is started as -needed by the otehr components: +needed by the other components: @example gpgconf --kill dirmngr diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index 97abbed59..921522d53 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -175,7 +175,7 @@ listening sockets. This option is deprecated and not supported on Windows. If in @file{common.conf} the option @option{no-autostart} is set, any -start attemps will be ignored. +start attempts will be ignored. In --supervised mode, different file descriptors can be provided for use as different socket types (e.g. ssh, extra) as long as they are diff --git a/doc/gpg-card.texi b/doc/gpg-card.texi index c21516791..33cdbd96d 100644 --- a/doc/gpg-card.texi +++ b/doc/gpg-card.texi @@ -153,7 +153,7 @@ Command completion in the interactive mode is also supported. @item AUTHENTICATE [--setkey] [--raw] [< @var{file}]|@var{key}] @itemx AUTH @opindex authenticate -Authenticate to the card. Perform a mutual autentication either by +Authenticate to the card. Perform a mutual authentication either by reading the key from @var{file} or by taking it from the command line as @var{key}. Without the option @option{--raw} the key is expected to be hex encoded. To install a new administration key @@ -242,7 +242,7 @@ a @var{pinref} a menu is presented for certain cards." In non-interactive mode and without a @var{pinref} a default value i used for these cards. The option @option{--reset} is used with TCOS cards to reset the PIN using the PUK or vice versa; the option -@var{--nullpin} is used for these cards to set the intial PIN. +@var{--nullpin} is used for these cards to set the initial PIN. @item PRIVATEDO [--clear] @var{n} [< @var{file}] @opindex privatedo diff --git a/doc/gpg.texi b/doc/gpg.texi index 466baf3bf..a50252d38 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -616,7 +616,7 @@ Emit @var{count} random bytes of the given quality level 0, 1 or 2. If @var{count} is not given or zero, an endless sequence of random bytes will be emitted. If used with @option{--armor} the output will be base64 encoded. The special level 16 uses a quality level of 1 and -outpust end endless stream of hex-encoded octets. The special level +outputs an endless stream of hex-encoded octets. The special level 30 outputs random as 30 zBase-32 characters. @item --gen-prime @var{mode} @var{bits} @@ -2048,7 +2048,7 @@ are available for all keyserver types, some common options are: The default list of options is: "self-sigs-only, import-clean, repair-keys, repair-pks-subkey-bug, export-attributes". However, if the actual used source is an LDAP server "no-self-sigs-only" is -assumed unless "self-sigs-only" has been explictly configured. +assumed unless "self-sigs-only" has been explicitly configured. @item --completes-needed @var{n} diff --git a/g10/call-keyboxd.c b/g10/call-keyboxd.c index e2fede235..7f4d5f493 100644 --- a/g10/call-keyboxd.c +++ b/g10/call-keyboxd.c @@ -106,7 +106,7 @@ gpg_keyboxd_deinit_session_data (ctrl_t ctrl) err = assuan_transact (kbl->ctx, "TRANSACTION commit", NULL, NULL, NULL, NULL, NULL, NULL); if (err) - log_error ("error commiting last transaction: %s\n", + log_error ("error committing last transaction: %s\n", gpg_strerror (err)); in_transaction = 0; } diff --git a/tools/gpg-card.c b/tools/gpg-card.c index 4edafcc83..a94aabea9 100644 --- a/tools/gpg-card.c +++ b/tools/gpg-card.c @@ -1243,7 +1243,7 @@ cmd_list (card_info_t info, char *argstr) if (!info->serialno || info->need_sn_cmd) { - /* This is probably the first call or was explictly requested. + /* This is probably the first call or was explicitly requested. * We need to send a SERIALNO command to scdaemon so that our * session knows all cards. */ err = scd_serialno (NULL, NULL); @@ -2740,7 +2740,7 @@ cmd_passwd (card_info_t info, char *argstr) "in non-interactive and without a PINREF a default value is\n" "used for these cards. The option --reset is used with TCOS\n" "cards to reset the PIN using the PUK or vice versa; --nullpin\n" - "is used for these cards to set the intial PIN.", + "is used for these cards to set the initial PIN.", 0); if (opt.interactive || opt.verbose) @@ -2939,7 +2939,7 @@ cmd_passwd (card_info_t info, char *argstr) else if (!ascii_strcasecmp (pinref, "OPENPGP.3")) log_info ("Admin PIN changed.\n"); else if (reset_mode) - log_info ("PIN resetted.\n"); + log_info ("PIN reset.\n"); else log_info ("PIN changed.\n"); |