diff --git a/doc/DETAILS b/doc/DETAILS
index 6b1087c91..f6d95660e 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -223,7 +223,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..f9a2d0701 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
@@ -890,7 +890,7 @@ update this FAQ in the next month.  See the section "Changes" for recent updates
     : > updpref
 
     Finally we must decrypt and re-encrypt the key, making sure that we
-    encrypt with a cipher that PGP likes. We set this up in the --edit
+    encrypt with a cipher that PGP likes. We set this up in the --edit-key
     line above, so now we just need to change the passphrase to make it
     take effect. You can use the same passphrase if you like, or take
     this opportunity to actually change it.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index f6107b815..2ba99e5c0 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1101,7 +1101,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
@@ -1175,7 +1175,7 @@ all affected self-signatures is set one second ahead.
 @opindex passwd
 Change the passphrase of the secret key belonging to the certificate
 specified as @var{user-id}.  This is a shortcut for the sub-command
-@code{passwd} of the edit key menu.  When using together with the
+@code{passwd} of the @option{--edit-key} menu.  When using together with the
 option @option{--dry-run} this will not actually change the passphrase
 but check that the current passphrase is correct.
 
@@ -3601,7 +3601,7 @@ read/write only. Use this option only if you really know what you are doing.
 @opindex default-preference-list
 Set the list of default preferences to @var{string}. This preference
 list is used for new keys and becomes the default for "setpref" in the
-edit menu.
+@option{--edit-key} menu.
 
 @item --default-keyserver-url @var{name}
 @opindex default-keyserver-url