[PATCH] Inconsistent references to --edit-key option

[Carl Michael Skog]

Noticed, while reading the manual, that in some places, the --edit-key option is referred to as "--edit".

Tweak this in all occurences except in NEWS and CHANGELOG-* files.
---
doc/DETAILS | 2 +-
doc/faq.org | 4 ++--
doc/gpg.texi | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/DETAILS b/doc/DETAILS
index f1abda930..737c131f9 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -222,7 +222,7 @@ described here.

*** Field 14 - Flag field

- Flag field used in the --edit menu output
+ Flag field used in the --edit-key menu output

*** Field 15 - S/N of a token

diff --git a/doc/faq.org b/doc/faq.org
index 2f873e600..df1ab262b 100644
--- a/doc/faq.org
+++ b/doc/faq.org
@@ -506,7 +506,7 @@ update this FAQ in the next month. See the section "Changes" for recent updates
1. Change to this directory.

1. Run the command
- : gpg --homedir . --edit foo
+ : gpg --homedir . --edit-key foo

and use the sub-command =passwd= to remove the passphrase from the
subkeys. You may also want to remove all unused subkeys.
@@ -876,7 +876,7 @@ update this FAQ in the next month. See the section "Changes" for recent updates
in your options file.

: $ gpg --s2k-cipher-algo cast5 --s2k-digest-algo sha1 --s2k-mode 3 \
- : --simple-sk-checksum --edit KeyID
+ : --simple-sk-checksum --edit-key KeyID

Turn off some features. Set the list of preferred ciphers, hashes,
and compression algorithms to things that PGP can handle. (Yes, I
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 80c7f48f5..30d82a715 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -762,7 +762,7 @@ to use this.
@itemx --gen-revoke @var{name}
@opindex gen-revoke
Generate a revocation certificate for the complete key. To only revoke
-a subkey or a key signature, use the @option{--edit} command.
+a subkey or a key signature, use the @option{--edit-key} command.

This command merely creates the revocation certificate so that it can
be used to revoke the key if that is ever needed. To actually revoke
@@ -1075,7 +1075,7 @@ For possible values of trust, @pxref{trust-values}.
@item --sign-key @var{name}
@opindex sign-key
Signs a public key with your secret key. This is a shortcut version of
-the subcommand "sign" from @option{--edit}.
+the subcommand "sign" from @option{--edit-key}.

@item --lsign-key @var{name}
@opindex lsign-key
--
2.14.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.gnupg.org/pipermail/gnupg-devel/attachments/20190818/e1b61f56/attachment-0001.html>