Skip to content

Commit fa34650

Browse files
IneievNIIBE Yutaka
Ineiev
authored and
NIIBE Yutaka
committed
doc: Fix typos.
* doc/debugging.texi, doc/dirmngr.texi, doc/glossary.texi * doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi * doc/instguide.texi, doc/opt-homedir.texi, doc/scdaemon.texi * doc/specify-user-id.texi, doc/tools.texi: Fix.
1 parent 858af2b commit fa34650

11 files changed

+59
-59
lines changed

doc/debugging.texi

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ there is a need to track down problems. We call this debugging in a
1010
reminiscent to the moth jamming a relay in a Mark II box back in 1947.
1111

1212
Most of the problems a merely configuration and user problems but
13-
nevertheless there are the most annoying ones and responsible for many
13+
nevertheless they are the most annoying ones and responsible for many
1414
gray hairs. We try to give some guidelines here on how to identify and
1515
solve the problem at hand.
1616

@@ -131,7 +131,7 @@ but Dirmngr's OCSP feature has not been enabled using
131131

132132
The far most common reason for this is that the environment variable
133133
@code{GPG_TTY} has not been set correctly. Make sure that it has been
134-
set to a real tty devce and not just to @samp{/dev/tty};
134+
set to a real tty device and not just to @samp{/dev/tty};
135135
i.e. @samp{GPG_TTY=tty} is plainly wrong; what you want is
136136
@samp{GPG_TTY=`tty`} --- note the back ticks. Also make sure that
137137
this environment variable gets exported, that is you should follow up
@@ -162,7 +162,7 @@ making use of ssh.
162162

163163
@item Exporting a secret key without a certificate
164164

165-
I may happen that you have created a certificate request using
165+
It may happen that you have created a certificate request using
166166
@command{gpgsm} but not yet received and imported the certificate from
167167
the CA. However, you want to export the secret key to another machine
168168
right now to import the certificate over there then. You can do this

doc/dirmngr.texi

+7-7
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ so that @code{gpgsm} can help dirmngr.
102102
@item --fetch-crl @var{url}
103103
@opindex fetch-crl
104104
This command requires an URL as additional argument, and it will make
105-
dirmngr try to retrieve an import the CRL from that @var{url} into
105+
dirmngr try to retrieve and import the CRL from that @var{url} into
106106
it's cache. This is mainly useful for debugging purposes. The
107107
@command{dirmngr-client} provides the same feature for a running dirmngr.
108108

@@ -364,11 +364,11 @@ out. The default is currently 100 seconds. 0 will never timeout.
364364

365365
@item --add-servers
366366
@opindex add-servers
367-
This options makes dirmngr add any servers it discovers when validating
367+
This option makes dirmngr add any servers it discovers when validating
368368
certificates against CRLs to the internal list of servers to consult for
369369
certificates and CRLs.
370370

371-
This options is useful when trying to validate a certificate that has
371+
This option is useful when trying to validate a certificate that has
372372
a CRL distribution point that points to a server that is not already
373373
listed in the ldapserverlist. Dirmngr will always go to this server and
374374
try to download the CRL, but chances are high that the certificate used
@@ -397,8 +397,8 @@ not contain information about an assigned responder. Note, that
397397
@item --ocsp-signer @var{fpr}|@var{file}
398398
@opindex ocsp-signer
399399
Use the certificate with the fingerprint @var{fpr} to check the
400-
responses of the default OCSP Responder. Alternativly a filename can be
401-
given in which case the respinse is expected to be signed by one of the
400+
responses of the default OCSP Responder. Alternatively a filename can be
401+
given in which case the response is expected to be signed by one of the
402402
certificates described in that file. Any argument which contains a
403403
slash, dot or tilde is considered a filename. Usual filename expansion
404404
takes place: A tilde at the start followed by a slash is replaced by the
@@ -550,7 +550,7 @@ Here is a list of supported signals:
550550

551551
@item SIGHUP
552552
@cpindex SIGHUP
553-
This signals flushes all internally cached CRLs as well as any cached
553+
This signal flushes all internally cached CRLs as well as any cached
554554
certificates. Then the certificate cache is reinitialized as on
555555
startup. Options are re-read from the configuration file. Instead of
556556
sending this signal it is better to use
@@ -756,7 +756,7 @@ Only this answer will let Dirmngr consider the CRL as valid.
756756
Check whether the certificate with FINGERPRINT (SHA-1 hash of the
757757
entire X.509 certificate blob) is valid or not by consulting the CRL
758758
responsible for this certificate. If the fingerprint has not been
759-
given or the certificate is not know, the function inquires the
759+
given or the certificate is not known, the function inquires the
760760
certificate using:
761761

762762
@example

doc/glossary.texi

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ on a disk; the latter is often called a Soft-PSE.
6161
@item Shell model
6262
The standard model for validation of certificates under X.509. At the
6363
time of the verification all certificates must be valid and not expired.
64-
See also @emph{Chain mode}.
64+
See also @emph{Chain model}.
6565

6666

6767
@item X.509

doc/gpg-agent.texi

+8-8
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ that key. The flag is automatically set if a new key was loaded into
708708
@code{gpg-agent} using the option @option{-c} of the @code{ssh-add}
709709
command.
710710

711-
The keygrip may be prefixed with a @code{!} to disable an entry entry.
711+
The keygrip may be prefixed with a @code{!} to disable an entry.
712712

713713
The following example lists exactly one key. Note that keys available
714714
through a OpenPGP smartcard in the active smartcard reader are
@@ -939,7 +939,7 @@ Here is an example session:
939939
S: # session key follows
940940
S: S PADDING 0
941941
S: D (value 1234567890ABCDEF0)
942-
S: OK descryption successful
942+
S: OK decryption successful
943943
@end smallexample
944944
@end cartouche
945945

@@ -951,7 +951,7 @@ that the padding has been removed.
951951
@node Agent PKSIGN
952952
@subsection Signing a Hash
953953

954-
The client ask the agent to sign a given hash value. A default key
954+
The client asks the agent to sign a given hash value. A default key
955955
will be chosen if no key has been set. To set a key a client first
956956
uses:
957957

@@ -961,7 +961,7 @@ uses:
961961

962962
This can be used multiple times to create multiple signature, the list
963963
of keys is reset with the next PKSIGN command or a RESET. The server
964-
test whether the key is a valid key to sign something and responds with
964+
tests whether the key is a valid key to sign something and responds with
965965
okay.
966966

967967
@example
@@ -993,7 +993,7 @@ The actual signing is done using
993993
PKSIGN <options>
994994
@end example
995995

996-
Options are not yet defined, but my later be used to choose among
996+
Options are not yet defined, but may later be used to choose among
997997
different algorithms. The agent does then some checks, asks for the
998998
passphrase and as a result the server returns the signature as an SPKI
999999
like S-expression in "D" lines:
@@ -1113,7 +1113,7 @@ are to be used for this.
11131113

11141114
There is no actual need because we can expect that secret keys
11151115
created by a 3rd party are stored on a smartcard. If we have
1116-
generated the key ourself, we do not need to import it.
1116+
generated the key ourselves, we do not need to import it.
11171117

11181118
@node Agent EXPORT
11191119
@subsection Export a Secret Key
@@ -1292,7 +1292,7 @@ passphrase will be retrieved from the pinentry module unless the
12921292
retrieved from the client.
12931293

12941294
The @var{timeout} parameter keeps the passphrase cached for the specified
1295-
number of seconds. A value of @code{-1} means infinate while @code{0} means
1295+
number of seconds. A value of @code{-1} means infinite while @code{0} means
12961296
the default (currently only a timeout of -1 is allowed, which means to never
12971297
expire it).
12981298

@@ -1342,7 +1342,7 @@ least one of the keygrips corresponds to an available secret key.
13421342
@end example
13431343

13441344
This command is used to register a smartcard. With the --send
1345-
option given the certificates are send back.
1345+
option given the certificates are sent back.
13461346

13471347

13481348
@node Agent PASSWD

doc/gpg.texi

+10-10
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ Avoid using the output of this command in scripts or other programs as
284284
it is likely to change as GnuPG changes. See @option{--with-colons}
285285
for a machine-parseable key listing command that is appropriate for
286286
use in scripts and other programs. Never use the regular output for
287-
scripts - it is only for human consumption.
287+
scripts --- it is only for human consumption.
288288

289289
@item --list-secret-keys
290290
@itemx -K
@@ -379,7 +379,7 @@ safeguard against accidental deletion of multiple keys.
379379

380380
@item --delete-secret-keys @code{name}
381381
@opindex delete-secret-keys
382-
gRemove key from the secret keyring. In batch mode the key must be
382+
Remove key from the secret keyring. In batch mode the key must be
383383
specified by fingerprint. The option @option{--yes} can be used to
384384
advice gpg-agent not to request a confirmation. This extra
385385
pre-caution is done because @command{gpg} can't be sure that the
@@ -420,7 +420,7 @@ exported keys are written to STDOUT or to the file given with option
420420
@option{--armor} to allow easy printing of the key for paper backup;
421421
however the external tool @command{paperkey} does a better job for
422422
creating backups on paper. Note that exporting a secret key can be a
423-
security risk if the exported keys are send over an insecure channel.
423+
security risk if the exported keys are sent over an insecure channel.
424424

425425
The second form of the command has the special property to render the
426426
secret part of the primary key useless; this is a GNU extension to
@@ -533,7 +533,7 @@ corrupted trustdb. Example:
533533
Update the trustdb with the ownertrust values stored in @code{files} (or
534534
STDIN if not given); existing values will be overwritten. In case of a
535535
severely damaged trustdb and if you have a recent backup of the
536-
ownertrust values (e.g. in the file @file{otrust.txt}, you may re-create
536+
ownertrust values (e.g. in the file @file{otrust.txt}), you may re-create
537537
the trustdb using these commands:
538538
@c man:.RS
539539
@example
@@ -1082,7 +1082,7 @@ behaviour and to change the default configuration.
10821082
* GPG Input and Output:: Input and Output.
10831083
* OpenPGP Options:: OpenPGP protocol specific options.
10841084
* Compliance Options:: Compliance options.
1085-
* GPG Esoteric Options:: Doing things one usually don't want to do.
1085+
* GPG Esoteric Options:: Doing things one usually doesn't want to do.
10861086
* Deprecated Options:: Deprecated options.
10871087
@end menu
10881088

@@ -1808,7 +1808,7 @@ are available for all keyserver types, some common options are:
18081808
@option{--recv-keys} command as a whole. Defaults to 30 seconds.
18091809

18101810
@item http-proxy=@code{value}
1811-
This options is deprecated.
1811+
This option is deprecated.
18121812
Set the proxy to use for HTTP and HKP keyservers.
18131813
This overrides any proxy defined in @file{dirmngr.conf}.
18141814

@@ -2174,7 +2174,7 @@ stop by the OS limits. Defaults to 0, which means "no limit".
21742174
@opindex input-size-hint
21752175
This option can be used to tell GPG the size of the input data in
21762176
bytes. @var{n} must be a positive base-10 number. This option is
2177-
only useful if the input is not taken from a file. GPG may use thos
2177+
only useful if the input is not taken from a file. GPG may use this
21782178
hint to optimize its buffer allocation strategy. It is also used by
21792179
the @option{--status-fd} line ``PROGRESS'' to provide a value for
21802180
``total'' if that is not available by other means.
@@ -3171,7 +3171,7 @@ workaround!
31713171

31723172
@item --enable-special-filenames
31733173
@opindex enable-special-filenames
3174-
This options enables a mode in which filenames of the form
3174+
This option enables a mode in which filenames of the form
31753175
@file{-&n}, where n is a non-negative decimal number,
31763176
refer to the file descriptor n and not to a file with that name.
31773177

@@ -3324,7 +3324,7 @@ files; They all live in in the current home directory (@pxref{option
33243324

33253325
@item ~/.gnupg/pubring.kbx
33263326
@efindex pubring.kbx
3327-
The public keyring using a different format. This file is sharred
3327+
The public keyring using a different format. This file is shared
33283328
with @command{gpgsm}. You should backup this file.
33293329

33303330
@item ~/.gnupg/pubring.kbx.lock
@@ -3804,7 +3804,7 @@ can be handled. See also @samp{Key-Type} above.
38043804

38053805
@item Subkey-Length: @var{nbits}
38063806
Length of the secondary key (subkey) in bits. The default is returned
3807-
by running the command @samp{@gpgname --gpgconf-list}".
3807+
by running the command @samp{@gpgname --gpgconf-list}.
38083808

38093809
@item Subkey-Usage: @var{usage-list}
38103810
Key usage lists for a subkey; similar to @samp{Key-Usage}.

doc/gpgsm.texi

+10-10
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ abbreviate this command.
108108
@table @gnupgtabopt
109109
@item --encrypt
110110
@opindex encrypt
111-
Perform an encryption. The keys the data is encrypted too must be set
111+
Perform an encryption. The keys the data is encrypted to must be set
112112
using the option @option{--recipient}.
113113

114114
@item --decrypt
@@ -136,7 +136,7 @@ Run in server mode and wait for commands on the @code{stdin}.
136136
Behave as a Dirmngr client issuing the request @var{command} with the
137137
optional list of @var{args}. The output of the Dirmngr is printed
138138
stdout. Please note that file names given as arguments should have an
139-
absolute file name (i.e. commencing with @code{/} because they are
139+
absolute file name (i.e. commencing with @code{/}) because they are
140140
passed verbatim to the Dirmngr and the working directory of the
141141
Dirmngr might not be the same as the one of this client. Currently it
142142
is not possible to pass data via stdin to the Dirmngr. @var{command}
@@ -835,7 +835,7 @@ signatures in the same way as handwritten signatures are. Comments
835835
start with a hash mark and empty lines are ignored. Lines do have a
836836
length limit but this is not a serious limitation as the format of the
837837
entries is fixed and checked by gpgsm: A non-comment line starts with
838-
optional whitespace, followed by exactly 40 hex character, white space
838+
optional whitespace, followed by exactly 40 hex characters, white space
839839
and a lowercased 2 letter country code. Additional data delimited with
840840
by a white space is current ignored but might late be used for other
841841
purposes.
@@ -988,7 +988,7 @@ these status codes:
988988

989989
@item The signature is invalid
990990
This means that the signature verification failed (this is an indication
991-
of af a transfer error, a program error or tampering with the message).
991+
of a transfer error, a program error or tampering with the message).
992992
@command{gpgsm} issues one of these status codes sequences:
993993
@table @code
994994
@item @code{BADSIG}
@@ -1075,7 +1075,7 @@ parameter. The only supported value for @var{algo} is @samp{rsa}.
10751075
The requested length of a generated key in bits. Defaults to 2048.
10761076

10771077
@item Key-Grip: @var{hexstring}
1078-
This is optional and used to generate a CSR or certificatet for an
1078+
This is optional and used to generate a CSR or certificate for an
10791079
already existing key. Key-Length will be ignored when given.
10801080

10811081
@item Key-Usage: @var{usage-list}
@@ -1227,7 +1227,7 @@ correct.
12271227

12281228
Set the file descriptor to be used for the output (i.e. the encrypted
12291229
message). Obviously the pipe must be open at that point, the server
1230-
establishes its own end. If the server returns an error he client
1230+
establishes its own end. If the server returns an error the client
12311231
should consider this session failed.
12321232

12331233
The option armor encodes the output in @acronym{PEM} format, the
@@ -1309,7 +1309,7 @@ possible to use the command
13091309
SIGNER @var{userID}
13101310
@end example
13111311

1312-
to the signer's key. @var{userID} should be the
1312+
to set the signer's key. @var{userID} should be the
13131313
internal representation of the key; the server may accept any other way
13141314
of specification. If this is a valid and trusted recipient the server
13151315
does respond with OK, otherwise the return is an ERR with the reason why
@@ -1318,13 +1318,13 @@ this key. If the policy is not to sign at all if not all
13181318
keys are valid, the client has to take care of this. All
13191319
@code{SIGNER} commands are cumulative until a @code{RESET} is done.
13201320
Note that a @code{SIGN} does not reset this list of signers which is in
1321-
contrats to the @code{RECIPIENT} command.
1321+
contrast to the @code{RECIPIENT} command.
13221322

13231323

13241324
@node GPGSM VERIFY
13251325
@subsection Verifying a Message
13261326

1327-
To verify a mesage the command:
1327+
To verify a message the command:
13281328

13291329
@example
13301330
VERIFY
@@ -1387,7 +1387,7 @@ in turn this requires that the usual escape quoting rules are done.
13871387

13881388
Lists only the keys where a secret key is available.
13891389

1390-
The list commands commands are affected by the option
1390+
The list commands are affected by the option
13911391

13921392
@example
13931393
OPTION list-mode=@var{mode}

doc/instguide.texi

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ release without that guide. The chapter on gpg-agent and gpgsm do
1212
include brief information on how to set up the whole thing. Please
1313
watch the GnuPG website for updates of the documentation. In the
1414
meantime you may search the GnuPG mailing list archives or ask on the
15-
gnupg-users mailing listsfor advise on how to solve problems or how to
15+
gnupg-users mailing list for advise on how to solve problems or how to
1616
get that whole thing up and running.
1717

1818
** Building the software

doc/opt-homedir.texi

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ considered, all other ways to set a home directory are ignored.
1616

1717
@efindex gpgconf.ctl
1818
To install GnuPG as a portable application under Windows, create an
19-
empty file name @file{gpgconf.ctl} in the same directory as the tool
20-
@file{gpgconf.exe}. The root of the installation is than that
19+
empty file named @file{gpgconf.ctl} in the same directory as the tool
20+
@file{gpgconf.exe}. The root of the installation is then that
2121
directory; or, if @file{gpgconf.exe} has been installed directly below
2222
a directory named @file{bin}, its parent directory. You also need to
2323
make sure that the following directories exist and are writable:

0 commit comments

Comments
 (0)