Fix bug #17362 with inconsistent usage of @key and @kbd, and key names.

 doc/emacs/trouble.texi (Quitting, DEL Does Not Delete, Emergency Escape)
 (Bug Criteria): Fix usage of @kbd and @key.  (Bug#17362)
 doc/emacs/text.texi (Words, Pages, Foldout, HTML Mode): Fix usage of @kbd
 and @key.
 doc/emacs/search.texi (Special Isearch, Regexp Search): Fix usage of @kbd
 and @key.
 doc/emacs/screen.texi (Echo Area, Menu Bar): Fix usage of @kbd and @key.
 doc/emacs/rmail.texi (Rmail Scrolling): Fix usage of @kbd and @key.
 doc/emacs/programs.texi (Hungry Delete, Other C Commands): Fix usage of
 @kbd and @key.
 doc/emacs/picture-xtra.texi (Insert in Picture): Fix usage of @kbd and
 @key.
 doc/emacs/mule.texi (Unibyte Mode, Bidirectional Editing): Fix usage of
 @kbd and @key.
 doc/emacs/msdog.texi (Windows Keyboard, Windows Processes): Fix usage of
 @kbd and @key.
 doc/emacs/msdog-xtra.texi (MS-DOS Keyboard, MS-DOS Printing)
 (MS-DOS Processes): Fix usage of @kbd and @key.
 doc/emacs/misc.texi (Shell Ring, Printing Package): Fix usage of @kbd and
 @key.
 doc/emacs/mini.texi (Completion Commands, Minibuffer History): Fix usage
 of @kbd and @key.
 doc/emacs/kmacro.texi (Keyboard Macro Step-Edit): Fix usage of @kbd and
 @key.
 doc/emacs/killing.texi (Deletion, Rectangles, CUA Bindings): Fix usage of
 @kbd and @key.
 doc/emacs/indent.texi (Indentation Commands): Fix usage of @kbd and @key.
 doc/emacs/help.texi (Help Mode, Misc Help): Fix usage of @kbd and @key.
 doc/emacs/glossary.texi (Glossary): Fix usage of @kbd and @key.
 doc/emacs/frames.texi (Speedbar): Fix usage of @kbd and @key.
 doc/emacs/files.texi (Misc File Ops, File Name Cache, File Conveniences)
 (Filesets): Fix usage of @kbd and @key.
 doc/emacs/display.texi (View Mode): Fix usage of @kbd and @key.
 doc/emacs/dired.texi (Image-Dired): Fix usage of @kbd and @key.
 doc/emacs/custom.texi (Modifier Keys, Function Keys, Named ASCII Chars)
 (Init Syntax): Fix usage of @kbd and @key.
 doc/emacs/commands.texi (User Input): Fix usage of @kbd and @key.
 doc/emacs/calendar.texi (Counting Days, General Calendar): Fix usage of
 @kbd and @key.
 doc/emacs/building.texi (Threads Buffer): Fix usage of @kbd and @key.
 doc/emacs/buffers.texi (Select Buffer, Icomplete): Fix usage of @kbd and
 @key.
 doc/emacs/basic.texi (Inserting Text, Erasing, Arguments): Fix usage of
 @kbd and @key.

1 files changed, 7 insertions, 7 deletions

diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 1c9b7fc220d..10612de82bb 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -42,28 +42,28 @@ are certain characters found on non-English keyboards
 @cindex modifier keys
 @cindex Control
 @cindex C-
-@cindex Meta
+@cindex META
 @cindex M-
   Emacs also recognizes control characters that are entered using
 @dfn{modifier keys}.  Two commonly-used modifier keys are
-@key{Control} (usually labeled @key{Ctrl}), and @key{Meta} (usually
-labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{Meta} for
+@key{Control} (usually labeled @key{Ctrl}), and @key{META} (usually
+labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{META} for
 historical reasons.}.  For example, @kbd{Control-a} is entered by
 holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
-to this as @kbd{C-a} for short.  Similarly @kbd{Meta-a}, or @kbd{M-a}
+to this as @kbd{C-a} for short.  Similarly @kbd{@key{META}-a}, or @kbd{M-a}
 for short, is entered by holding down the @key{Alt} key and pressing
 @kbd{a}.  Modifier keys can also be applied to non-alphanumerical
 characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{left}}.
 
-@cindex @key{ESC} replacing @key{Meta} key
+@cindex @key{ESC} replacing @key{META} key
   You can also type Meta characters using two-character sequences
 starting with @key{ESC}.  Thus, you can enter @kbd{M-a} by typing
 @kbd{@key{ESC} a}.  You can enter @kbd{C-M-a} by typing @kbd{@key{ESC}
-C-a}.  Unlike @key{Meta}, @key{ESC} is entered as a separate
+C-a}.  Unlike @key{META}, @key{ESC} is entered as a separate
 character.  You don't hold down @key{ESC} while typing the next
 character; instead, press @key{ESC} and release it, then enter the
 next character.  This feature is useful on certain text terminals
-where the @key{Meta} key does not function reliably.
+where the @key{META} key does not function reliably.
 
 @cindex keys stolen by window manager
 @cindex window manager, keys stolen by