doc: Fix mistakes.

* doc/dirmngr.texi, doc/gpg.texi, doc/gpgsm.texi,
doc/howto-create-a-server-cert.texi,
doc/scdaemon.texi, doc/tools.texi: Fix.

6 files changed, 17 insertions, 18 deletions

diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 0f37cc4e3..12ce6306c 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -419,7 +419,7 @@ prefix with a hash mark are ignored.
 @item --ocsp-max-clock-skew @var{n}
 @opindex ocsp-max-clock-skew
 The number of seconds a skew between the OCSP responder and them local
-clock is accepted.  Default is 600 (20 minutes).
+clock is accepted.  Default is 600 (10 minutes).
 
 @item --ocsp-max-period @var{n}
 @opindex ocsp-max-period
@@ -747,7 +747,7 @@ this the root certificate:
   C: END
 @end example
 
-Only this answer will let Dirmngr consider the CRL as valid.
+Only this answer will let Dirmngr consider the certificate as valid.
 
 
 @node Dirmngr CHECKCRL
diff --git a/doc/gpg.texi b/doc/gpg.texi
index c40a20fa3..a9ee6ac8d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -193,7 +193,7 @@ Make a detached signature.
 @item --encrypt
 @itemx -e
 @opindex encrypt
-Encrypt data. This option may be combined with @option{--sign} (for a
+Encrypt data. This command may be combined with @option{--sign} (for a
 signed and encrypted message), @option{--symmetric} (for a message that
 may be decrypted via a secret key or a passphrase), or @option{--sign}
 and @option{--symmetric} together (for a signed message that may be
@@ -204,7 +204,7 @@ decrypted via a secret key or a passphrase).
 @opindex symmetric
 Encrypt with a symmetric cipher using a passphrase. The default
 symmetric cipher used is @value{GPGSYMENCALGO}, but may be chosen with the
-@option{--cipher-algo} option. This option may be combined with
+@option{--cipher-algo} option. This command may be combined with
 @option{--sign} (for a signed and symmetrically encrypted message),
 @option{--encrypt} (for a message that may be decrypted via a secret key
 or a passphrase), or @option{--sign} and @option{--encrypt} together
@@ -957,7 +957,7 @@ signing.
   currently have them. Cross-certification signatures protect against a
   subtle attack against signing subkeys. See
   @option{--require-cross-certification}.  All new keys generated have
-  this signature by default, so this option is only useful to bring
+  this signature by default, so this command is only useful to bring
   older keys up to date.
 
   @item save
@@ -1594,7 +1594,7 @@ Set what trust model GnuPG should follow. The models are:
   keys and email addresses (which are extracted from user ids and
   normalized).  There are five policies, which can be set manually
   using the @option{--tofu-policy} option.  The default policy can be
-  set using the @option{--tofu-default-policy} policy.
+  set using the @option{--tofu-default-policy} option.
 
   The TOFU policies are: @code{auto}, @code{good}, @code{unknown},
   @code{bad} and @code{ask}.  The @code{auto} policy is used by
@@ -2637,7 +2637,7 @@ Don't make any changes (this is not completely implemented).
 @item --list-only
 @opindex list-only
 Changes the behaviour of some commands. This is like @option{--dry-run} but
-different in some cases. The semantic of this command may be extended in
+different in some cases. The semantic of this option may be extended in
 the future. Currently it only skips the actual decryption pass and
 therefore enables a fast listing of the encryption keys.
 
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 4e67d7557..24a559093 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -636,7 +636,7 @@ Sometimes signatures are broken in that they announce a different digest
 algorithm than actually used.  @command{gpgsm} uses a one-pass data
 processing model and thus needs to rely on the announced digest
 algorithms to properly hash the data.  As a workaround this option may
-be used to tell gpg to also hash the data using the algorithm
+be used to tell @command{gpgsm} to also hash the data using the algorithm
 @var{name}; this slows processing down a little bit but allows verification of
 such broken signatures.  If @command{gpgsm} prints an error like
 ``digest algo 8 has not been enabled'' you may want to try this option,
@@ -1262,7 +1262,7 @@ is no need to set recipients.  @command{GPGSM} automatically strips any
 @acronym{S/MIME} headers from the input, so it is valid to pass an
 entire MIME part to the INPUT pipe.
 
-The encryption is done by using the command
+The decryption is done by using the command
 
 @example
   DECRYPT
diff --git a/doc/howto-create-a-server-cert.texi b/doc/howto-create-a-server-cert.texi
index 496c9eeb3..37cb1189a 100644
--- a/doc/howto-create-a-server-cert.texi
+++ b/doc/howto-create-a-server-cert.texi
@@ -145,7 +145,6 @@ When it is ready, you should see the final notice:
 
 @cartouche
 @example
-  gpgsm: certificate request created
   Ready.  You should now send this request to your CA.
 @end example
 @end cartouche
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 3728d9622..84c37f8f3 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -313,10 +313,10 @@ Even if a card reader features a pinpad, do not try to use it.
 @opindex allow-admin
 This option disables the use of admin class commands for card
 applications where this is supported.  Currently we support it for the
-OpenPGP card. This commands is useful to inhibit accidental access to
+OpenPGP card. This option is useful to inhibit accidental access to
 admin class command which could ultimately lock the card through wrong
 PIN numbers.  Note that GnuPG versions older than 2.0.11 featured an
-@option{--allow-admin} command which was required to use such admin
+@option{--allow-admin} option which was required to use such admin
 commands.  This option has no more effect today because the default is
 now to allow admin commands.
 
diff --git a/doc/tools.texi b/doc/tools.texi
index 1cb992eb1..b1c3a18a9 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -221,7 +221,7 @@ guarantees.}
 
 @command{gpgconf} provides access to the configuration of one or more
 components of the GnuPG system.  These components correspond more or
-less to the programs that exist in the GnuPG framework, like GnuPG,
+less to the programs that exist in the GnuPG framework, like GPG,
 GPGSM, DirMngr, etc.  But this is not a strict one-to-one
 relationship.  Not all configuration options are available through
 @command{gpgconf}.  @command{gpgconf} provides a generic and abstract
@@ -487,7 +487,7 @@ quote character is only needed to be able to differentiate between no
 value and the empty string as value.
 
 @item string list
-If the option takes a number argument and it can occur more than once,
+If the option takes a string argument and it can occur more than once,
 then the option argument is either empty, or it is a comma-separated
 list of string arguments as described above.
 @end table
@@ -520,7 +520,7 @@ an atomic way with a single operation.  The GUI could for example
 provide a menu with one entry for each component, or a window with one
 tabulator sheet per component.
 
-The command argument @code{--list-components} lists all available
+The command @code{--list-components} lists all available
 components, one per line.  The format of each line is:
 
 @code{@var{name}:@var{description}:@var{pgmname}:}
@@ -565,7 +565,7 @@ components.  It runs each program to test whether it is installed and
 runnable.  This also includes a syntax check of all config file options
 of the program.
 
-The command argument @code{--check-programs} lists all available
+The command @code{--check-programs} lists all available
 programs, one per line.  The format of each line is:
 
 @code{@var{name}:@var{description}:@var{pgmname}:@var{avail}:@var{okay}:@var{cfgfile}:@var{line}:@var{error}:}
@@ -640,7 +640,7 @@ Every component contains one or more options.  Options may be gathered
 into option groups to allow the GUI to give visual hints to the user
 about which options are related.
 
-The command argument @code{@w{--list-options @var{component}}} lists
+The command @code{@w{--list-options @var{component}}} lists
 all options (and the groups they belong to) in the component
 @var{component}, one per line.  @var{component} must be the string in
 the field @var{name} in the output of the @code{--list-components}
@@ -925,7 +925,7 @@ This is the group field of the key.  It is percent escaped.
 This describes a rule record. All rule records up to the next key record
 make up a rule set for that key.  The format of a rule record is:
 
-  @code{r:::@var{component}:@var{option}:@var{flags}:@var{value}:}
+  @code{r:::@var{component}:@var{option}:@var{flag}:@var{value}:}
 
 @table @var
 @item component