29 files changed, 141 insertions, 141 deletions
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index cc689af6d2d..b9e0ce44046 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -40,7 +40,7 @@ adds the character to the buffer at point.  Insertion moves point
 forward, so that point remains just after the inserted text.
 @xref{Point}.
 
-@kindex @key{RET}
+@kindex RET
 @kindex C-j
 @cindex newline
 @c @findex electric-indent-just-newline
@@ -182,7 +182,7 @@ keyboard commands that move point in more sophisticated ways.
 Move forward one character (@code{forward-char}).
 
 @item @key{RIGHT}
-@kindex @key{RIGHT}
+@kindex RIGHT
 @findex right-char
 This command (@code{right-char}) behaves like @kbd{C-f}, except when
 point is in a right-to-left paragraph (@pxref{Bidirectional Editing}).
@@ -193,7 +193,7 @@ point is in a right-to-left paragraph (@pxref{Bidirectional Editing}).
 Move backward one character (@code{backward-char}).
 
 @item @key{LEFT}
-@kindex @key{LEFT}
+@kindex LEFT
 @findex left-char
 This command (@code{left-char}) behaves like @kbd{C-b}, except if the
 current paragraph is right-to-left (@pxref{Bidirectional Editing}).
@@ -201,7 +201,7 @@ current paragraph is right-to-left (@pxref{Bidirectional Editing}).
 @item C-n
 @itemx @key{DOWN}
 @kindex C-n
-@kindex @key{DOWN}
+@kindex DOWN
 @findex next-line
 Move down one screen line (@code{next-line}).  This command attempts
 to keep the horizontal position unchanged, so if you start in the
@@ -210,7 +210,7 @@ middle of one line, you move to the middle of the next.
 @item C-p
 @itemx @key{UP}
 @kindex C-p
-@kindex @key{UP}
+@kindex UP
 @findex previous-line
 Move up one screen line (@code{previous-line}).  This command
 preserves position within the line, like @kbd{C-n}.
@@ -218,14 +218,14 @@ preserves position within the line, like @kbd{C-n}.
 @item C-a
 @itemx @key{Home}
 @kindex C-a
-@kindex @key{HOME}
+@kindex HOME
 @findex move-beginning-of-line
 Move to the beginning of the line (@code{move-beginning-of-line}).
 
 @item C-e
 @itemx @key{End}
 @kindex C-e
-@kindex @key{END}
+@kindex END
 @findex move-end-of-line
 Move to the end of the line (@code{move-end-of-line}).
 
@@ -234,8 +234,8 @@ Move forward one word (@code{forward-word}).  @xref{Words}.
 
 @item C-@key{RIGHT}
 @itemx M-@key{RIGHT}
-@kindex C-@key{RIGHT}
-@kindex M-@key{RIGHT}
+@kindex C-RIGHT
+@kindex M-RIGHT
 @findex right-word
 This command (@code{right-word}) behaves like @kbd{M-f}, except it
 moves @emph{backward} by one word if the current paragraph is
@@ -246,8 +246,8 @@ Move backward one word (@code{backward-word}).  @xref{Words}.
 
 @item C-@key{LEFT}
 @itemx M-@key{LEFT}
-@kindex C-@key{LEFT}
-@kindex M-@key{LEFT}
+@kindex C-LEFT
+@kindex M-LEFT
 @findex left-word
 This command (@code{left-word}) behaves like @kbd{M-b}, except it
 moves @emph{forward} by one word if the current paragraph is
@@ -277,7 +277,7 @@ On graphical displays, @kbd{C-@key{HOME}} does the same.
 
 @item M->
 @kindex M->
-@kindex C-@key{END}
+@kindex C-END
 @findex end-of-buffer
 Move to the end of the buffer (@code{end-of-buffer}).  On graphical
 displays, @kbd{C-@key{END}} does the same.
@@ -314,7 +314,7 @@ also specify @var{n} by giving @kbd{M-g M-g} a numeric prefix argument.
 a plain prefix argument.
 
 @item M-g @key{TAB}
-@kindex M-g @key{TAB}
+@kindex M-g TAB
 @findex move-to-column
 Read a number @var{n} and move to column @var{n} in the current line.
 Column 0 is the leftmost column.  If called with a prefix argument,
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 2f0bb9740d3..f8c1856058a 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -111,8 +111,8 @@ it, Emacs asks for the file name to use, and the buffer's major mode
 is re-established taking that file name into account (@pxref{Choosing
 Modes}).
 
-@kindex C-x @key{LEFT}
-@kindex C-x @key{RIGHT}
+@kindex C-x LEFT
+@kindex C-x RIGHT
 @findex next-buffer
 @findex previous-buffer
   For conveniently switching between a few buffers, use the commands
@@ -419,13 +419,13 @@ removing the flags.
 
 @item @key{DEL}
 @findex Buffer-menu-backup-unmark
-@kindex @key{DEL} @r{(Buffer Menu)}
+@kindex DEL @r{(Buffer Menu)}
 Move to the previous line and remove all flags on that line
 (@code{Buffer-menu-backup-unmark}).
 
 @item M-@key{DEL}
 @findex Buffer-menu-unmark-all-buffers
-@kindex M-@key{DEL} @r{(Buffer Menu)}
+@kindex M-DEL @r{(Buffer Menu)}
 Remove a particular flag from all lines
 (@code{Buffer-menu-unmark-all-buffers}).  This asks for a single
 character, and unmarks buffers marked with that character; typing
@@ -479,7 +479,7 @@ visible buffer is displayed in its place.
 @itemx f
 @findex Buffer-menu-this-window
 @kindex f @r{(Buffer Menu)}
-@kindex @key{RET} @r{(Buffer Menu)}
+@kindex RET @r{(Buffer Menu)}
 Select this line's buffer, replacing the @file{*Buffer List*} buffer
 in its window (@code{Buffer-menu-this-window}).
 
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 52a42a196a8..7be96fa85c0 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -768,7 +768,7 @@ be bizarre.  See the GDB manual entry regarding @code{jump} for
 details.
 
 @item @key{TAB}
-@kindex @key{TAB} @r{(GUD)}
+@kindex TAB @r{(GUD)}
 @findex gud-gdb-complete-command
 With GDB, complete a symbol name (@code{gud-gdb-complete-command}).
 This key is available only in the GUD interaction buffer.
@@ -998,7 +998,7 @@ to the @dfn{current breakpoint} (the breakpoint which point is on):
 
 @table @kbd
 @item @key{SPC}
-@kindex @key{SPC} @r{(GDB Breakpoints buffer)}
+@kindex SPC @r{(GDB Breakpoints buffer)}
 @findex gdb-toggle-breakpoint
 Enable/disable current breakpoint (@code{gdb-toggle-breakpoint}).  On
 a graphical display, this changes the color of the dot in the fringe
@@ -1011,7 +1011,7 @@ is enabled, and gray when it is disabled.
 Delete the current breakpoint (@code{gdb-delete-breakpoint}).
 
 @item @key{RET}
-@kindex @key{RET} @r{(GDB Breakpoints buffer)}
+@kindex RET @r{(GDB Breakpoints buffer)}
 @findex gdb-goto-breakpoint
 Visit the source line for the current breakpoint
 (@code{gdb-goto-breakpoint}).
@@ -1204,7 +1204,7 @@ immediate children exceeds the value of the variable
   To delete a complex watch expression, move point to the root
 expression in the speedbar and type @kbd{D} (@code{gdb-var-delete}).
 
-@kindex @key{RET} @r{(GDB speedbar)}
+@kindex RET @r{(GDB speedbar)}
 @findex gdb-edit-value
   To edit a variable with a simple data type, or a simple element of a
 complex data type, move point there in the speedbar and type @key{RET}
@@ -1490,7 +1490,7 @@ Evaluate all the Emacs Lisp expressions in the buffer.
 @ifinfo
 @c This uses 'colon' instead of a literal ':' because Info cannot
 @c cope with a ':' in a menu.
-@kindex M-@key{colon}
+@kindex M-colon
 @end ifinfo
 @ifnotinfo
 @kindex M-:
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 98089fd20fb..c6a84b5ab12 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -328,7 +328,7 @@ date.
 (@code{calendar-redraw}) to redraw it.  (This can only happen if you use
 non-Calendar-mode editing commands.)
 
-@kindex @key{SPC} @r{(Calendar mode)}
+@kindex SPC @r{(Calendar mode)}
   In Calendar mode, you can use @key{SPC} (@code{scroll-other-window})
 and @key{DEL} (@code{scroll-other-window-down}) to scroll the other
 window (if there is one) up or down, respectively.  This is handy when
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index da8f6f76a82..9ba7e211013 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -123,8 +123,8 @@ or moving point there and typing @kbd{@key{RET}}.  For example, the group
 names like @samp{[Editing]} are links; activating one of these links
 brings up the customization buffer for that group.
 
-@kindex @key{TAB} @r{(customization buffer)}
-@kindex @key{S-TAB} @r{(customization buffer)}
+@kindex TAB @r{(customization buffer)}
+@kindex S-TAB @r{(customization buffer)}
 @findex widget-forward
 @findex widget-backward
   In the customization buffer, you can type @kbd{@key{TAB}}
@@ -243,7 +243,7 @@ You don't have to worry about specifying a value that is not valid;
 the @samp{Set for Current Session} operation checks for validity and
 will not install an unacceptable value.
 
-@kindex M-@key{TAB} @r{(customization buffer)}
+@kindex M-TAB @r{(customization buffer)}
 @kindex C-M-i @r{(customization buffer)}
 @findex widget-complete
   While editing certain kinds of values, such as file names, directory
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 2c2d9dded20..15c9cb56878 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -136,7 +136,7 @@ buffers.  The keys @kbd{C-n} and @kbd{C-p} are redefined to put the
 cursor at the beginning of the file name on the line, rather than at
 the beginning of the line.
 
-@kindex @key{SPC} @r{(Dired)}
+@kindex SPC @r{(Dired)}
   For extra convenience, @key{SPC} and @kbd{n} in Dired are equivalent
 to @kbd{C-n}.  @kbd{p} is equivalent to @kbd{C-p}.  (Moving by lines
 is so common in Dired that it deserves to be easy to type.)  @key{DEL}
@@ -204,7 +204,7 @@ region for deletion; in this case, the command does not move point,
 and ignores any prefix argument.
 
 @kindex u @r{(Dired deletion)}
-@kindex @key{DEL} @r{(Dired)}
+@kindex DEL @r{(Dired)}
   The reason for flagging files for deletion, rather than deleting
 files immediately, is to reduce the danger of deleting a file
 accidentally.  Until you direct Dired to delete the flagged files, you
@@ -348,7 +348,7 @@ and supplying that file name (@code{dired-find-file}).  @xref{Visiting}.
 
 @item @key{RET}
 @itemx e
-@kindex @key{RET} @r{(Dired)}
+@kindex RET @r{(Dired)}
 @kindex e @r{(Dired)}
 Equivalent to @kbd{f}.
 
@@ -464,7 +464,7 @@ unmark the previous @minus{}@var{n} files).
 
 @item @key{DEL}
 @itemx * @key{DEL}
-@kindex * @key{DEL} @r{(Dired)}
+@kindex * DEL @r{(Dired)}
 @findex dired-unmark-backward
 @cindex unmarking files (in Dired)
 Move point to previous line and remove any mark on that line
@@ -485,7 +485,7 @@ Remove all marks from all the files in this Dired buffer
 @item * ? @var{markchar}
 @itemx M-@key{DEL}
 @kindex * ? @r{(Dired)}
-@kindex M-@key{DEL} @r{(Dired)}
+@kindex M-DEL @r{(Dired)}
 @findex dired-unmark-all-files
 Remove all marks that use the character @var{markchar}
 (@code{dired-unmark-all-files}).  If invoked with @kbd{M-@key{DEL}},
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index fdd18896f25..5ddc3d63e72 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -79,10 +79,10 @@ Scroll backward (@code{scroll-down-command}).
 
 @kindex C-v
 @kindex M-v
-@kindex @key{next}
-@kindex @key{prior}
-@kindex @key{PageDown}
-@kindex @key{PageUp}
+@kindex next
+@kindex prior
+@kindex PageDown
+@kindex PageUp
 @findex scroll-up-command
 @findex scroll-down-command
   @kbd{C-v} (@code{scroll-up-command}) scrolls forward by nearly the
@@ -447,8 +447,8 @@ it.  @xref{Disabling}.
 @cindex mode, View
 
 @kindex s @r{(View mode)}
-@kindex @key{SPC} @r{(View mode)}
-@kindex @key{DEL} @r{(View mode)}
+@kindex SPC @r{(View mode)}
+@kindex DEL @r{(View mode)}
   View mode is a minor mode that lets you scan a buffer by sequential
 screenfuls.  It provides commands for scrolling through the buffer
 conveniently but not for changing it.  Apart from the usual Emacs
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 9c2a922bfc0..d7ca1e91611 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1966,7 +1966,7 @@ then specifying @file{/tmp/foo*bar} will visit only
 @cindex file name caching
 @cindex cache of file names
 @pindex find
-@kindex C-@key{TAB}
+@kindex C-TAB
 @findex file-cache-minibuffer-complete
   You can use the @dfn{file name cache} to make it easy to locate a
 file by name, without having to remember exactly where it is located.
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 4eb44ba96b4..8cc4d649bbc 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -480,13 +480,13 @@ cycles through all the frames on your terminal.
 Delete all frames on the current terminal, except the selected one.
 
 @item M-@key{F10}
-@kindex M-@key{F10}
+@kindex M-F10
 @findex toggle-frame-maximized
 Toggle the maximization state of the current frame.  When a frame is
 maximized, it fills the screen.
 
 @item @key{F11>}
-@kindex @key{F11}
+@kindex F11
 @findex toggle-frame-fullscreen
 Toggle full-screen mode for the current frame.  (The difference
 between full-screen and maximized is normally that the former
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 4abd267276e..a5700760d44 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -8,7 +8,7 @@
 @cindex self-documentation
 @findex help-command
 @kindex C-h
-@kindex @key{F1}
+@kindex F1
 
 @kindex C-h C-h
 @findex help-for-help
@@ -431,7 +431,7 @@ Go back to the previous help topic (@code{help-go-back}).
 @findex help-follow
 @findex help-go-back
 @findex help-go-forward
-@kindex @key{RET} @r{(Help mode)}
+@kindex RET @r{(Help mode)}
 @kindex C-c C-b @r{(Help mode)}
 @kindex l @r{(Help mode)}
 @kindex C-c C-f @r{(Help mode)}
@@ -455,9 +455,9 @@ code definitions, and URLs (web pages).  The first two are opened in
 Emacs, and the third using a web browser via the @code{browse-url}
 command (@pxref{Browse-URL}).
 
-@kindex @key{TAB} @r{(Help mode)}
+@kindex TAB @r{(Help mode)}
 @findex forward-button
-@kindex S-@key{TAB} @r{(Help mode)}
+@kindex S-TAB @r{(Help mode)}
 @findex backward-button
   In a help buffer, @key{TAB} (@code{forward-button}) moves point
 forward to the next hyperlink, while @kbd{S-@key{TAB}}
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index eae334449ce..b38e85819ce 100644
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -17,7 +17,7 @@ programming language modes.  @xref{Program Indent}, for additional
 documentation about indenting in programming modes.
 
 @findex indent-for-tab-command
-@kindex @key{TAB} @r{(indentation)}
+@kindex TAB @r{(indentation)}
   The simplest way to perform indentation is the @key{TAB} key.  In
 most major modes, this runs the command @code{indent-for-tab-command}.
 (In C and related modes, @key{TAB} runs the command
@@ -120,7 +120,7 @@ If a numeric argument is supplied, indent every line in the region to
 that column number.
 
 @item C-x @key{TAB}
-@kindex C-x @key{TAB}
+@kindex C-x TAB
 @findex indent-rigidly
 @cindex remove indentation
 This command is used to change the indentation of all lines that begin
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 7b89dce4e6f..4118b752e62 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -111,7 +111,7 @@ active (@pxref{Using Region}).
 
 @kindex M-\
 @findex delete-horizontal-space
-@kindex M-@key{SPC}
+@kindex M-SPC
 @findex just-one-space
 @findex cycle-spacing
   The other delete commands are those that delete only whitespace
diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi
index 83fe1979e0c..8528c9f6bd5 100644
--- a/doc/emacs/kmacro.texi
+++ b/doc/emacs/kmacro.texi
@@ -64,8 +64,8 @@ Run the last keyboard macro on each line that begins in the region
 (@code{apply-macro-to-region-lines}).
 @end table
 
-@kindex @key{F3}
-@kindex @key{F4}
+@kindex F3
+@kindex F4
 @findex kmacro-start-macro-or-insert-counter
 @findex kmacro-end-or-call-macro
 @findex kmacro-end-and-call-macro
@@ -481,7 +481,7 @@ Edit the last 300 keystrokes as a keyboard macro
 
 @findex kmacro-edit-macro
 @kindex C-x C-k C-e
-@kindex C-x C-k @key{RET}
+@kindex C-x C-k RET
   You can edit the last keyboard macro by typing @kbd{C-x C-k C-e} or
 @kbd{C-x C-k @key{RET}} (@code{kmacro-edit-macro}).  This formats the
 macro definition in a buffer and enters a specialized major mode for
@@ -505,7 +505,7 @@ keyboard input that you would use to invoke the macro---@kbd{C-x e} or
 @section Stepwise Editing a Keyboard Macro
 
 @findex kmacro-step-edit-macro
-@kindex C-x C-k @key{SPC}
+@kindex C-x C-k SPC
   You can interactively replay and edit the last keyboard
 macro, one command at a time, by typing @kbd{C-x C-k @key{SPC}}
 (@code{kmacro-step-edit-macro}).  Unless you quit the macro using
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 20cc67a1e79..0ffa9f74ac6 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -79,7 +79,7 @@ Set the mark at point if the mark is inactive, then move point.
 @xref{Shift Selection}.
 @end table
 
-@kindex C-@key{SPC}
+@kindex C-SPC
 @kindex C-@@
 @findex set-mark-command
   The most common way to set the mark is with @kbd{C-@key{SPC}}
@@ -309,7 +309,7 @@ Move point to where the mark was, and restore the mark from the ring
 of former marks.
 @end table
 
-@kindex C-@key{SPC} C-@key{SPC}
+@kindex C-SPC C-SPC
   The command @kbd{C-@key{SPC} C-@key{SPC}} is handy when you want to
 use the mark to remember a position to which you may wish to return.
 It pushes the current point onto the mark ring, without activating the
@@ -320,7 +320,7 @@ and the second @kbd{C-@key{SPC}} deactivates it.  (When Transient Mark
 mode is off, @kbd{C-@key{SPC} C-@key{SPC}} instead activates Transient
 Mark mode temporarily; @pxref{Disabled Transient Mark}.)
 
-@kindex C-u C-@key{SPC}
+@kindex C-u C-SPC
   To return to a marked position, use @code{set-mark-command} with a
 prefix argument: @kbd{C-u C-@key{SPC}}.  This moves point to where the
 mark was, and deactivates the mark if it was active.  Each subsequent
@@ -365,7 +365,7 @@ of buffers that you have been in, and, for each buffer, a place where
 you set the mark.  The length of the global mark ring is controlled by
 @code{global-mark-ring-max}, and is 16 by default.
 
-@kindex C-x C-@key{SPC}
+@kindex C-x C-SPC
 @findex pop-global-mark
   The command @kbd{C-x C-@key{SPC}} (@code{pop-global-mark}) jumps to
 the buffer and position of the latest entry in the global ring.  It also
@@ -447,7 +447,7 @@ using @kbd{C-@key{SPC} C-@key{SPC}} or @kbd{C-u C-x C-x}.
 
 @table @kbd
 @item C-@key{SPC} C-@key{SPC}
-@kindex C-@key{SPC} C-@key{SPC}@r{, disabling Transient Mark}
+@kindex C-SPC C-SPC@r{, disabling Transient Mark}
 Set the mark at point (like plain @kbd{C-@key{SPC}}) and enable
 Transient Mark mode just once, until the mark is deactivated.  (This
 is not really a separate command; you are using the @kbd{C-@key{SPC}}
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 2a77b840e16..579697f47bd 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -266,7 +266,7 @@ Completion}.
 @node Completion Example
 @subsection Completion Example
 
-@kindex @key{TAB} @r{(completion example)}
+@kindex TAB @r{(completion example)}
   A simple example may help here.  @kbd{M-x} uses the minibuffer to
 read the name of a command, so completion works by matching the
 minibuffer text against the names of existing Emacs commands.  Suppose
@@ -318,7 +318,7 @@ first (@code{minibuffer-complete-and-exit}).  @xref{Completion Exit}.
 Display a list of completions (@code{minibuffer-completion-help}).
 @end table
 
-@kindex @key{TAB} @r{(completion)}
+@kindex TAB @r{(completion)}
 @findex minibuffer-complete
   @key{TAB} (@code{minibuffer-complete}) is the most fundamental
 completion command.  It searches for all possible completions that
@@ -326,7 +326,7 @@ match the existing minibuffer text, and attempts to complete as much
 as it can.  @xref{Completion Styles}, for how completion alternatives
 are chosen.
 
-@kindex @key{SPC} @r{(completion)}
+@kindex SPC @r{(completion)}
 @findex minibuffer-complete-word
   @key{SPC} (@code{minibuffer-complete-word}) completes like
 @key{TAB}, but only up to the next hyphen or space.  If you have
@@ -379,7 +379,7 @@ completion alternative (@code{previous-completion}).
 @node Completion Exit
 @subsection Completion Exit
 
-@kindex @key{RET} @r{(completion in minibuffer)}
+@kindex RET @r{(completion in minibuffer)}
 @findex minibuffer-complete-and-exit
   When a command reads an argument using the minibuffer with
 completion, it also controls what happens when you type @key{RET}
@@ -655,8 +655,8 @@ directory.
 
 @findex previous-line-or-history-element
 @findex next-line-or-history-element
-@kindex @key{UP} @r{(minibuffer history)}
-@kindex @key{DOWN} @r{(minibuffer history)}
+@kindex UP @r{(minibuffer history)}
+@kindex DOWN @r{(minibuffer history)}
   The arrow keys @kbd{@key{UP}} and @kbd{@key{DOWN}} work like
 @kbd{M-p} and @kbd{M-n}, but if the current history item is longer
 than a single line, they allow you to move to the previous or next
@@ -727,7 +727,7 @@ Display the entire command history, showing all the commands
 @kbd{C-x @key{ESC} @key{ESC}} can repeat, most recent first.
 @end table
 
-@kindex C-x @key{ESC} @key{ESC}
+@kindex C-x ESC ESC
 @findex repeat-complex-command
   @kbd{C-x @key{ESC} @key{ESC}} re-executes a recent command that used
 the minibuffer.  With no argument, it repeats the last such command.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 7f2a0a11071..e1b8070f432 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -129,7 +129,7 @@ sessions.
   The following commands are available in the Gnus group buffer:
 
 @table @kbd
-@kindex @key{SPC} @r{(Gnus Group mode)}
+@kindex SPC @r{(Gnus Group mode)}
 @findex gnus-group-read-group
 @item @key{SPC}
 Switch to the summary buffer for the group on the current line.
@@ -177,7 +177,7 @@ Kill the group on the current line.  Killed groups are not recorded in
 the @file{.newsrc} file, and they are not shown in the @kbd{l} or
 @kbd{L} listings.
 
-@kindex @key{DEL} @r{(Gnus Group mode)}
+@kindex DEL @r{(Gnus Group mode)}
 @item @key{DEL}
 Move point to the previous group containing unread articles.
 
@@ -203,7 +203,7 @@ Update your Gnus settings, and quit Gnus.
   The following commands are available in the Gnus summary buffer:
 
 @table @kbd
-@kindex @key{SPC} @r{(Gnus Summary mode)}
+@kindex SPC @r{(Gnus Summary mode)}
 @findex gnus-summary-next-page
 @item @key{SPC}
 If there is no article selected, select the article on the current
@@ -214,7 +214,7 @@ buffer, select the next unread article.
 Thus, you can read through all articles by repeatedly typing
 @key{SPC}.
 
-@kindex @key{DEL} @r{(Gnus Summary mode)}
+@kindex DEL @r{(Gnus Summary mode)}
 @findex gnus-summary-prev-page
 @item @key{DEL}
 Scroll the text of the article backwards.
@@ -481,8 +481,8 @@ page, type @kbd{p}, @key{prior} or @kbd{C-x [}
 
 @findex doc-view-scroll-up-or-next-page
 @findex doc-view-scroll-down-or-previous-page
-@kindex @key{SPC} @r{(DocView mode)}
-@kindex @key{DEL} @r{(DocView mode)}
+@kindex SPC @r{(DocView mode)}
+@kindex DEL @r{(DocView mode)}
   @key{SPC} (@code{doc-view-scroll-up-or-next-page}) is a convenient
 way to advance through the document.  It scrolls within the current
 page or advances to the next.  @key{DEL} moves backwards in a similar
@@ -826,7 +826,7 @@ commands:
 
 @table @kbd
 @item @key{RET}
-@kindex @key{RET} @r{(Shell mode)}
+@kindex RET @r{(Shell mode)}
 @findex comint-send-input
 Send the current line as input to the subshell
 (@code{comint-send-input}).  Any shell prompt at the beginning of the
@@ -836,7 +836,7 @@ interactive shell.  However, you can also invoke @key{RET} elsewhere
 in the shell buffer to submit the current line as input.
 
 @item @key{TAB}
-@kindex @key{TAB} @r{(Shell mode)}
+@kindex TAB @r{(Shell mode)}
 @findex completion-at-point@r{, in Shell Mode}
 @cindex shell completion
 Complete the command name or file name before point in the shell
@@ -1182,7 +1182,7 @@ Move point to the previous prompt (@code{comint-previous-prompt}).
 @item C-c C-n
 Move point to the following prompt (@code{comint-next-prompt}).
 
-@kindex C-c @key{RET} @r{(Shell mode)}
+@kindex C-c RET @r{(Shell mode)}
 @findex comint-copy-old-input
 @item C-c @key{RET}
 Copy the input command at point, inserting the copy at the end of the
@@ -2796,7 +2796,7 @@ the package commentary by typing @kbd{C-h P browse-url @key{RET}}.
 Activate URLs and e-mail addresses in the current buffer.
 @end table
 
-@kindex C-c @key{RET} @r{(Goto Address mode)}
+@kindex C-c RET @r{(Goto Address mode)}
 @findex goto-address-at-point
   You can make Emacs mark out URLs specially in the current buffer, by
 typing @kbd{M-x goto-address-mode}.  When this buffer-local minor mode
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index fd8f0110a3f..2bbc17b26db 100644
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -33,8 +33,8 @@ one another, and of the selected major mode.
 @section Major Modes
 @cindex major modes
 @cindex mode, major
-@kindex @key{TAB} @r{(and major modes)}
-@kindex @key{DEL} @r{(and major modes)}
+@kindex TAB @r{(and major modes)}
+@kindex DEL @r{(and major modes)}
 @kindex C-j @r{(and major modes)}
 
   Every buffer possesses a major mode, which determines the editing
@@ -236,7 +236,7 @@ called Outline mode.  @xref{Outline Mode}.
 @cindex Overwrite mode
 @cindex mode, Overwrite
 @findex overwrite-mode
-@kindex @key{INSERT}
+@kindex INSERT
 @item
 Overwrite mode causes ordinary printing characters to replace existing
 text instead of shoving it to the right.  For example, if point is in
diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi
index 94e4161c158..406ebd19051 100644
--- a/doc/emacs/msdos-xtra.texi
+++ b/doc/emacs/msdos-xtra.texi
@@ -47,8 +47,8 @@ about Emacs's special handling of text files under MS-DOS (and Windows).
 @node MS-DOS Keyboard
 @subsection Keyboard Usage on MS-DOS
 
-@kindex @key{DEL} @r{(MS-DOS)}
-@kindex @key{BS} @r{(MS-DOS)}
+@kindex DEL @r{(MS-DOS)}
+@kindex BS @r{(MS-DOS)}
   The key that is called @key{DEL} in Emacs (because that's how it is
 designated on most workstations) is known as @key{BS} (backspace) on a
 PC@.  That is why the PC-specific terminal initialization remaps the
@@ -56,7 +56,7 @@ PC@.  That is why the PC-specific terminal initialization remaps the
 as @kbd{C-d} for the same reasons.
 
 @kindex C-g @r{(MS-DOS)}
-@kindex C-@key{Break} @r{(MS-DOS)}
+@kindex C-Break @r{(MS-DOS)}
 @cindex quitting on MS-DOS
   Emacs built for MS-DOS recognizes @kbd{C-@key{Break}} as a quit
 character, just like @kbd{C-g}.  This is because Emacs cannot detect
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index 9af0edaa124..b3b40d476e6 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -579,7 +579,7 @@ modifier with the trailing dash but with no key indicates that all
 Windows defined hotkeys for that modifier are to be overridden in the
 favor of Emacs.
 
-@kindex M-@key{TAB}@r{, (MS-Windows)}
+@kindex M-TAB@r{, (MS-Windows)}
 @cindex @kbd{M-@key{TAB}} vs @kbd{@key{Alt}-@key{TAB}} (MS-Windows)
 @cindex @kbd{@key{Alt}-@key{TAB}} vs @kbd{M-@key{TAB}} (MS-Windows)
   For example, @code{(w32-register-hot-key [M-tab])} lets you use
@@ -693,7 +693,7 @@ its normal effect: for example, @kbd{@key{Lwindow}} opens the
 @code{Start} menu, etc.
 
 @vindex w32-recognize-altgr
-@kindex @key{AltGr} @r{(MS-Windows)}
+@kindex AltGr @r{(MS-Windows)}
 @cindex @key{AltGr} key (MS-Windows)
   The variable @code{w32-recognize-altgr} controls whether the
 @key{AltGr} key (if it exists on your keyboard), or its equivalent,
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 487285f8d3e..dc80bc92172 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -130,7 +130,7 @@ various @dfn{input methods}, typically one for each script or
 language, which make it easier to type characters in the script.
 @xref{Input Methods}.
 
-@kindex C-x @key{RET}
+@kindex C-x RET
   The prefix key @kbd{C-x @key{RET}} is used for commands that pertain
 to multibyte characters, coding systems, and input methods.
 
@@ -577,7 +577,7 @@ Display a list of all the supported input methods.
 
 @findex set-input-method
 @vindex current-input-method
-@kindex C-x @key{RET} C-\
+@kindex C-x RET C-\
   To choose an input method for the current buffer, use @kbd{C-x
 @key{RET} C-\} (@code{set-input-method}).  This command reads the
 input method name from the minibuffer; the name normally starts with the
@@ -1021,7 +1021,7 @@ Convert a region that was decoded using coding system @var{wrong},
 decoding it using coding system @var{right} instead.
 @end table
 
-@kindex C-x @key{RET} f
+@kindex C-x RET f
 @findex set-buffer-file-coding-system
   The command @kbd{C-x @key{RET} f}
 (@code{set-buffer-file-coding-system}) sets the file coding system for
@@ -1043,7 +1043,7 @@ current buffer.  For example, @kbd{C-x @key{RET} f dos @key{RET}} will
 cause Emacs to save the current buffer's text with DOS-style
 carriage-return linefeed line endings.
 
-@kindex C-x @key{RET} c
+@kindex C-x RET c
 @findex universal-coding-system-argument
   Another way to specify the coding system for a file is when you visit
 the file.  First use the command @kbd{C-x @key{RET} c}
@@ -1077,7 +1077,7 @@ then save it in a file.  Selecting a language environment typically sets
 this variable to a good choice of default coding system for that language
 environment.
 
-@kindex C-x @key{RET} r
+@kindex C-x RET r
 @findex revert-buffer-with-coding-system
   If you visit a file with a wrong coding system, you can correct this
 with @kbd{C-x @key{RET} r} (@code{revert-buffer-with-coding-system}).
@@ -1113,8 +1113,8 @@ subprocess input and output in the current buffer
 (@code{set-buffer-process-coding-system}).
 @end table
 
-@kindex C-x @key{RET} x
-@kindex C-x @key{RET} X
+@kindex C-x RET x
+@kindex C-x RET X
 @findex set-selection-coding-system
 @findex set-next-selection-coding-system
   The command @kbd{C-x @key{RET} x} (@code{set-selection-coding-system})
@@ -1139,7 +1139,7 @@ list of some of these symbols, Emacs tries only the request types in
 the list, in order, until one of them succeeds, or until the list is
 exhausted.
 
-@kindex C-x @key{RET} p
+@kindex C-x RET p
 @findex set-buffer-process-coding-system
   The command @kbd{C-x @key{RET} p} (@code{set-buffer-process-coding-system})
 specifies the coding system for input and output to a subprocess.  This
@@ -1181,7 +1181,7 @@ names (@code{set-file-name-coding-system}).
 @end table
 
 @findex set-file-name-coding-system
-@kindex C-x @key{RET} F
+@kindex C-x RET F
 @cindex file names with non-@acronym{ASCII} characters
   The command @kbd{C-x @key{RET} F} (@code{set-file-name-coding-system})
 specifies a coding system to use for encoding file @emph{names}.  It
@@ -1247,7 +1247,7 @@ Use coding system @var{coding} for keyboard input
 (@code{set-keyboard-coding-system}).
 @end table
 
-@kindex C-x @key{RET} t
+@kindex C-x RET t
 @findex set-terminal-coding-system
   The command @kbd{C-x @key{RET} t} (@code{set-terminal-coding-system})
 specifies the coding system for terminal output.  If you specify a
@@ -1264,7 +1264,7 @@ Emacs knows which characters the terminal can actually handle.
 Emacs can deduce the proper coding system from your terminal type or
 your locale specification (@pxref{Language Environments}).
 
-@kindex C-x @key{RET} k
+@kindex C-x RET k
 @findex set-keyboard-coding-system
 @vindex keyboard-coding-system
   The command @kbd{C-x @key{RET} k} (@code{set-keyboard-coding-system}),
@@ -1843,8 +1843,8 @@ character positions may look discontinuous if the region spans
 reordered text.  This is normal and similar to the behavior of other
 programs that support bidirectional text.
 
-@kindex @key{RIGHT}@r{, and bidirectional text}
-@kindex @key{LEFT}@r{, and bidirectional text}
+@kindex RIGHT@r{, and bidirectional text}
+@kindex LEFT@r{, and bidirectional text}
 @findex right-char@r{, and bidirectional text}
 @findex left-char@r{, and bidirectional text}
   Cursor motion commands bound to arrow keys, such as @key{LEFT} and
diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi
index 35387a07b05..39c353b0ff1 100644
--- a/doc/emacs/picture-xtra.texi
+++ b/doc/emacs/picture-xtra.texi
@@ -191,7 +191,7 @@ C-b} (@code{picture-motion-reverse}) moves in the opposite direction.
 @node Tabs in Picture
 @subsection Picture Mode Tabs
 
-@kindex M-@key{TAB} @r{(Picture mode)}
+@kindex M-TAB @r{(Picture mode)}
 @findex picture-tab-search
 @vindex picture-tab-chars
   Two kinds of tab-like action are provided in Picture mode.  Use
@@ -214,7 +214,7 @@ current tab stop settings; it is the Picture mode equivalent of
 @code{tab-to-tab-stop}.  Normally it just moves point, but with a numeric
 argument it clears the text that it moves over.
 
-@kindex C-c @key{TAB} @r{(Picture mode)}
+@kindex C-c TAB @r{(Picture mode)}
 @findex picture-set-tab-stops
   The context-based and tab-stop-based forms of tabbing are brought
 together by the command @kbd{C-c @key{TAB}} (@code{picture-set-tab-stops}).
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 76a7b896454..3a4330ea891 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -100,7 +100,7 @@ language that you might want to edit.  If it doesn't have a mode for
 your favorite language, the mode might be implemented in a package not
 distributed with Emacs (@pxref{Packages}); or you can contribute one.
 
-@kindex @key{DEL} @r{(programming modes)}
+@kindex DEL @r{(programming modes)}
 @findex backward-delete-char-untabify
   In most programming languages, indentation should vary from line to
 line to illustrate the structure of the program.  Therefore, in most
@@ -381,7 +381,7 @@ Insert a newline, then adjust indentation of following line
 (@code{newline}).
 @end table
 
-@kindex @key{TAB} @r{(programming modes)}
+@kindex TAB @r{(programming modes)}
 @findex indent-line-function
   The basic indentation command is @kbd{@key{TAB}}
 (@code{indent-for-tab-command}), which was documented in
@@ -446,7 +446,7 @@ indentation of the line where the grouping starts).  The function that
 etc.  To correct the overall indentation as well, type @kbd{@key{TAB}}
 first.
 
-@kindex C-u @key{TAB}
+@kindex C-u TAB
   If you like the relative indentation within a grouping but not the
 indentation of its first line, move point to that first line and type
 @kbd{C-u @key{TAB}}.  In Lisp, C, and some other major modes,
@@ -718,7 +718,7 @@ argument moves the previous balanced expression backwards across those
 before it.  An argument of zero, rather than doing nothing, transposes
 the balanced expressions ending at or after point and the mark.
 
-@kindex C-M-@key{SPC}
+@kindex C-M-SPC
   To operate on balanced expressions with a command which acts on the
 region, type @kbd{C-M-@key{SPC}} (@code{mark-sexp}).  This sets the
 mark where @kbd{C-M-f} would move to.  While the mark is active, each
@@ -1380,7 +1380,7 @@ nor comments).  The default value is @code{code}.
   Completion is normally done in the minibuffer (@pxref{Completion}),
 but you can also complete symbol names in ordinary Emacs buffers.
 
-@kindex M-@key{TAB}
+@kindex M-TAB
 @kindex C-M-i
   In programming language modes, type @kbd{C-M-i} or @kbd{M-@key{TAB}}
 to complete the partial symbol before point.  On graphical displays,
@@ -1486,7 +1486,7 @@ Prompt for the name of a function defined in any file Emacs has
 parsed, and move point there (@code{semantic-complete-jump}).
 
 @item C-c , @key{SPC}
-@kindex C-c , @key{SPC}
+@kindex C-c , SPC
 Display a list of possible completions for the symbol at point
 (@code{semantic-complete-analyze-inline}).  This also activates a set
 of special key bindings for choosing a completion: @kbd{@key{RET}}
@@ -1736,8 +1736,8 @@ preprocessor commands.
 @item C-c C-@key{DEL}
 @itemx C-c @key{DEL}
 @findex c-hungry-delete-backwards
-@kindex C-c C-@key{DEL} @r{(C Mode)}
-@kindex C-c @key{DEL} @r{(C Mode)}
+@kindex C-c C-DEL @r{(C Mode)}
+@kindex C-c DEL @r{(C Mode)}
 Delete the entire block of whitespace preceding point (@code{c-hungry-delete-backwards}).
 
 @item C-c C-d
@@ -1745,8 +1745,8 @@ Delete the entire block of whitespace preceding point (@code{c-hungry-delete-bac
 @itemx C-c @key{Delete}
 @findex c-hungry-delete-forward
 @kindex C-c C-d @r{(C Mode)}
-@kindex C-c C-@key{Delete} @r{(C Mode)}
-@kindex C-c @key{Delete} @r{(C Mode)}
+@kindex C-c C-Delete @r{(C Mode)}
+@kindex C-c Delete @r{(C Mode)}
 Delete the entire block of whitespace after point (@code{c-hungry-delete-forward}).
 @end table
 
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 37a69347f44..8ff36ca554d 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -70,7 +70,7 @@ Jump to the position and buffer saved in register @var{r}
 (@code{jump-to-register}).
 @end table
 
-@kindex C-x r @key{SPC}
+@kindex C-x r SPC
 @findex point-to-register
   Typing @kbd{C-x r @key{SPC}} (@code{point-to-register}), followed by
 a character @kbd{@var{r}}, saves both the position of point and the
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 15d66a3840b..e9371f39a96 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -109,9 +109,9 @@ Scroll to start of message (@code{rmail-beginning-of-message}).
 Scroll to end of message (@code{rmail-end-of-message}).
 @end table
 
-@kindex @key{SPC} @r{(Rmail)}
-@kindex @key{DEL} @r{(Rmail)}
-@kindex S-@key{SPC} @r{(Rmail)}
+@kindex SPC @r{(Rmail)}
+@kindex DEL @r{(Rmail)}
+@kindex S-SPC @r{(Rmail)}
   Since the most common thing to do while reading a message is to
 scroll through it by screenfuls, Rmail makes @key{SPC} and @key{DEL}
 (or @kbd{S-@key{SPC}}) do the same as @kbd{C-v} (@code{scroll-up-command})
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 674d1165d80..19a4a9e4b6c 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -304,7 +304,7 @@ the full command name and documentation for a menu item, type
 @kbd{C-h k}, and then select the menu bar with the mouse in the usual
 way (@pxref{Key Help}).
 
-@kindex @key{F10}
+@kindex F10
 @findex menu-bar-open
 @cindex menu bar access using keyboard
   Instead of using the mouse, you can also invoke the first menu bar
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 7ca73f9b6d1..723bdf1ad8c 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -397,7 +397,7 @@ or @code{query-replace-regexp} (depending on search mode) with the
 current search string used as the string to replace.  A negative
 prefix argument means to replace backward.  @xref{Query Replace}.
 
-@kindex M-@key{TAB} @r{(Incremental search)}
+@kindex M-TAB @r{(Incremental search)}
   Typing @kbd{M-@key{TAB}} in incremental search invokes
 @code{isearch-complete}, which attempts to complete the search string
 using the search ring (the previous search strings you used) as a list
@@ -1186,8 +1186,8 @@ differences usually don't matter; etc.  This is known as
 tailor them to your needs.
 
 @cindex lax space matching in search
-@kindex M-s @key{SPC} @r{(Incremental search)}
-@kindex @key{SPC} @r{(Incremental search)}
+@kindex M-s SPC @r{(Incremental search)}
+@kindex SPC @r{(Incremental search)}
 @findex isearch-toggle-lax-whitespace
 @vindex search-whitespace-regexp
   By default, search commands perform @dfn{lax space matching}:
@@ -1570,10 +1570,10 @@ read-only text.  The default is not to ignore them.
 or regexp are:
 
 @ignore @c Not worth it.
-@kindex @key{SPC} @r{(query-replace)}
-@kindex @key{DEL} @r{(query-replace)}
+@kindex SPC @r{(query-replace)}
+@kindex DEL @r{(query-replace)}
 @kindex , @r{(query-replace)}
-@kindex @key{RET} @r{(query-replace)}
+@kindex RET @r{(query-replace)}
 @kindex . @r{(query-replace)}
 @kindex ! @r{(query-replace)}
 @kindex ^ @r{(query-replace)}
@@ -1770,7 +1770,7 @@ Note that matches for the regexp you type are extended to include
 complete lines, and a match that starts before the previous match ends
 is not considered a match.
 
-@kindex @key{RET} @r{(Occur mode)}
+@kindex RET @r{(Occur mode)}
 @kindex o @r{(Occur mode)}
 @kindex C-o @r{(Occur mode)}
 In the @file{*Occur*} buffer, you can click on each entry, or move
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index c7cc005a21c..b7bdd69c7c2 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -461,7 +461,7 @@ just after the header separator line---that is, to the beginning of
 the body.
 
 @findex message-tab
-@kindex @key{TAB} @r{(Message mode)}
+@kindex TAB @r{(Message mode)}
   While editing a header field that contains addresses, such as
 @samp{To:}, @samp{Cc:} and @samp{Bcc:}, you can complete an address by
 typing @key{TAB} (@code{message-tab}).  This attempts to insert the
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 2170e8648b0..e00c5503433 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -137,7 +137,7 @@ kill only the next word but not the punctuation before it, simply do
 @kbd{M-@key{DEL}}.)  @kbd{M-d} takes arguments just like @kbd{M-f}.
 
 @findex backward-kill-word
-@kindex M-@key{DEL}
+@kindex M-DEL
   @kbd{M-@key{DEL}} (@code{backward-kill-word}) kills the word before
 point.  It kills everything from point back to where @kbd{M-b} would
 move to.  For instance, if point is after the space in @w{@samp{FOO,
@@ -214,7 +214,7 @@ of the sentence.  With a positive numeric argument @var{n}, it kills
 the next @var{n} sentences; with a negative argument @minus{}@var{n},
 it kills back to the beginning of the @var{n}th preceding sentence.
 
-@kindex C-x @key{DEL}
+@kindex C-x DEL
 @findex backward-kill-sentence
   The @kbd{C-x @key{DEL}} (@code{backward-kill-sentence}) kills back
 to the beginning of a sentence.
@@ -878,7 +878,7 @@ paragraphs.  As a result, paragraphs can be indented, and adaptive
 filling determines what indentation to use when filling a paragraph.
 @xref{Adaptive Fill}.
 
-@kindex @key{TAB} @r{(Text mode)}
+@kindex TAB @r{(Text mode)}
   In Text mode, the @key{TAB} (@code{indent-for-tab-command}) command
 usually inserts whitespace up to the next tab stop, instead of
 indenting the current line.  @xref{Indentation}, for details.
@@ -905,7 +905,7 @@ paragraph-indent-minor-mode} to enable an equivalent minor mode for
 situations where you shouldn't change the major mode---in mail
 composition, for instance.
 
-@kindex M-@key{TAB} @r{(Text mode)}
+@kindex M-TAB @r{(Text mode)}
   Text mode binds @kbd{M-@key{TAB}} to @code{ispell-complete-word}.
 This command performs completion of the partial word in the buffer
 before point, using the spelling dictionary as the space of possible
@@ -1352,7 +1352,7 @@ starts with one or more @samp{*} characters.  @xref{Outline Format}.
 In addition, any line that begins with the @samp{#} character is
 treated as a comment.
 
-@kindex @key{TAB} @r{(Org Mode)}
+@kindex TAB @r{(Org Mode)}
 @findex org-cycle
   Org mode provides commands for easily viewing and manipulating the
 outline structure.  The simplest of these commands is @key{TAB}
@@ -1363,17 +1363,17 @@ of its direct children, if any, and (iii) showing the entire subtree.
 If invoked in a body line, the global binding for @key{TAB} is
 executed.
 
-@kindex S-@key{TAB} @r{(Org Mode)}
+@kindex S-TAB @r{(Org Mode)}
 @findex org-shifttab
   Typing @kbd{S-@key{TAB}} (@code{org-shifttab}) anywhere in an Org mode
 buffer cycles the visibility of the entire outline structure, between
 (i) showing only top-level heading lines, (ii) showing all heading
 lines but no body lines, and (iii) showing everything.
 
-@kindex M-@key{UP} @r{(Org Mode)}
-@kindex M-@key{DOWN} @r{(Org Mode)}
-@kindex M-@key{LEFT} @r{(Org Mode)}
-@kindex M-@key{RIGHT} @r{(Org Mode)}
+@kindex M-UP @r{(Org Mode)}
+@kindex M-DOWN @r{(Org Mode)}
+@kindex M-LEFT @r{(Org Mode)}
+@kindex M-RIGHT @r{(Org Mode)}
 @findex org-metaup
 @findex org-metadown
 @findex org-metaleft
@@ -1852,7 +1852,7 @@ in a local variable list in each of the subfiles.  @xref{File
 Variables}.
 
 @findex tex-bibtex-file
-@kindex C-c @key{TAB} @r{(@TeX{} mode)}
+@kindex C-c TAB @r{(@TeX{} mode)}
 @vindex tex-bibtex-command
   For @LaTeX{} files, you can use Bib@TeX{} to process the auxiliary
 file for the current buffer's file.  Bib@TeX{} looks up bibliographic
@@ -1995,7 +1995,7 @@ Run a shell command (which you must specify) to validate the current
 buffer as SGML (@code{sgml-validate}).
 
 @item C-c @key{TAB}
-@kindex C-c @key{TAB} @r{(SGML mode)}
+@kindex C-c TAB @r{(SGML mode)}
 @findex sgml-tags-invisible
 Toggle the visibility of existing tags in the buffer.  This can be
 used as a cheap preview (@code{sgml-tags-invisible}).
@@ -2308,7 +2308,7 @@ These margins also affect fill commands such as @kbd{M-q}
 for specifying indentation:
 
 @table @code
-@kindex C-x @key{TAB} @r{(Enriched mode)}
+@kindex C-x TAB @r{(Enriched mode)}
 @findex increase-left-margin
 @item Indent More
 Indent the region by 4 columns (@code{increase-left-margin}).  In
@@ -2848,7 +2848,7 @@ buffer.  There are three ways to enter two-column mode:
 
 @table @asis
 @item @kbd{@key{F2} 2} or @kbd{C-x 6 2}
-@kindex @key{F2} 2
+@kindex F2 2
 @kindex C-x 6 2
 @findex 2C-two-columns
 Enter two-column mode with the current buffer on the left, and on the
@@ -2861,7 +2861,7 @@ This command is appropriate when the current buffer is empty or contains
 just one column and you want to add another column.
 
 @item @kbd{@key{F2} s} or @kbd{C-x 6 s}
-@kindex @key{F2} s
+@kindex F2 s
 @kindex C-x 6 s
 @findex 2C-split
 Split the current buffer, which contains two-column text, into two
@@ -2876,7 +2876,7 @@ two-column text, and you wish to separate the columns temporarily.
 
 @item @kbd{@key{F2} b @var{buffer} @key{RET}}
 @itemx @kbd{C-x 6 b @var{buffer} @key{RET}}
-@kindex @key{F2} b
+@kindex F2 b
 @kindex C-x 6 b
 @findex 2C-associate-buffer
 Enter two-column mode using the current buffer as the left-hand buffer,
@@ -2900,15 +2900,15 @@ way to write a line that spans both columns while in two-column
 mode: write it in the left-hand buffer, and put an empty line in the
 right-hand buffer.)
 
-@kindex @key{F2} @key{RET}
-@kindex C-x 6 @key{RET}
+@kindex F2 RET
+@kindex C-x 6 RET
 @findex 2C-newline
   The command @kbd{C-x 6 @key{RET}} or @kbd{@key{F2} @key{RET}}
 (@code{2C-newline}) inserts a newline in each of the two buffers at
 corresponding positions.  This is the easiest way to add a new line to
 the two-column text while editing it in split buffers.
 
-@kindex @key{F2} 1
+@kindex F2 1
 @kindex C-x 6 1
 @findex 2C-merge
   When you have edited both buffers as you wish, merge them with
@@ -2916,7 +2916,7 @@ the two-column text while editing it in split buffers.
 text from the right-hand buffer as a second column in the other buffer.
 To go back to two-column editing, use @kbd{@key{F2} s}.
 
-@kindex @key{F2} d
+@kindex F2 d
 @kindex C-x 6 d
 @findex 2C-dissociate
   Use @kbd{@key{F2} d} or @kbd{C-x 6 d} to dissociate the two buffers,
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 1b81797f0d4..c0dc3d472e3 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -104,7 +104,7 @@ argument, you can cancel that argument with @kbd{C-g} and remain in the
 recursive edit.
 
 @findex keyboard-escape-quit
-@kindex @key{ESC} @key{ESC} @key{ESC}
+@kindex ESC ESC ESC
   The sequence @kbd{@key{ESC} @key{ESC} @key{ESC}}
 (@code{keyboard-escape-quit}) can either quit or abort.  (We defined
 it this way because @key{ESC} means ``get out'' in many PC programs.)