[git] GnuPG - branch, master, updated. gnupg-2.1.15-148-g3776242
by Ineiev
cvs at cvs.gnupg.org
Tue Sep 20 04:08:07 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 377624207e9b2895ce00dfc4d1163d72f349841f (commit)
via 9d2b7bff12b268638465da222ca7cc9042bba072 (commit)
via 789916281c25e737d8fb44add5ca61f8fd25de2f (commit)
via 00d6d8bc8772e48b6f200d359e11eb93ab65f51f (commit)
via f25e04005af5831053ba194a09e3afa48d1e162b (commit)
via 825c1dfb3ee4c1704f42eaf064161b9731c20134 (commit)
from f32689f833838a742243e94c900e98f5b59a5811 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 377624207e9b2895ce00dfc4d1163d72f349841f
Author: Ineiev <ineiev at gnu.org>
Date: Fri Mar 4 16:38:09 2016 +0000
doc: Improve markup.
* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
doc/howto-create-a-server-cert.texi, doc/scdaemon.texi,
doc/specify-user-id.texi, doc/tools.texi: Fix.
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 8176b37..c24d935 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -1341,7 +1341,7 @@ least one of the keygrips corresponds to an available secret key.
LEARN [--send]
@end example
-This command is used to register a smartcard. With the --send
+This command is used to register a smartcard. With the @option{--send}
option given the certificates are sent back.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 59ea4fc..c141ec6 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -723,12 +723,12 @@ line.
@item sign
@opindex keyedit:sign
- Make a signature on key of user @code{name} If the key is not yet
- signed by the default user (or the users given with -u), the program
+ Make a signature on key of user @code{name}. If the key is not yet
+ signed by the default user (or the users given with @option{-u}), the program
displays the information of the key again, together with its
fingerprint and asks whether it should be signed. This question is
repeated for all users specified with
- -u.
+ @option{-u}.
@item lsign
@opindex keyedit:lsign
@@ -2598,7 +2598,7 @@ Set up all options to be as PGP 6 compliant as possible. This
restricts you to the ciphers IDEA (if the IDEA plugin is installed),
3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the
compression algorithms none and ZIP. This also disables
---throw-keyids, and making signatures with signing subkeys as PGP 6
+ at option{--throw-keyids}, and making signatures with signing subkeys as PGP 6
does not understand signatures made by signing subkeys.
This option implies @option{--disable-mdc --escape-from-lines}.
@@ -2815,7 +2815,7 @@ The same %-expandos used for notation data are available here as well.
@opindex set-filename
Use @code{string} as the filename which is stored inside messages.
This overrides the default, which is to use the actual filename of the
-file being encrypted. Using the empty string for @var{string}
+file being encrypted. Using the empty string for @code{string}
effectively removes the filename from the output.
@item --for-your-eyes-only
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index f334c99..deb57a6 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -569,7 +569,7 @@ When doing a key listing, do a full validation check for each key and
print the result. This is usually a slow operation because it
requires a CRL lookup and other operations.
-When used along with --import, a validation of the certificate to
+When used along with @option{--import}, a validation of the certificate to
import is done and only imported if it succeeds the test. Note that
this does not affect an already available certificate in the DB.
This option is therefore useful to simply verify a certificate.
@@ -581,7 +581,7 @@ certificate.
@item --with-keygrip
Include the keygrip in standard key listings. Note that the keygrip is
-always listed in --with-colons mode.
+always listed in @option{--with-colons} mode.
@item --with-secret
@opindex with-secret
@@ -834,7 +834,7 @@ They are defined as certificates capable of creating legally binding
signatures in the same way as handwritten signatures are. Comments
start with a hash mark and empty lines are ignored. Lines do have a
length limit but this is not a serious limitation as the format of the
-entries is fixed and checked by gpgsm: A non-comment line starts with
+entries is fixed and checked by @command{gpgsm}: A non-comment line starts with
optional whitespace, followed by exactly 40 hex characters, white space
and a lowercased 2 letter country code. Additional data delimited with
by a white space is current ignored but might late be used for other
@@ -893,7 +893,7 @@ into the directory @file{/etc/skel/.gnupg/} so that newly created users
start up with a working configuration. For existing users a small
helper script is provided to create these files (@pxref{addgnupghome}).
-For internal purposes gpgsm creates and maintains a few other files;
+For internal purposes @command{gpgsm} creates and maintains a few other files;
they all live in in the current home directory (@pxref{option
--homedir}). Only @command{gpgsm} may modify these files.
@@ -1230,8 +1230,8 @@ message). Obviously the pipe must be open at that point, the server
establishes its own end. If the server returns an error the client
should consider this session failed.
-The option armor encodes the output in @acronym{PEM} format, the
- at code{--base64} option applies just a base 64 encoding. No option
+The option @option{--armor} encodes the output in @acronym{PEM} format, the
+ at option{--base64} option applies just a base-64 encoding. No option
creates binary output (@acronym{BER}).
The actual encryption is done using the command
@@ -1257,7 +1257,7 @@ closed.
@subsection Decrypting a message
Input and output FDs are set the same way as in encryption, but
- at code{INPUT} refers to the ciphertext and output to the plaintext. There
+ at code{INPUT} refers to the ciphertext and @code{OUTPUT} to the plaintext. There
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.
@@ -1297,8 +1297,8 @@ requested, only the signature is written.
SIGN [--detached]
@end example
-Sign the data set with the INPUT command and write it to the sink set by
-OUTPUT. With @code{--detached}, a detached signature is created
+Sign the data set with the @code{INPUT} command and write it to the sink set by
+ at code{OUTPUT}. With @code{--detached}, a detached signature is created
(surprise).
The key used for signing is the default one or the one specified in
@@ -1422,14 +1422,14 @@ required: Spaces are to be translated into "+" or into "%20"; in turn
this requires that the usual escape quoting rules are done.
If the @option{--data} option has not been given, the format of the
-output depends on what was set with the OUTPUT command. When using
+output depends on what was set with the @code{OUTPUT} command. When using
@acronym{PEM} encoding a few informational lines are prepended.
-If the @option{--data} has been given, a target set via OUTPUT is
+If the @option{--data} has been given, a target set via @code{OUTPUT} is
ignored and the data is returned inline using standard
@code{D}-lines. This avoids the need for an extra file descriptor. In
this case the options @option{--armor} and @option{--base64} may be used
-in the same way as with the OUTPUT command.
+in the same way as with the @code{OUTPUT} command.
@node GPGSM IMPORT
@@ -1479,7 +1479,7 @@ GETAUDITLOG [--data] [--html]
@end example
If @option{--data} is used, the audit log is send using D-lines
-instead of being sent to the file descriptor given by an OUTPUT
+instead of being sent to the file descriptor given by an @code{OUTPUT}
command. If @option{--html} is used, the output is formatted as an
XHTML block. This is designed to be incorporated into a HTML
document.
@@ -1570,7 +1570,7 @@ signers certicate and all other positive values include up to
@item list-to-output
If @var{value} is true the output of the list commands
(@pxref{gpgsm-cmd listkeys}) is written to the file descriptor set
-with the last OUTPUT command. If @var{value} is false the output is
+with the last @code{OUTPUT} command. If @var{value} is false the output is
written via data lines; this is the default.
@item with-validation
diff --git a/doc/howto-create-a-server-cert.texi b/doc/howto-create-a-server-cert.texi
index 37cb118..ea0ce71 100644
--- a/doc/howto-create-a-server-cert.texi
+++ b/doc/howto-create-a-server-cert.texi
@@ -206,7 +206,7 @@ followed by a Ctrl-D
@end example
@end cartouche
-gpgsm tells you that it has imported the certificate. It is now
+ at command{gpgsm} tells you that it has imported the certificate. It is now
associated with the key you used when creating the request. The root
certificate has not been found, so you may want to import it from the
CACert website.
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 84c37f8..ddf18db 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -533,7 +533,7 @@ the @code{0x5A} tag in the GDO file (FIX=0x2F02).
@end example
Learn all useful information of the currently inserted card. When
-used without the force options, the command might do an INQUIRE
+used without the @option{--force} option, the command might do an INQUIRE
like this:
@example
diff --git a/doc/specify-user-id.texi b/doc/specify-user-id.texi
index cd32ab8..3a2b6a2 100644
--- a/doc/specify-user-id.texi
+++ b/doc/specify-user-id.texi
@@ -99,9 +99,9 @@ This uses a substring search but considers only the mail address
@item By exact match on the subject's DN.
This is indicated by a leading slash, directly followed by the RFC-2253
encoded DN of the subject. Note that you can't use the string printed
-by "gpgsm --list-keys" because that one has been reordered and modified
-for better readability; use --with-colons to print the raw (but standard
-escaped) RFC-2253 string
+by @code{gpgsm --list-keys} because that one has been reordered and modified
+for better readability; use @option{--with-colons} to print the raw
+(but standard escaped) RFC-2253 string
@cartouche
@example
diff --git a/doc/tools.texi b/doc/tools.texi
index b1c3a18..f213bfe 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -319,9 +319,9 @@ may use this command to ensure that they are started.
@item --kill [@var{component}]
@opindex kill
Kill the given component. Components which support killing are
-gpg-agent and scdaemon. Components which don't support reloading are
-ignored. Note that as of now reload and kill have the same effect for
-scdaemon.
+ at command{gpg-agent} and @command{scdaemon}. Components which don't
+support reloading are ignored. Note that as of now reload and kill
+have the same effect for @command{scdaemon}.
@item --create-socketdir
@opindex create-socketdir
@@ -699,9 +699,9 @@ If this flag is set, and the @code{optional arg} flag is set, then the
option has a special meaning if no argument is given.
@item no change (128)
-If this flag is set, gpgconf ignores requests to change the value. GUI
-frontends should grey out this option. Note, that manual changes of the
-configuration files are still possible.
+If this flag is set, @command{gpgconf} ignores requests to change the
+value. GUI frontends should grey out this option. Note, that manual
+changes of the configuration files are still possible.
@end table
@item level
@@ -1137,9 +1137,9 @@ for other users.
@mansect description
The @command{gpg-connect-agent} is a utility to communicate with a
running @command{gpg-agent}. It is useful to check out the commands
-gpg-agent provides using the Assuan interface. It might also be useful
-for scripting simple applications. Input is expected at stdin and out
-put gets printed to stdout.
+ at command{gpg-agent} provides using the Assuan interface. It might
+also be useful for scripting simple applications. Input is expected
+at stdin and out put gets printed to stdout.
It is very similar to running @command{gpg-agent} in server mode; but
here we connect to a running instance.
@@ -1673,14 +1673,15 @@ debugging. Run it with @code{--help} for usage information.
@end ifset
@mansect description
-Sometimes simple encryption tools are already in use for a long time and
-there might be a desire to integrate them into the GnuPG framework. The
-protocols and encryption methods might be non-standard or not even
-properly documented, so that a full-fledged encryption tool with an
-interface like gpg is not doable. @command{symcryptrun} provides a
-solution: It operates by calling the external encryption/decryption
-module and provides a passphrase for a key using the standard
- at command{pinentry} based mechanism through @command{gpg-agent}.
+Sometimes simple encryption tools are already in use for a long time
+and there might be a desire to integrate them into the GnuPG
+framework. The protocols and encryption methods might be non-standard
+or not even properly documented, so that a full-fledged encryption
+tool with an interface like @command{gpg} is not doable.
+ at command{symcryptrun} provides a solution: It operates by calling the
+external encryption/decryption module and provides a passphrase for a
+key using the standard @command{pinentry} based mechanism through
+ at command{gpg-agent}.
Note, that @command{symcryptrun} is only available if GnuPG has been
configured with @samp{--enable-symcryptrun} at build time.
commit 9d2b7bff12b268638465da222ca7cc9042bba072
Author: Ineiev <ineiev at gnu.org>
Date: Fri Mar 4 16:34:23 2016 +0000
doc: Replace rfc0123 with RFC-0123.
* doc/gpg.texi, doc/gpgsm.texi, doc/specify-user-id.texi: Fix.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 97387ab..59ea4fc 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1429,7 +1429,7 @@ Valid values for @code{name} are:
@item koi8-r
@opindex display-charset:koi8-r
- The usual Russian set (rfc1489).
+ The usual Russian set (RFC-1489).
@item utf-8
@opindex display-charset:utf-8
@@ -1656,7 +1656,7 @@ mechanisms, in the order they are to be tried:
@table @asis
@item cert
- Locate a key using DNS CERT, as specified in rfc4398.
+ Locate a key using DNS CERT, as specified in RFC-4398.
@item pka
Locate a key using DNS PKA.
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 24a5590..f334c99 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -1114,7 +1114,7 @@ integer of arbitrary length. The special value @samp{random} can be
used to create a 64 bit random serial number.
@item Issuer-DN: @var{issuer-name}
-This is the DN name of the issuer in rfc2253 format. If it is not set
+This is the DN name of the issuer in RFC-2253 format. If it is not set
it will default to the subject DN and a special GnuPG extension will
be included in the certificate to mark it as a standalone certificate.
diff --git a/doc/specify-user-id.texi b/doc/specify-user-id.texi
index d973379..cd32ab8 100644
--- a/doc/specify-user-id.texi
+++ b/doc/specify-user-id.texi
@@ -111,7 +111,7 @@ escaped) RFC-2253 string
@item By exact match on the issuer's DN.
This is indicated by a leading hash mark, directly followed by a slash
-and then directly followed by the rfc2253 encoded DN of the issuer.
+and then directly followed by the RFC-2253 encoded DN of the issuer.
This should return the Root cert of the issuer. See note above.
@cartouche
commit 789916281c25e737d8fb44add5ca61f8fd25de2f
Author: Ineiev <ineiev at gnu.org>
Date: Fri Mar 4 16:30:30 2016 +0000
doc: Add missing description of datafile.
* doc/gpg.texi: Fix.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 71c45eb..97387ab 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -3442,11 +3442,11 @@ show keys
show fingerprint
@item gpg --verify @code{pgpfile}
- at itemx gpg --verify @code{sigfile}
+ at itemx gpg --verify @code{sigfile} [@code{datafile}]
Verify the signature of the file but do not output the data unless
-requested. The second form is used for detached signatures, where
+requested. The second form is used for detached signatures, where
@code{sigfile} is the detached signature (either ASCII armored or
-binary) and are the signed data; if this is not given, the name of the
+binary) and @code{datafile} are the signed data; if this is not given, the name of the
file holding the signed data is constructed by cutting off the
extension (".asc" or ".sig") of @code{sigfile} or by asking the user
for the filename. If the option @option{--output} is also used the
commit 00d6d8bc8772e48b6f200d359e11eb93ab65f51f
Author: Ineiev <ineiev at gnu.org>
Date: Fri Mar 4 16:29:37 2016 +0000
doc: Replace UTF8 with UTF-8.
* doc/gpg.texi: Fix.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index a9ee6ac..71c45eb 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1440,7 +1440,7 @@ Valid values for @code{name} are:
@item --utf8-strings
@itemx --no-utf8-strings
@opindex utf8-strings
-Assume that command line arguments are given as UTF8 strings. The
+Assume that command line arguments are given as UTF-8 strings. The
default (@option{--no-utf8-strings}) is to assume that arguments are
encoded in the character set as specified by
@option{--display-charset}. These options affect all following
@@ -2770,7 +2770,7 @@ must contain a '@@' character in the form keyname@@domain.example.com
is to help prevent pollution of the IETF reserved notation
namespace. The @option{--expert} flag overrides the '@@'
check. @code{value} may be any printable string; it will be encoded in
-UTF8, so you should check that your @option{--display-charset} is set
+UTF-8, so you should check that your @option{--display-charset} is set
correctly. If you prefix @code{name} with an exclamation mark (!), the
notation data will be flagged as critical
(rfc4880:5.2.3.16). @option{--sig-notation} sets a notation for data
commit f25e04005af5831053ba194a09e3afa48d1e162b
Author: Ineiev <ineiev at gnu.org>
Date: Fri Mar 4 16:27:21 2016 +0000
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.
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 0f37cc4..12ce630 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 c40a20f..a9ee6ac 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
- at option{--cipher-algo} option. This option may be combined with
+ at 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 4e67d75..24a5590 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 496c9ee..37cb118 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 3728d96..84c37f8 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
- at option{--allow-admin} command which was required to use such admin
+ at 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 1cb992e..b1c3a18 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
commit 825c1dfb3ee4c1704f42eaf064161b9731c20134
Author: Ineiev <ineiev at gnu.org>
Date: Fri Mar 4 16:00:51 2016 +0000
doc: Eliminate inconsistent UK English.
* doc/dirmngr.texi, doc/gpg-agent.texi, doc/scdaemon.texi,
doc/tools.texi: Fix.
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 7b5c7e7..0f37cc4 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -196,7 +196,7 @@ however carefully selected to best aid in debugging.
@item --debug @var{flags}
@opindex debug
-This option is only useful for debugging and the behaviour may change at
+This option is only useful for debugging and the behavior may change at
any time without notice. FLAGS are bit encoded and may be given in
usual C-Syntax.
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index b99dc5f..8176b37 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -230,7 +230,7 @@ however carefully selected to best aid in debugging.
@item --debug @var{flags}
@opindex debug
-This option is only useful for debugging and the behaviour may change at
+This option is only useful for debugging and the behavior may change at
any time without notice. FLAGS are bit encoded and may be given in
usual C-Syntax. The currently defined bits are:
@@ -366,7 +366,7 @@ version of the used Pinentry.
@opindex ignore-cache-for-signing
This option will let @command{gpg-agent} bypass the passphrase cache for all
signing operation. Note that there is also a per-session option to
-control this behaviour but this command line option takes precedence.
+control this behavior but this command line option takes precedence.
@item --default-cache-ttl @var{n}
@opindex default-cache-ttl
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 3ab44ae..3728d96 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -160,7 +160,7 @@ helpers to debug problems.
@item --debug @var{flags}
@opindex debug
-This option is only useful for debugging and the behaviour may change at
+This option is only useful for debugging and the behavior may change at
any time without notice. FLAGS are bit encoded and may be given in
usual C-Syntax. The currently defined bits are:
diff --git a/doc/tools.texi b/doc/tools.texi
index d6e130f..1cb992e 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -422,8 +422,8 @@ is de-escaped by replacing all occurrences of @code{%XY} by the byte
that has the hexadecimal value @code{XY}. @code{X} and @code{Y} are
from the set @code{0-9a-f}.
- at item localised
-Some fields contain strings that are described to be @emph{localised}.
+ at item localized
+Some fields contain strings that are described to be @emph{localized}.
Such strings are translated to the active language and formatted in
the active character set.
@@ -804,7 +804,7 @@ error and abort the operation.
@item argname
This field is only defined for options with an argument type
@var{type} that is not @code{0}. In this case it may contain a
- at emph{percent-escaped} and @emph{localised string} that gives a short
+ at emph{percent-escaped} and @emph{localized string} that gives a short
name for the argument. The field may also be empty, though, in which
case a short name is not known.
-----------------------------------------------------------------------
Summary of changes:
doc/dirmngr.texi | 6 ++---
doc/gpg-agent.texi | 6 ++---
doc/gpg.texi | 34 ++++++++++++------------
doc/gpgsm.texi | 34 ++++++++++++------------
doc/howto-create-a-server-cert.texi | 3 +--
doc/scdaemon.texi | 8 +++---
doc/specify-user-id.texi | 8 +++---
doc/tools.texi | 53 +++++++++++++++++++------------------
8 files changed, 76 insertions(+), 76 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list