From 563db31467b2e3f588db4b45bade82c27f039b83 Mon Sep 17 00:00:00 2001 From: "Gavin L. Rebeiro" Date: Wed, 16 Sep 2020 11:11:43 +0000 Subject: [PATCH] doc: Fix typos -- GnuPG-bug-id: 5071 Also fixed one in keyformat.txt [wk]. (cherry picked from commit 572bcacc287d24d0a2cc56442f9fb6a9ac49e12d) --- agent/keyformat.txt | 2 +- doc/gpg.texi | 4 ++-- doc/gpgsm.texi | 6 +++--- scd/app-openpgp.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/agent/keyformat.txt b/agent/keyformat.txt index c15e4f8d1..24d742048 100644 --- a/agent/keyformat.txt +++ b/agent/keyformat.txt @@ -245,7 +245,7 @@ The currently defined protection modes are: they can easily be stripped by looking for the end of the list. The associated data required for this protection mode is the list - formiing the public key parameters. For the above example this is + forming the public key parameters. For the above example this is is this canonical encoded S-expression: (rsa diff --git a/doc/gpg.texi b/doc/gpg.texi index f611813fb..fc8539cd6 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -421,7 +421,7 @@ fingerprint of the primary key the entire public key is deleted. @opindex delete-secret-keys Remove key from the secret keyring. In batch mode the key must be specified by fingerprint. The option @option{--yes} can be used to -advice gpg-agent not to request a confirmation. This extra +advise gpg-agent not to request a confirmation. This extra pre-caution is done because @command{@gpgname} can't be sure that the secret key (as controlled by gpg-agent) is only used for the given OpenPGP public key. If the exclamation mark syntax is used with the @@ -434,7 +434,7 @@ primary key only the secret part of the primary key is deleted. @opindex delete-secret-and-public-key Same as @option{--delete-key}, but if a secret key exists, it will be removed first. In batch mode the key must be specified by fingerprint. -The option @option{--yes} can be used to advice gpg-agent not to +The option @option{--yes} can be used to advise gpg-agent not to request a confirmation. @item --export diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index 1c329a713..0900e8709 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -1237,9 +1237,9 @@ last file descriptor passed to the application. @xref{fun-assuan_sendfd, ,the assuan_sendfd function,assuan,the Libassuan manual}, on how to do descriptor passing. -The @code{--armor} option may be used to advice the server that the -input data is in @acronym{PEM} format, @code{--base64} advices that a -raw base-64 encoding is used, @code{--binary} advices of raw binary +The @code{--armor} option may be used to advise the server that the +input data is in @acronym{PEM} format, @code{--base64} advises that a +raw base-64 encoding is used, @code{--binary} advises of raw binary input (@acronym{BER}). If none of these options is used, the server tries to figure out the used encoding, but this may not always be correct. diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index ec60db2e6..7480f5041 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -3340,7 +3340,7 @@ build_ecc_privkey_template (app_t app, int keyno, } -/* Helper for do_writekley to change the size of a key. Not ethat +/* Helper for do_writekey to change the size of a key. Note that this deletes the entire key without asking. */ static gpg_error_t change_keyattr (app_t app, int keyno, const unsigned char *buf, size_t buflen,