mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-17 14:07:03 +01:00
doc: Fix typos
-- GnuPG-bug-id: 5071 Also fixed one in keyformat.txt [wk]. (cherry picked from commit 572bcacc287d24d0a2cc56442f9fb6a9ac49e12d)
This commit is contained in:
parent
6594dc31f5
commit
563db31467
@ -245,7 +245,7 @@ The currently defined protection modes are:
|
|||||||
they can easily be stripped by looking for the end of the list.
|
they can easily be stripped by looking for the end of the list.
|
||||||
|
|
||||||
The associated data required for this protection mode is 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:
|
is this canonical encoded S-expression:
|
||||||
|
|
||||||
(rsa
|
(rsa
|
||||||
|
@ -421,7 +421,7 @@ fingerprint of the primary key the entire public key is deleted.
|
|||||||
@opindex delete-secret-keys
|
@opindex delete-secret-keys
|
||||||
Remove key from the secret keyring. In batch mode the key must be
|
Remove key from the secret keyring. In batch mode the key must be
|
||||||
specified by fingerprint. The option @option{--yes} can be used to
|
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
|
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
|
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
|
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
|
@opindex delete-secret-and-public-key
|
||||||
Same as @option{--delete-key}, but if a secret key exists, it will be
|
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.
|
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.
|
request a confirmation.
|
||||||
|
|
||||||
@item --export
|
@item --export
|
||||||
|
@ -1237,9 +1237,9 @@ last file descriptor passed to the application.
|
|||||||
@xref{fun-assuan_sendfd, ,the assuan_sendfd function,assuan,the Libassuan
|
@xref{fun-assuan_sendfd, ,the assuan_sendfd function,assuan,the Libassuan
|
||||||
manual}, on how to do descriptor passing.
|
manual}, on how to do descriptor passing.
|
||||||
|
|
||||||
The @code{--armor} option may be used to advice the server that the
|
The @code{--armor} option may be used to advise the server that the
|
||||||
input data is in @acronym{PEM} format, @code{--base64} advices that a
|
input data is in @acronym{PEM} format, @code{--base64} advises that a
|
||||||
raw base-64 encoding is used, @code{--binary} advices of raw binary
|
raw base-64 encoding is used, @code{--binary} advises of raw binary
|
||||||
input (@acronym{BER}). If none of these options is used, the server
|
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
|
tries to figure out the used encoding, but this may not always be
|
||||||
correct.
|
correct.
|
||||||
|
@ -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. */
|
this deletes the entire key without asking. */
|
||||||
static gpg_error_t
|
static gpg_error_t
|
||||||
change_keyattr (app_t app, int keyno, const unsigned char *buf, size_t buflen,
|
change_keyattr (app_t app, int keyno, const unsigned char *buf, size_t buflen,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user