diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gpg.texi | 4 | ||||
| -rw-r--r-- | doc/gpgsm.texi | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 48e52e98f..361c434fa 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 17e30d243..50a2595ae 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -1271,9 +1271,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. |