Remove @key{} markups from @kindex entries in manuals

* doc/emacs/basic.texi:
* doc/emacs/buffers.texi:
* doc/emacs/building.texi:
* doc/emacs/calendar.texi:
* doc/emacs/custom.texi:
* doc/emacs/dired.texi:
* doc/emacs/display.texi:
* doc/emacs/files.texi:
* doc/emacs/frames.texi:
* doc/emacs/help.texi:
* doc/emacs/indent.texi:
* doc/emacs/killing.texi:
* doc/emacs/kmacro.texi:
* doc/emacs/mark.texi:
* doc/emacs/mini.texi:
* doc/emacs/misc.texi:
* doc/emacs/modes.texi:
* doc/emacs/msdos-xtra.texi:
* doc/emacs/msdos.texi:
* doc/emacs/mule.texi:
* doc/emacs/picture-xtra.texi:
* doc/emacs/programs.texi:
* doc/emacs/regs.texi:
* doc/emacs/rmail.texi:
* doc/emacs/screen.texi:
* doc/emacs/search.texi:
* doc/emacs/sending.texi:
* doc/emacs/text.texi:
* doc/emacs/trouble.texi:
* doc/misc/calc.texi:
* doc/misc/cc-mode.texi:
* doc/misc/ediff.texi:
* doc/misc/ert.texi:
* doc/misc/eww.texi:
* doc/misc/forms.texi:
* doc/misc/gnus.texi:
* doc/misc/idlwave.texi:
* doc/misc/info.texi:
* doc/misc/message.texi:
* doc/misc/mh-e.texi:
* doc/misc/newsticker.texi:
* doc/misc/org.texi:
* doc/misc/pcl-cvs.texi:
* doc/misc/rcirc.texi:
* doc/misc/reftex.texi:
* doc/misc/sc.texi:
* doc/misc/sieve.texi:
* doc/misc/vhdl-mode.texi:
* doc/misc/vip.texi:
* doc/misc/viper.texi:
* doc/misc/woman.texi: Remove @key{} markups from @kindex entries.

51 files changed, 354 insertions, 354 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.)
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index a29097cfda9..cd2f66d24eb 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -9710,7 +9710,7 @@ The @kbd{C-x * x} command also turns the Calculator off, no matter which
 user interface (standard, Keypad, or Embedded) is currently active.
 It also cancels @code{calc-edit} mode if used from there.
 
-@kindex d @key{SPC}
+@kindex d SPC
 @pindex calc-refresh
 @cindex Refreshing a garbled display
 @cindex Garbled displays, refreshing
@@ -10268,7 +10268,7 @@ information is cleared whenever you give any command that adds new undo
 information, i.e., if you undo, then enter a number on the stack or make
 any other change, then it will be too late to redo.
 
-@kindex M-@key{RET}
+@kindex M-RET
 @pindex calc-last-args
 @cindex Last-arguments feature
 @cindex Arguments, restoring
@@ -11732,8 +11732,8 @@ type, such as numbers, vectors, formulas, and incomplete objects.)
 @section Stack Manipulation Commands
 
 @noindent
-@kindex @key{RET}
-@kindex @key{SPC}
+@kindex RET
+@kindex SPC
 @pindex calc-enter
 @cindex Duplicating stack entries
 To duplicate the top object on the stack, press @key{RET} or @key{SPC}
@@ -11749,7 +11749,7 @@ For example, with @samp{10 20 30} on the stack,
 @kbd{C-u - 2 @key{RET}} creates @samp{10 20 30 20}, and
 @kbd{C-u 0 @key{RET}} creates @samp{10 20 30 10 20 30}.
 
-@kindex @key{LFD}
+@kindex LFD
 @pindex calc-over
 The @key{LFD} (@code{calc-over}) command (on a key marked Line-Feed if you
 have it, else on @kbd{C-j}) is like @code{calc-enter}
@@ -11759,7 +11759,7 @@ Thus with @samp{10 20 30} on the stack, @key{LFD} and @kbd{C-u 2 @key{LFD}}
 are both equivalent to @kbd{C-u - 2 @key{RET}}, producing
 @samp{10 20 30 20}.
 
-@kindex @key{DEL}
+@kindex DEL
 @kindex C-d
 @pindex calc-pop
 @cindex Removing stack entries
@@ -11777,7 +11777,7 @@ For example, with @samp{10 20 30} on the stack,
 @kbd{C-u - 2 @key{DEL}} leaves @samp{10 30}, and
 @kbd{C-u 0 @key{DEL}} leaves an empty stack.
 
-@kindex M-@key{DEL}
+@kindex M-DEL
 @pindex calc-pop-above
 The @kbd{M-@key{DEL}} (@code{calc-pop-above}) command is to @key{DEL} what
 @key{LFD} is to @key{RET}:  It interprets the sign of the numeric
@@ -11798,7 +11798,7 @@ specified element of the stack regardless of the cursor  position.
 Similarly, @key{DEL} will remove the corresponding elements from the
 stack.
 
-@kindex @key{TAB}
+@kindex TAB
 @pindex calc-roll-down
 To exchange the top two elements of the stack, press @key{TAB}
 (@code{calc-roll-down}).  Given a positive numeric prefix argument, the
@@ -11812,7 +11812,7 @@ For example, with @samp{10 20 30 40 50} on the stack,
 @kbd{C-u - 2 @key{TAB}} creates @samp{40 50 10 20 30}, and
 @kbd{C-u 0 @key{TAB}} creates @samp{50 40 30 20 10}.
 
-@kindex M-@key{TAB}
+@kindex M-TAB
 @pindex calc-roll-up
 The command @kbd{M-@key{TAB}} (@code{calc-roll-up}) is analogous to @key{TAB}
 except that it rotates upward instead of downward.  Also, the default
@@ -13075,7 +13075,7 @@ refresh the stack to leave the stack display alone.  The word ``Dirty''
 will appear in the mode line when Calc thinks the stack display may not
 reflect the latest mode settings.
 
-@kindex d @key{RET}
+@kindex d RET
 @pindex calc-refresh-top
 The @kbd{d @key{RET}} (@code{calc-refresh-top}) command reformats the
 top stack entry according to all the current modes.  Positive prefix
@@ -21942,7 +21942,7 @@ If you select an element of a vector and press @key{DEL}, that
 element is deleted from the vector.  If you delete one side of
 an equation or inequality, only the opposite side remains.
 
-@kindex j @key{DEL}
+@kindex j DEL
 @pindex calc-del-selection
 The @kbd{j @key{DEL}} (@code{calc-del-selection}) command is like
 @key{DEL} but with the auto-selecting behavior of @kbd{j '} and
@@ -21950,7 +21950,7 @@ The @kbd{j @key{DEL}} (@code{calc-del-selection}) command is like
 indicated by the cursor, or, in the absence of a selection, it
 deletes the sub-formula indicated by the cursor position.
 
-@kindex j @key{RET}
+@kindex j RET
 @pindex calc-grab-selection
 (There is also an auto-selecting @kbd{j @key{RET}} (@code{calc-copy-selection})
 command.)
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 438919b2d8b..52cd97bca66 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -671,7 +671,7 @@ These commands indent code:
 
 @table @asis
 @item @kbd{@key{TAB}} (@code{c-indent-command})
-@kindex @key{TAB}
+@kindex TAB
 @findex c-indent-command
 @findex indent-command @r{(c-)}
 This command indents the current line.  That is all you need to know
@@ -1518,7 +1518,7 @@ deletion.
 
 @table @asis
 @item @kbd{@key{DEL}} (@code{c-electric-backspace})
-@kindex @key{DEL}
+@kindex DEL
 @findex c-electric-backspace
 @findex electric-backspace @r{(c-)}
 This command is run by default when you hit the @kbd{@key{DEL}} key.  When
@@ -1567,10 +1567,10 @@ rather than using the minor mode toggling.
 
 @table @asis
 @item @kbd{C-c C-@key{DEL}}, or @kbd{C-c @key{DEL}} (@code{c-hungry-delete-backwards})@footnote{This command was formerly known as @code{c-hungry-backspace}.}
-@kindex C-c C-@key{Backspace}
-@kindex C-c @key{Backspace}
-@kindex C-c C-@key{DEL}
-@kindex C-c @key{DEL}
+@kindex C-c C-Backspace
+@kindex C-c Backspace
+@kindex C-c C-DEL
+@kindex C-c DEL
 @findex c-hungry-delete-backwards
 @findex hungry-delete-backwards @r{(c-)}
 Delete any amount of whitespace in the backwards direction (regardless
@@ -1581,8 +1581,8 @@ a character terminal.
 
 @item @kbd{C-c C-d}, @kbd{C-c C-@key{DELETE}}, or @kbd{C-c @key{DELETE}} (@code{c-hungry-delete-forward})
 @kindex C-c C-d
-@kindex C-c C-@key{Delete}
-@kindex C-c @key{Delete}
+@kindex C-c C-Delete
+@kindex C-c Delete
 @findex c-hungry-delete-forward
 @findex hungry-delete-forward @r{(c-)}
 Delete any amount of whitespace in the forward direction (regardless
@@ -1592,8 +1592,8 @@ same reason as for @key{DEL} above.
 @end table
 @end table
 
-@kindex @key{Delete}
-@kindex @key{Backspace}
+@kindex Delete
+@kindex Backspace
 
 When we talk about @kbd{@key{DEL}}, and @kbd{@key{Delete}} above, we
 actually do so without connecting them to the physical keys commonly
@@ -7248,7 +7248,7 @@ early on:
 Set the variable @code{c-basic-offset}.  @xref{Getting Started}.
 
 @item
-@kindex @key{RET}
+@kindex RET
 @kindex C-j
 @emph{Why does/doesn't the @kbd{@key{RET}} key indent the new line?}
 
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 86b93056d1a..8ffa90fb5b5 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -543,12 +543,12 @@ The command @kbd{rb} undoes this.
 @item p
 @itemx @key{DEL}
 @kindex p
-@kindex @key{DEL}
+@kindex DEL
 Makes the previous difference region current.
 @item n
 @itemx @key{SPC}
 @kindex n
-@kindex @key{SPC}
+@kindex SPC
 Makes the next difference region current.
 
 @item j
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index f80b23f374a..6942e853293 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -260,8 +260,8 @@ unexpected result.  In the example above, there are two failures, both
 due to failed @code{should} forms.  @xref{Understanding Explanations},
 for more details.
 
-@kindex @key{TAB}@r{, in ert results buffer}
-@kindex S-@key{TAB}@r{, in ert results buffer}
+@kindex TAB@r{, in ert results buffer}
+@kindex S-TAB@r{, in ert results buffer}
 In the ERT results buffer, @kbd{@key{TAB}} and @kbd{S-@key{TAB}} cycle between
 buttons.  Each name of a function or macro in this buffer is a button;
 moving point to it and typing @kbd{@key{RET}} jumps to its definition.
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 0b1fb6598b7..43adc2eda0f 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -98,7 +98,7 @@ web page hit @kbd{g} (@code{eww-reload}).  Pressing @kbd{w}
 (@code{eww-copy-page-url}) will copy the current URL to the kill ring.
 
 @findex eww-open-in-new-buffer
-@kindex M-@key{RET}
+@kindex M-RET
   The @kbd{M-@key{RET}} command (@code{eww-open-in-new-buffer}) opens the
 URL at point in a new EWW buffer, akin to opening a link in a new
 ``tab'' in other browsers.
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index 41847dfcffb..70463419e80 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -226,9 +226,9 @@ Jump to the last record (@code{forms-last-record}).  This command also
 recalculates the number of records in the data file.
 
 @findex forms-next-field
-@kindex @key{TAB}
+@kindex TAB
 @item @key{TAB}
-@kindex C-c @key{TAB}
+@kindex C-c TAB
 @itemx C-c @key{TAB}
 Jump to the next field in the current record (@code{forms-next-field}).
 With a numeric argument @var{n}, jump forward @var{n} fields.  If this command
@@ -263,14 +263,14 @@ prompted for confirmation before the record is deleted unless a numeric
 argument has been provided.
 
 @findex forms-search-forward
-@kindex C-c C-s @var{regexp} @key{RET}
+@kindex C-c C-s @var{regexp} RET
 @item C-c C-s @var{regexp} @key{RET}
 Search forward for @var{regexp} in all records following this one
 (@code{forms-search-forward}).  If found, this record is shown.
 If you give an empty argument, the previous regexp is used again.
 
 @findex forms-search-backward
-@kindex C-c C-r @var{regexp} @key{RET}
+@kindex C-c C-r @var{regexp} RET
 @item C-c C-r @var{regexp} @key{RET}
 Search backward for @var{regexp} in all records following this one
 (@code{forms-search-backward}).  If found, this record is shown.
@@ -334,23 +334,23 @@ The following function key definitions are set up in Forms mode
 (whether read-only or not):
 
 @table @kbd
-@kindex @key{NEXT}
+@kindex NEXT
 @item @key{NEXT}
 forms-next-record
 
-@kindex @key{PRIOR}
+@kindex PRIOR
 @item @key{PRIOR}
 forms-prev-record
 
-@kindex @key{BEGIN}
+@kindex BEGIN
 @item @key{BEGIN}
 forms-first-record
 
-@kindex @key{END}
+@kindex END
 @item @key{END}
 forms-last-record
 
-@kindex S-@key{TAB}
+@kindex S-TAB
 @findex forms-prev-field
 @item S-@key{TAB}
 forms-prev-field
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 43d6820c31b..a166b33a13c 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -1991,7 +1991,7 @@ Go to the next group that has unread articles
 
 @item p
 @itemx @key{DEL}
-@kindex @key{DEL} @r{(Group)}
+@kindex DEL @r{(Group)}
 @kindex p @r{(Group)}
 @findex gnus-group-prev-unread-group
 Go to the previous group that has unread articles
@@ -2063,7 +2063,7 @@ Otherwise, the point is set to the group just exited.  The default is
 @table @kbd
 
 @item @key{SPC}
-@kindex @key{SPC} @r{(Group)}
+@kindex SPC @r{(Group)}
 @findex gnus-group-read-group
 Select the current group, switch to the summary buffer and display the
 first unread article (@code{gnus-group-read-group}).  If there are no
@@ -2083,7 +2083,7 @@ When you are in the group (in the Summary buffer), you can type
 ones.
 
 @item @key{RET}
-@kindex @key{RET} @r{(Group)}
+@kindex RET @r{(Group)}
 @findex gnus-group-select-group
 Select the current group and switch to the summary buffer
 (@code{gnus-group-select-group}).  Takes the same arguments as
@@ -2092,7 +2092,7 @@ does not display the first unread article automatically upon group
 entry.
 
 @item M-@key{RET}
-@kindex M-@key{RET} @r{(Group)}
+@kindex M-RET @r{(Group)}
 @findex gnus-group-quick-select-group
 This does the same as the command above, but tries to do it with the
 minimum amount of fuzz (@code{gnus-group-quick-select-group}).  No
@@ -2104,14 +2104,14 @@ which is useful if you want to toggle threading before generating the
 summary buffer (@pxref{Summary Generation Commands}).
 
 @item M-@key{SPC}
-@kindex M-@key{SPC} @r{(Group)}
+@kindex M-SPC @r{(Group)}
 @findex gnus-group-visible-select-group
 This is yet one more command that does the same as the @kbd{@key{RET}}
 command, but this one does it without expunging and hiding dormants
 (@code{gnus-group-visible-select-group}).
 
 @item C-M-@key{RET}
-@kindex C-M-@key{RET} @r{(Group)}
+@kindex C-M-RET @r{(Group)}
 @findex gnus-group-select-group-ephemerally
 Finally, this command selects the current group ephemerally without
 doing any processing of its contents
@@ -2659,7 +2659,7 @@ Make a group based on an @acronym{RSS} feed
 @xref{RSS}.
 
 @item G @key{DEL}
-@kindex G @key{DEL} @r{(Group)}
+@kindex G DEL @r{(Group)}
 @findex gnus-group-delete-group
 This function will delete the current group
 (@code{gnus-group-delete-group}).  If given a prefix, this function will
@@ -3617,13 +3617,13 @@ Go to the next group (@code{gnus-group-next-group}).
 Go to the previous group (@code{gnus-group-prev-group}).
 
 @item @key{SPC}
-@kindex @key{SPC} @r{(Browse)}
+@kindex SPC @r{(Browse)}
 @findex gnus-browse-read-group
 Enter the current group and display the first article
 (@code{gnus-browse-read-group}).
 
 @item @key{RET}
-@kindex @key{RET} @r{(Browse)}
+@kindex RET @r{(Browse)}
 @findex gnus-browse-select-group
 Enter the current group (@code{gnus-browse-select-group}).
 
@@ -3656,7 +3656,7 @@ Describe browse mode briefly (well, there's not much to describe, is
 there) (@code{gnus-browse-describe-briefly}).
 
 @item @key{DEL}
-@kindex @key{DEL} @r{(Browse)}
+@kindex DEL @r{(Browse)}
 @findex gnus-browse-delete-group
 This function will delete the current group
 (@code{gnus-browse-delete-group}).  If given a prefix, this function
@@ -3802,15 +3802,15 @@ Prompt for a new topic name and create it
 
 @item T @key{TAB}
 @itemx @key{TAB}
-@kindex T @key{TAB} @r{(Topic)}
-@kindex @key{TAB} @r{(Topic)}
+@kindex T TAB @r{(Topic)}
+@kindex TAB @r{(Topic)}
 @findex gnus-topic-indent
 ``Indent'' the current topic so that it becomes a sub-topic of the
 previous topic (@code{gnus-topic-indent}).  If given a prefix,
 ``un-indent'' the topic instead.
 
 @item M-@key{TAB}
-@kindex M-@key{TAB} @r{(Topic)}
+@kindex M-TAB @r{(Topic)}
 @findex gnus-topic-unindent
 ``Un-indent'' the current topic so that it becomes a sub-topic of the
 parent of its current parent (@code{gnus-topic-unindent}).
@@ -3855,7 +3855,7 @@ key.
 @table @kbd
 
 @item @key{RET}
-@kindex @key{RET} @r{(Topic)}
+@kindex RET @r{(Topic)}
 @findex gnus-topic-select-group
 @itemx @key{SPC}
 Either select a group or fold a topic (@code{gnus-topic-select-group}).
@@ -3962,7 +3962,7 @@ expiry process (if any)
 Rename a topic (@code{gnus-topic-rename}).
 
 @item T @key{DEL}
-@kindex T @key{DEL} @r{(Topic)}
+@kindex T DEL @r{(Topic)}
 @findex gnus-topic-delete
 Delete an empty topic (@code{gnus-topic-delete}).
 
@@ -5301,7 +5301,7 @@ If you want to fetch new articles or redisplay the group, see
 
 @table @kbd
 @item @key{SPC}
-@kindex @key{SPC} @r{(Summary)}
+@kindex SPC @r{(Summary)}
 @findex gnus-summary-next-page
 Select the current article, or, if that one's read already, the next
 unread article (@code{gnus-summary-next-page}).
@@ -5443,7 +5443,7 @@ instead.  It will leave marks like @code{gnus-low-score-mark},
 @table @kbd
 
 @item @key{SPC}
-@kindex @key{SPC} @r{(Summary)}
+@kindex SPC @r{(Summary)}
 @findex gnus-summary-next-page
 Pressing @kbd{@key{SPC}} will scroll the current article forward one page,
 or, if you have come to the end of the current article, will choose the
@@ -5459,18 +5459,18 @@ what is considered uninteresting with
 pages, no matter how boring, using @kbd{C-M-v}.
 
 @item @key{DEL}
-@kindex @key{DEL} @r{(Summary)}
+@kindex DEL @r{(Summary)}
 @findex gnus-summary-prev-page
 Scroll the current article back one page (@code{gnus-summary-prev-page}).
 
 @item @key{RET}
-@kindex @key{RET} @r{(Summary)}
+@kindex RET @r{(Summary)}
 @findex gnus-summary-scroll-up
 Scroll the current article one line forward
 (@code{gnus-summary-scroll-up}).
 
 @item M-@key{RET}
-@kindex M-@key{RET} @r{(Summary)}
+@kindex M-RET @r{(Summary)}
 @findex gnus-summary-scroll-down
 Scroll the current article one line backward
 (@code{gnus-summary-scroll-down}).
@@ -7282,7 +7282,7 @@ understand the numeric prefix.
 @itemx C-M-f
 @kindex C-M-n @r{(Summary)}
 @itemx M-@key{DOWN}
-@kindex M-@key{DOWN} @r{(Summary)}
+@kindex M-DOWN @r{(Summary)}
 @findex gnus-summary-next-thread
 Go to the next thread (@code{gnus-summary-next-thread}).
 
@@ -7291,7 +7291,7 @@ Go to the next thread (@code{gnus-summary-next-thread}).
 @itemx C-M-b
 @kindex C-M-p @r{(Summary)}
 @itemx M-@key{UP}
-@kindex M-@key{UP} @r{(Summary)}
+@kindex M-UP @r{(Summary)}
 @findex gnus-summary-prev-thread
 Go to the previous thread (@code{gnus-summary-prev-thread}).
 
@@ -10366,7 +10366,7 @@ thread or article and pick it.  (The line number is normally displayed
 at the beginning of the summary pick lines.)
 
 @item @key{SPC}
-@kindex @key{SPC} @r{(Pick)}
+@kindex SPC @r{(Pick)}
 @findex gnus-pick-next-page
 Scroll the summary buffer up one page (@code{gnus-pick-next-page}).  If
 at the end of the buffer, start reading the picked articles.
@@ -10382,7 +10382,7 @@ just the article.  You can give this key a numerical prefix to unpick
 the thread or article at that line.
 
 @item @key{RET}
-@kindex @key{RET} @r{(Pick)}
+@kindex RET @r{(Pick)}
 @findex gnus-pick-start-reading
 @vindex gnus-pick-display-summary
 Start reading the picked articles (@code{gnus-pick-start-reading}).  If
@@ -10624,7 +10624,7 @@ articles eligible for expiry in the current group will
 disappear forever into that big @file{/dev/null} in the sky.
 
 @item B @key{DEL}
-@kindex B @key{DEL} @r{(Summary)}
+@kindex B DEL @r{(Summary)}
 @cindex deleting mail
 @findex gnus-summary-delete-article
 @c @icon{gnus-summary-mail-delete}
@@ -11623,7 +11623,7 @@ The following commands are available when you have placed point over a
 @table @kbd
 @findex gnus-article-press-button
 @item @key{RET} (Article)
-@kindex @key{RET} @r{(Article)}
+@kindex RET @r{(Article)}
 @itemx @key{BUTTON-2} (Article)
 Toggle displaying of the @acronym{MIME} object
 (@code{gnus-article-press-button}).  If built-in viewers can not display
@@ -11633,7 +11633,7 @@ object is displayed inline.
 
 @findex gnus-mime-view-part
 @item M-@key{RET} (Article)
-@kindex M-@key{RET} @r{(Article)}
+@kindex M-RET @r{(Article)}
 @itemx v (Article)
 Prompt for a method, and then view the @acronym{MIME} object using this
 method (@code{gnus-mime-view-part}).
@@ -12133,13 +12133,13 @@ A few additional keystrokes are available:
 @table @kbd
 
 @item @key{SPC}
-@kindex @key{SPC} @r{(Article)}
+@kindex SPC @r{(Article)}
 @findex gnus-article-next-page
 Scroll forwards one page (@code{gnus-article-next-page}).
 This is exactly the same as @kbd{h @key{SPC} h}.
 
 @item @key{DEL}
-@kindex @key{DEL} @r{(Article)}
+@kindex DEL @r{(Article)}
 @findex gnus-article-prev-page
 Scroll backwards one page (@code{gnus-article-prev-page}).
 This is exactly the same as @kbd{h @key{DEL} h}.
@@ -12170,13 +12170,13 @@ Give a very brief description of the available keystrokes
 (@code{gnus-article-describe-briefly}).
 
 @item @key{TAB}
-@kindex @key{TAB} @r{(Article)}
+@kindex TAB @r{(Article)}
 @findex gnus-article-next-button
 Go to the next button, if any (@code{gnus-article-next-button}).  This
 only makes sense if you have buttonizing turned on.
 
 @item M-@key{TAB}
-@kindex M-@key{TAB} @r{(Article)}
+@kindex M-TAB @r{(Article)}
 @findex gnus-article-prev-button
 Go to the previous button, if any (@code{gnus-article-prev-button}).
 
@@ -13233,7 +13233,7 @@ Edit a server (@code{gnus-server-edit-server}).
 Show the definition of a server (@code{gnus-server-show-server}).
 
 @item @key{SPC}
-@kindex @key{SPC} @r{(Server)}
+@kindex SPC @r{(Server)}
 @findex gnus-server-read-server
 Browse the current server (@code{gnus-server-read-server}).
 
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index e1a6eb66f5d..44a3831b1c4 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -935,7 +935,7 @@ IDL code.
 @cindex String splitting
 @cindex Splitting, of lines
 
-@kindex M-@key{RET}
+@kindex M-RET
 In IDL, a newline character terminates a statement unless preceded by a
 @samp{$}.  If you would like to start a continuation line, use
 @kbd{M-@key{RET}}, which calls the command @code{idlwave-split-line}.
@@ -1523,7 +1523,7 @@ The case-insensitive heading word in doclib headers to locate the
 @cindex Function name completion
 @cindex Procedure name completion
 
-@kindex M-@key{TAB}
+@kindex M-TAB
 @kindex C-c C-i
 IDLWAVE offers completion for class names, routine names, keywords,
 system variables, system variable tags, class structure tags, regular
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index c617468f57e..964a6c69120 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -311,9 +311,9 @@ You can tell that there is more that is not visible because you
 can see the text @samp{Top} rather than @samp{All} near the bottom of
 the screen.
 
-@kindex @key{SPC} @r{(Info mode)}
-@kindex @key{DEL} @r{(Info mode)}
-@kindex @key{BACKSPACE} @r{(Info mode)}
+@kindex SPC @r{(Info mode)}
+@kindex DEL @r{(Info mode)}
+@kindex BACKSPACE @r{(Info mode)}
 @findex Info-scroll-up
 @findex Info-scroll-down
   The @key{SPC}, @key{BACKSPACE} (or @key{DEL})@footnote{The key which
@@ -363,8 +363,8 @@ the menu, one by one.  Once you reach the end of a node, and have seen
 all of its subnodes, @key{SPC} takes you to the next node or to the
 parent's next node.
 
-@kindex @key{PAGEUP} @r{(Info mode)}
-@kindex @key{PAGEDOWN} @r{(Info mode)}
+@kindex PAGEUP @r{(Info mode)}
+@kindex PAGEDOWN @r{(Info mode)}
   Many keyboards nowadays have two scroll keys labeled @samp{PageUp}
 and @samp{PageDown} (or maybe @samp{Prior} and @samp{Next}).  If your
 keyboard has these keys, you can use them to move forward and backward
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index f49c91ef7bc..a1532bb614b 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1378,7 +1378,7 @@ Delete all text in the body of the message that is outside the region
 (@code{message-delete-not-region}).
 
 @item M-@key{RET}
-@kindex M-@key{RET}
+@kindex M-RET
 @findex message-newline-and-reformat
 Insert four newlines, and then reformat if inside quoted text.
 
@@ -1407,7 +1407,7 @@ Rename the buffer (@code{message-rename-buffer}).  If given a prefix,
 prompt for a new buffer name.
 
 @item @key{TAB}
-@kindex @key{TAB}
+@kindex TAB
 @findex message-tab
 @vindex message-tab-body-function
 If @code{message-tab-body-function} is non-@code{nil}, execute the
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index efb44e4b643..68d8b210ab9 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -442,7 +442,7 @@ either @code{customize-option} or @code{add-hook}.
 @cindex point
 @cindex region
 @kindex C-@@
-@kindex C-@key{SPC}
+@kindex C-SPC
 
 There are several other terms that are used in Emacs that you should
 know. The @dfn{point} is where the cursor currently is. You can save
@@ -461,8 +461,8 @@ filling paragraphs. A mark can be set with @kbd{C-@@} (or
 @cindex file completion
 @cindex folder completion
 @cindex minibuffer
-@kindex @key{SPC}
-@kindex @key{TAB}
+@kindex SPC
+@kindex TAB
 
 The @dfn{minibuffer} is the bottom line of the Emacs window, where all
 prompting and multiple-character input is directed. You can use
@@ -787,7 +787,7 @@ use @kbd{F r} to pull all your messages into MH-E.
 @end quotation
 @sp 1
 
-@kindex @key{RET}
+@kindex RET
 @kindex n
 @kindex p
 
@@ -817,8 +817,8 @@ This is a test message to get the wheels churning...
 @end cartouche
 @i{After incorporating new messages}
 
-@kindex @key{DEL}
-@kindex @key{SPC}
+@kindex DEL
+@kindex SPC
 
 If you typed a long message, you can view subsequent pages with
 @key{SPC} and previous pages with @key{DEL}.
@@ -827,7 +827,7 @@ If you typed a long message, you can view subsequent pages with
 @section Processing Mail
 
 @cindex processing mail
-@kindex @key{RET}
+@kindex RET
 @kindex r
 
 The first thing we want to do is reply to the message that we sent
@@ -880,7 +880,7 @@ Type C-c C-c to send message, C-c ? for help
 @kindex C-f
 @kindex C-n
 @kindex C-p
-@kindex @key{BS}
+@kindex BS
 
 By default, MH will not add you to the address list of your replies,
 so if you find that the @samp{To:} header field is missing, don't
@@ -895,7 +895,7 @@ editing your message, send it with @kbd{C-c C-c} as before.
 @cindex @command{refile}
 @cindex MH commands, @command{refile}
 @cindex folders
-@kindex @key{SPC}
+@kindex SPC
 @kindex o
 
 You'll often want to save messages that were sent to you in an
@@ -915,7 +915,7 @@ in a moment.
 @cindex modes, MH-Folder
 @kindex d
 @kindex i
-@kindex @key{RET}
+@kindex RET
 @kindex n
 @kindex p
 @kindex x
@@ -1586,7 +1586,7 @@ Display cheat sheet for the MH-E commands (@code{mh-help}).
 @c -------------------------
 @cindex @samp{Message > Show Message} menu item
 @cindex menu item, @samp{Message > Show Message}
-@kindex @key{RET}
+@kindex RET
 @findex mh-show
 @item @key{RET}
 Display message (@code{mh-show}).
@@ -1612,12 +1612,12 @@ Display message with the default preferred alternative
 Toggle the value of @code{mh-decode-mime-flag}
 (@code{mh-toggle-mh-decode-mime-flag}).
 @c -------------------------
-@kindex @key{SPC}
+@kindex SPC
 @findex mh-page-msg
 @item @key{SPC}
 Display next page in message (@code{mh-page-msg}).
 @c -------------------------
-@kindex @key{BS}
+@kindex BS
 @findex mh-previous-page
 @item @key{BS}
 Display previous page in message (@code{mh-previous-page}).
@@ -1655,12 +1655,12 @@ Delete range (@code{mh-delete-msg}).
 Display cheat sheet for the commands of the current prefix in
 minibuffer (@code{mh-prefix-help}).
 @c -------------------------
-@kindex D @key{SPC}
+@kindex D SPC
 @findex mh-page-digest
 @item D @key{SPC}
 Display next message in digest (@code{mh-page-digest}).
 @c -------------------------
-@kindex D @key{BS}
+@kindex D BS
 @findex mh-page-digest-backwards
 @item D @key{BS}
 Display previous message in digest (@code{mh-page-digest-backwards}).
@@ -1691,12 +1691,12 @@ Delete messages with same subject or thread
 Display cheat sheet for the commands of the current prefix in
 minibuffer (@code{mh-prefix-help}).
 @c -------------------------
-@kindex K @key{TAB}
+@kindex K TAB
 @findex mh-next-button
 @item K @key{TAB}
 Go to the next button (@code{mh-next-button}).
 @c -------------------------
-@kindex K S-@key{TAB}
+@kindex K S-TAB
 @findex mh-prev-button
 @item K S-@key{TAB}
 Go to the previous button (@code{mh-prev-button}).
@@ -1838,7 +1838,7 @@ Move point to mouse event and show message (@code{mh-show-mouse}).
 Within the MH-Show buffer, the following command is defined.
 
 @table @kbd
-@kindex @key{RET}
+@kindex RET
 @kindex mouse-1
 @kindex mouse-2
 @findex mh-press-button
@@ -2013,9 +2013,9 @@ detail in the following sections.
 @findex mh-show-mouse
 @kindex , @r{(comma)}
 @kindex . @r{(period)}
-@kindex @key{BS}
-@kindex @key{RET}
-@kindex @key{SPC}
+@kindex BS
+@kindex RET
+@kindex SPC
 @kindex mouse-2
 
 The command @key{RET} (@code{mh-show}) displays the message that the
@@ -2194,7 +2194,7 @@ highlighting of citations entirely, choose @samp{None}.
 @cindex highlighting email addresses
 @cindex links, following
 @findex goto-address-at-point
-@kindex C-c @key{RET}
+@kindex C-c RET
 @kindex mouse-2
 @vindex goto-address-highlight-p
 
@@ -2328,9 +2328,9 @@ Attachments in MH-E are indicated by @dfn{buttons} like this:
 @findex mh-next-button
 @findex mh-press-button
 @findex mh-prev-button
-@kindex @key{RET}
-@kindex K @key{TAB}
-@kindex K S-@key{TAB}
+@kindex RET
+@kindex K TAB
+@kindex K S-TAB
 @kindex mouse-1
 @kindex mouse-2
 
@@ -2682,10 +2682,10 @@ buffer, including HTML buffers.
 @cindex digests
 @findex mh-page-digest
 @findex mh-page-digest-backwards
-@kindex D @key{BS}
-@kindex D @key{SPC}
-@kindex @key{BS}
-@kindex @key{SPC}
+@kindex D BS
+@kindex D SPC
+@kindex BS
+@kindex SPC
 
 A digest is a message that contains other messages. Special MH-E
 commands let you read digests conveniently. You can use @key{SPC} and
@@ -2989,7 +2989,7 @@ like to change the initial default directory, customize the option
 directory for storing the content of these messages.
 
 @findex mh-store-buffer
-@kindex @key{RET}
+@kindex RET
 @kindex X s
 
 By the way, @kbd{X s} calls the Emacs Lisp function
@@ -3039,7 +3039,7 @@ message with @kbd{M-<} (@code{mh-first-msg}) and @kbd{M->}
 @findex previous-line
 @kindex C-n
 @kindex C-p
-@kindex @key{RET}
+@kindex RET
 
 You can also use the Emacs commands @kbd{C-p} (@code{previous-line})
 and @kbd{C-n} (@code{next-line}) to move up and down the scan lines in
@@ -3740,7 +3740,7 @@ The command @kbd{F p} runs @code{mh-pack-folder-hook} after
 renumbering the messages. A variable that is useful with this hook
 is @code{mh-current-folder}.
 
-@kindex @key{TAB}
+@kindex TAB
 @vindex mh-recursive-folders-flag
 
 By default, operations on folders work only one level at a time. Set
@@ -4381,12 +4381,12 @@ commands in addition to the normal Emacs editing commands to help you
 edit your draft. These can also be found in the @samp{Letter} menu.
 
 @table @kbd
-@kindex @key{SPC}
+@kindex SPC
 @findex mh-letter-complete-or-space
 @item @key{SPC}
 Perform completion or insert space (@code{mh-letter-complete-or-space}).
 @c -------------------------
-@kindex M-@key{TAB}
+@kindex M-TAB
 @findex mh-letter-complete
 @item M-@key{TAB}
 Perform completion on header field or word preceding point
@@ -4397,12 +4397,12 @@ Perform completion on header field or word preceding point
 @item , (comma)
 Flash alias expansion (@code{mh-letter-confirm-address}).
 @c -------------------------
-@kindex @key{TAB}
+@kindex TAB
 @findex mh-letter-next-header-field-or-indent
 @item @key{TAB}
 Cycle to next field (@code{mh-letter-next-header-field-or-indent}).
 @c -------------------------
-@kindex S-@key{TAB}
+@kindex S-TAB
 @findex mh-letter-previous-header-field
 @item S-@key{TAB}
 Cycle to the previous header field
@@ -4807,8 +4807,8 @@ draft. @xref{Folder Selection}.
 @findex indent-relative
 @findex mh-letter-next-header-field-or-indent
 @findex mh-letter-previous-header-field
-@kindex @key{TAB}
-@kindex S-@key{TAB}
+@kindex TAB
+@kindex S-TAB
 @vindex mh-compose-skipped-header-fields
 @vindex mh-letter-header-field
 
@@ -4834,8 +4834,8 @@ take point to the last field from anywhere in the body.
 @findex mh-letter-complete-or-space
 @findex mh-letter-confirm-address
 @kindex , @r{(comma)}
-@kindex @key{SPC}
-@kindex M-@key{TAB}
+@kindex SPC
+@kindex M-TAB
 @vindex mh-alias-flash-on-comma
 @vindex mh-compose-space-does-completion-flag
 @vindex mh-letter-complete-function
@@ -5714,12 +5714,12 @@ The following commands are available in MH-Letter mode with the
 exception of @code{mh-alias-reload} which can be called from anywhere.
 
 @table @kbd
-@kindex @key{SPC}
+@kindex SPC
 @findex mh-letter-complete-or-space
 @item @key{SPC}
 Perform completion or insert space (@code{mh-letter-complete-or-space}).
 @c -------------------------
-@kindex M-@key{TAB}
+@kindex M-TAB
 @findex mh-letter-complete
 @item M-@key{TAB}
 Perform completion on header field or word preceding point
@@ -5791,7 +5791,7 @@ Hook run by @code{mh-alias-reload} after loading aliases (default:
 You can use aliases when you are adding recipients to a message.
 
 @findex minibuffer-complete
-@kindex @key{TAB}
+@kindex TAB
 @vindex mh-alias-expand-aliases-flag
 @vindex mh-compose-prompt-flag
 
@@ -5805,8 +5805,8 @@ aliases to be expanded to their respective addresses in the draft.
 
 @findex mh-letter-complete
 @findex mh-letter-complete-or-space
-@kindex @key{SPC}
-@kindex M-@key{TAB}
+@kindex SPC
+@kindex M-TAB
 
 Otherwise, you can complete aliases in the header of the draft with
 @kbd{M-@key{TAB}} (@code{mh-letter-complete}) or @key{SPC}
@@ -6607,12 +6607,12 @@ Another few commands are available in the MH-Folder buffer resulting
 from a search.
 
 @table @kbd
-@kindex @key{TAB}
+@kindex TAB
 @findex mh-index-next-folder
 @item @key{TAB}
 Jump to the next folder marker (@code{mh-index-next-folder}).
 @c -------------------------
-@kindex S-@key{TAB}
+@kindex S-TAB
 @findex mh-index-previous-folder
 @item S-@key{TAB}
 Jump to the previous folder marker (@code{mh-index-previous-folder}).
@@ -6757,8 +6757,8 @@ method with the pick method by running the command @kbd{C-c C-p}
 @cindex @samp{+mhe-index}
 @findex mh-index-next-folder
 @findex mh-index-previous-folder
-@kindex @key{TAB}
-@kindex S-@key{TAB}
+@kindex TAB
+@kindex S-TAB
 @vindex mh-search-folder
 
 The messages that are found are put in a temporary sub-folder of
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index b94a96d8aa4..f7a28d38277 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -241,15 +241,15 @@ commands:
 @table @kbd
 @item M-@key{UP}
 @itemx M-@key{DOWN}
-@kindex M-@key{UP}
-@kindex M-@key{DOWN}
+@kindex M-UP
+@kindex M-DOWN
 @findex newsticker-group-shift-feed-up
 @findex newsticker-group-shift-feed-down
 Shift the currently selected feed up and down within its group.
 @item M-S-@key{UP}
 @itemx M-S-@key{DOWN}
-@kindex M-S-@key{UP}
-@kindex M-S-@key{DOWN}
+@kindex M-S-UP
+@kindex M-S-DOWN
 @findex newsticker-group-shift-group-up
 @findex newsticker-group-shift-group-down
 Shift the currently selected group up and down within its parent group.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index ac82254dc8b..eeace47dbed 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -1730,10 +1730,10 @@ one.
 @end table
 
 @table @kbd
-@kindex M-S-@key{RET}
+@kindex M-S-RET
 @item M-S-@key{RET}
 Insert a new item with a checkbox (@pxref{Checkboxes}).
-@kindex S-@key{DOWN}
+@kindex S-DOWN
 @item S-up
 @itemx S-down
 @cindex shift-selection-mode
@@ -1745,21 +1745,21 @@ cycle around items that way, you may customize
 @code{org-support-shift-select} is off.  If not, you can still use paragraph
 jumping commands like @kbd{C-@key{UP}} and @kbd{C-@key{DOWN}} to quite
 similar effect.
-@kindex M-@key{UP}
-@kindex M-@key{DOWN}
+@kindex M-UP
+@kindex M-DOWN
 @item M-up
 @itemx M-down
 Move the item including subitems up/down@footnote{See
 @code{org-list-use-circular-motion} for a cyclic behavior.} (swap with
 previous/next item of same indentation).  If the list is ordered, renumbering
 is automatic.
-@kindex M-@key{LEFT}
-@kindex M-@key{RIGHT}
+@kindex M-LEFT
+@kindex M-RIGHT
 @item M-left
 @itemx M-right
 Decrease/increase the indentation of an item, leaving children alone.
-@kindex M-S-@key{LEFT}
-@kindex M-S-@key{RIGHT}
+@kindex M-S-LEFT
+@kindex M-S-RIGHT
 @item M-S-@key{LEFT}
 @itemx M-S-@key{RIGHT}
 Decrease/increase the indentation of the item, including subitems.
@@ -1799,8 +1799,8 @@ its location).  @xref{Structure editing}, for a detailed explanation.
 Turn the whole plain list into a subtree of the current heading.  Checkboxes
 (@pxref{Checkboxes}) will become TODO (resp. DONE) keywords when unchecked
 (resp. checked).
-@kindex S-@key{LEFT}
-@kindex S-@key{RIGHT}
+@kindex S-LEFT
+@kindex S-RIGHT
 @item S-@key{LEFT}/@key{RIGHT}
 @vindex org-support-shift-select
 This command also cycles bullet styles when the cursor in on the bullet or
@@ -3014,10 +3014,10 @@ formula, @key{TAB} re-indents just like in Emacs Lisp mode.
 Complete Lisp symbols, just like in Emacs Lisp mode.@footnote{Many desktops
 intercept @kbd{M-@key{TAB}} to switch windows.  Use @kbd{C-M-i} or
 @kbd{@key{ESC} @key{TAB}} instead for completion (@pxref{Completion}).}
-@kindex S-@key{UP}
-@kindex S-@key{DOWN}
-@kindex S-@key{LEFT}
-@kindex S-@key{RIGHT}
+@kindex S-UP
+@kindex S-DOWN
+@kindex S-LEFT
+@kindex S-RIGHT
 @findex org-table-fedit-ref-up
 @findex org-table-fedit-ref-down
 @findex org-table-fedit-ref-left
@@ -4043,8 +4043,8 @@ completion; otherwise force cycling through TODO states with no prompt.  When
 @code{org-use-fast-todo-selection} is set to @code{prefix}, use the fast
 selection interface.
 
-@kindex S-@key{RIGHT}
-@kindex S-@key{LEFT}
+@kindex S-RIGHT
+@kindex S-LEFT
 @item S-@key{RIGHT} @ @r{/} @ S-@key{LEFT}
 @vindex org-treat-S-cursor-todo-selection-as-state-change
 Select the following/preceding TODO state, similar to cycling.  Useful
@@ -4192,8 +4192,8 @@ select the correct sequence.  Besides the obvious ways like typing a
 keyword or using completion, you may also apply the following commands:
 
 @table @kbd
-@kindex C-S-@key{RIGHT}
-@kindex C-S-@key{LEFT}
+@kindex C-S-RIGHT
+@kindex C-S-LEFT
 @kindex C-u C-u C-c C-t
 @item C-u C-u C-c C-t
 @itemx C-S-@key{RIGHT}
@@ -4203,8 +4203,8 @@ These keys jump from one TODO subset to the next.  In the above example,
 @code{DONE} to @code{REPORT}, and any of the words in the second row to
 @code{CANCELED}.  Note that the @kbd{C-S-} key binding conflict with
 @code{shift-selection-mode} (@pxref{Conflicts}).
-@kindex S-@key{RIGHT}
-@kindex S-@key{LEFT}
+@kindex S-RIGHT
+@kindex S-LEFT
 @item S-@key{RIGHT}
 @itemx S-@key{LEFT}
 @kbd{S-@key{LEFT}} and @kbd{S-@key{RIGHT}} and walk through @emph{all}
@@ -4271,7 +4271,7 @@ A setup for using several sets in parallel would be:
 @end example
 
 @cindex completion, of option keywords
-@kindex M-@key{TAB}
+@kindex M-TAB
 @noindent To make sure you are using the correct keyword, type
 @samp{#+} into the buffer and then use @kbd{M-@key{TAB}} completion.
 
@@ -4933,7 +4933,7 @@ can really speed up agenda generation.
 @cindex setting tags
 @cindex tags, setting
 
-@kindex M-@key{TAB}
+@kindex M-TAB
 Tags can simply be typed into the buffer at the end of a headline.
 After a colon, @kbd{M-@key{TAB}} offers completion on tags.  There is
 also a special command for inserting tags:
@@ -5064,17 +5064,17 @@ will turn off any other tags from that group.
 In this interface, you can also use the following special keys:
 
 @table @kbd
-@kindex @key{TAB}
+@kindex TAB
 @item @key{TAB}
 Enter a tag in the minibuffer, even if the tag is not in the predefined
 list.  You will be able to complete on all tags present in the buffer.
 You can also add several tags: just separate them with a comma.
 
-@kindex @key{SPC}
+@kindex SPC
 @item @key{SPC}
 Clear all tags for this line.
 
-@kindex @key{RET}
+@kindex RET
 @item @key{RET}
 Accept the modified set.
 
@@ -5727,8 +5727,8 @@ Exit column view.
 @tsubheading{Editing values}
 @item @key{LEFT} @key{RIGHT} @key{UP} @key{DOWN}
 Move through the column view from field to field.
-@kindex S-@key{LEFT}
-@kindex S-@key{RIGHT}
+@kindex S-LEFT
+@kindex S-RIGHT
 @item  S-@key{LEFT}/@key{RIGHT}
 Switch to the next/previous allowed value of the field.  For this, you
 have to have specified allowed values for a property.
@@ -6138,15 +6138,15 @@ from the minibuffer:
 @kindex M-v
 @kindex C-v
 @kindex mouse-1
-@kindex S-@key{RIGHT}
-@kindex S-@key{LEFT}
-@kindex S-@key{DOWN}
-@kindex S-@key{UP}
-@kindex M-S-@key{RIGHT}
-@kindex M-S-@key{LEFT}
-@kindex @key{RET}
-@kindex M-S-@key{DOWN}
-@kindex M-S-@key{UP}
+@kindex S-RIGHT
+@kindex S-LEFT
+@kindex S-DOWN
+@kindex S-UP
+@kindex M-S-RIGHT
+@kindex M-S-LEFT
+@kindex RET
+@kindex M-S-DOWN
+@kindex M-S-UP
 
 @example
 @key{RET}              @r{Choose date at cursor in calendar.}
@@ -10427,7 +10427,7 @@ details see the documentation of CD@LaTeX{} mode):
 @item
 Environment templates can be inserted with @kbd{C-c @{}.
 @item
-@kindex @key{TAB}
+@kindex TAB
 The @key{TAB} key will do template expansion if the cursor is inside a
 @LaTeX{} fragment@footnote{Org mode has a method to test if the cursor is
 inside such a fragment, see the documentation of the function
@@ -17127,9 +17127,9 @@ Active key bindings in code blocks:
 @item @kbd{C-c C-c} @tab @code{org-babel-execute-src-block}
 @kindex C-c C-o
 @item @kbd{C-c C-o} @tab @code{org-babel-open-src-block-result}
-@kindex M-@key{UP}
+@kindex M-UP
 @item @kbd{M-@key{UP}}    @tab @code{org-babel-load-in-session}
-@kindex M-@key{DOWN}
+@kindex M-DOWN
 @item @kbd{M-@key{DOWN}}  @tab @code{org-babel-switch-to-session}
 @end multitable
 
@@ -17286,7 +17286,7 @@ is involved.  Such mode-specific hot keys have become an integral part of
 Emacs and Org provides several shortcuts.
 
 @table @kbd
-@kindex M-@key{TAB}
+@kindex M-TAB
 @item M-@key{TAB}
 Complete word at point
 @itemize @bullet
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 32c6a524870..1163530e7a2 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -677,7 +677,7 @@ put in @samp{cvs-status-mode}.
 @cindex Movement Commands
 @findex cvs-mode-next-line
 @findex cvs-mode-previous-line
-@kindex @key{SPC}@r{--Move down one file}
+@kindex SPC@r{--Move down one file}
 @kindex n@r{--Move down one file}
 @kindex p@r{--Move up one file}
 
@@ -705,8 +705,8 @@ This key moves one file backward, towards the beginning of the buffer
 @kindex m@r{--marking a file}
 @kindex M@r{--marking all files}
 @kindex u@r{--unmark a file}
-@kindex @key{ESC} @key{DEL}@r{--unmark all files}
-@kindex @key{DEL}@r{--unmark previous file}
+@kindex ESC DEL@r{--unmark all files}
+@kindex DEL@r{--unmark previous file}
 @kindex %@r{--mark files matching regexp}
 @kindex S@r{--mark files in a particular state}
 @kindex T@r{--toggle marks}
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index dc715e5d68a..2437e020eee 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -154,7 +154,7 @@ deego: fsbot rules!
 
 @cindex nick completion
 @cindex completion of nicks
-@kindex @key{TAB}
+@kindex TAB
 Since this is so common, you can use @key{TAB} to do nick completion.
 
 @node Getting started with rcirc
@@ -215,7 +215,7 @@ When you have answered these questions, @code{rcirc} will create a server
 buffer, which will be named something like @file{*irc.freenode.net*},
 and a channel buffer for each of the channels you wanted to join.
 
-@kindex @key{RET}
+@kindex RET
 @cindex talking
 @cindex communicating
 To talk in a channel, just type what you want to say in a channel
@@ -378,7 +378,7 @@ network.  A new buffer will be created for this conversation.  It works
 like a channel with only two members.  (Also @code{/query fsbot}.)
 
 @item C-c @key{RET}
-@kindex C-c @key{RET}
+@kindex C-c RET
 @cindex /msg
 @cindex single message
 @cindex message sending
@@ -617,7 +617,7 @@ daunting task.  This chapters tells you how @code{rcirc} can help.
 @cindex modeline
 
 @comment This section copied to the Getting started with rcirc section
-@kindex C-c C-@key{SPC}
+@kindex C-c C-SPC
 @vindex rcirc-track-minor-mode
 @cindex switching channels
 @cindex tracking activity
@@ -663,7 +663,7 @@ Low priority channels have the modeline indicator ``LowPri''.
 @kbd{C-c C-@key{SPC}} will not switch to low priority channels unless
 you use the @kbd{C-u} prefix.
 
-@kindex C-c @key{TAB}
+@kindex C-c TAB
 @cindex ignored channels
 If you prefer a channel to never show up in the modeline, then you
 have to ignore it.  Use @kbd{C-c @key{TAB}} to ignore the current
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 55060d09b8c..3803cb0eb7a 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -3335,7 +3335,7 @@ have to rescan the buffer in order to see it.
 @findex reftex-arg-index
 @findex TeX-arg-index@r{, AUCTeX function}
 @findex TeX-insert-macro@r{, AUCTeX function}
-@kindex C-c @key{RET}
+@kindex C-c RET
 @b{@RefTeX{} supplies macro arguments}@* When you insert a macro
 interactively with @kbd{C-c @key{RET}}, @AUCTeX{} normally prompts for
 macro arguments.  Internally, it uses the functions
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 9faa8fea747..03ca842cd07 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -685,7 +685,7 @@ Set the preferred reference header (i.e.,
 @code{sc-preferred-header-style}) to the currently displayed header.
 
 @item @code{sc-eref-exit} (@kbd{C-j}, @key{RET}, and @key{ESC C-c})
-@kindex @key{RET}
+@kindex RET
 @kindex C-j
 @kindex q
 @findex sc-eref-exit
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 2875b163ee9..37bb707f63a 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -124,7 +124,7 @@ bindings to manage Sieve scripts remotely. @xref{Managing Sieve}.
 @table @kbd
 
 @item C-c RET
-@kindex C-c @key{RET}
+@kindex C-c RET
 @findex sieve-manage
 @cindex manage remote sieve script
 Open a connection to a remote server using the Managesieve protocol.
@@ -190,7 +190,7 @@ Remove currently highlighted script.
 @item RET
 @item mouse-2
 @item f
-@kindex @key{RET}
+@kindex RET
 @kindex mouse-2
 @kindex f
 @findex sieve-edit-script
diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi
index 5aad1c2ffe8..c061fb8e43e 100644
--- a/doc/misc/vhdl-mode.texi
+++ b/doc/misc/vhdl-mode.texi
@@ -271,7 +271,7 @@ example again.
 @end group
 @end example
 
-@kindex @key{TAB}
+@kindex TAB
 Let's say point is on line 3 and we hit the @key{TAB} key to re-indent
 the line.  Remember that the syntactic component list for that
 line is:
@@ -822,11 +822,11 @@ symbol currently recognized}
 @cindex   Frequently Asked Questions
 
 @kindex C-x h
-@kindex @key{ESC} C-\
-@kindex @key{ESC} C-q
-@kindex @key{ESC} C-u
-@kindex @key{RET}
-@kindex @key{LFD}
+@kindex ESC C-\
+@kindex ESC C-q
+@kindex ESC C-u
+@kindex RET
+@kindex LFD
 @findex newline-and-indent
 @quotation
 
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index aa55130e0e0..5efd6ed684e 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -289,7 +289,7 @@ its content while you are in insert mode.
 
 @table @kbd
 @item @key{ESC}
-@kindex 033 @key{ESC} @r{(}@code{vip-change-mode-to-vi}@r{) (insert mode)}
+@kindex 033 ESC @r{(}@code{vip-change-mode-to-vi}@r{) (insert mode)}
 This key will take you back to vi mode.
 @item C-h
 @kindex 010 C-h @r{(}@code{vip-delete-backward-char}@r{) (insert mode)}
@@ -373,7 +373,7 @@ the buffer as in Vi.  You can change this by rebinding the variable
 @subsection z Command
 
 @kindex 1723 z H @r{(}@code{vip-line-to-top}@r{)}
-@kindex 1721 z @key{RET} @r{(}@code{vip-line-to-top}@r{)}
+@kindex 1721 z RET @r{(}@code{vip-line-to-top}@r{)}
 @kindex 1723 z M @r{(}@code{vip-line-to-middle}@r{)}
 @kindex 1722 z . @r{(}@code{vip-line-to-middle}@r{)}
 @kindex 1723 z L @r{(}@code{vip-line-to-bottom}@r{)}
@@ -471,7 +471,7 @@ Forward incremental search.
 @itemx @key{ESC}
 @kindex 003 C-c @r{(}@code{vip-ctl-c}@r{)}
 @kindex 0300 C-x @r{(}@code{vip-ctl-x}@r{)}
-@kindex 033 @key{ESC} @r{(}@code{vip-ESC}@r{)}
+@kindex 033 ESC @r{(}@code{vip-ESC}@r{)}
 These keys will exit from vi mode and return to emacs mode temporarily.  If
 you hit one of these keys, Emacs will be in emacs mode and will believe
 that you hit that key in emacs mode. For example, if you hit @kbd{C-x}
@@ -555,8 +555,8 @@ the current buffer.  Here, @kbd{g} will do that, and @kbd{C-g} is
 used to abort a command (this is for compatibility with emacs mode.)
 @item SPC
 @itemx @key{RET}
-@kindex 040 @key{SPC} @r{(}@code{vip-scroll}@r{)}
-@kindex 015 @key{RET} @r{(}@code{vip-scroll-back}@r{)}
+@kindex 040 SPC @r{(}@code{vip-scroll}@r{)}
+@kindex 015 RET @r{(}@code{vip-scroll-back}@r{)}
 Now these keys will scroll up and down the text of current window.
 Convenient for viewing the text.
 @item s
@@ -756,7 +756,7 @@ accessed from vi mode as easily as from emacs mode.
 @itemx @key{ESC}
 @kindex 003 C-c @r{(}@code{vip-ctl-c}@r{)}
 @kindex 0300 C-x @r{(}@code{vip-ctl-x}@r{)}
-@kindex 033 @key{ESC} @r{(}@code{vip-ESC}@r{)}
+@kindex 033 ESC @r{(}@code{vip-ESC}@r{)}
 Typing one of these keys have the same effect as typing it in emacs mode.
 Appropriate command will be executed according as the keys you type after
 it.  You will be in vi mode again after the execution of the command.
@@ -940,13 +940,13 @@ buffer.
 @table @kbd
 @item @key{SPC}
 @itemx C-f
-@kindex 040 @key{SPC} @r{(}@code{vip-scroll}@r{)}
+@kindex 040 SPC @r{(}@code{vip-scroll}@r{)}
 @kindex 006 C-f @r{(}@code{vip-scroll-back}@r{)}
 Scroll text of current window upward almost full screen.  You can go
 @i{forward} in the buffer by this command (@code{vip-scroll}).
 @item @key{RET}
 @itemx C-b
-@kindex 015 @key{RET} @r{(}@code{vip-scroll-back}@r{)}
+@kindex 015 RET @r{(}@code{vip-scroll-back}@r{)}
 @kindex 002 C-b @r{(}@code{vip-scroll-back}@r{)}
 Scroll text of current window downward almost full screen.  You can go
 @i{backward} in the buffer by this command (@code{vip-scroll-back}).
@@ -975,7 +975,7 @@ The following commands reposition point in the window.
 @item z H
 @itemx z @key{RET}
 @kindex 1723 z H @r{(}@code{vip-line-to-top}@r{)}
-@kindex 1721 z @key{RET} @r{(}@code{vip-line-to-top}@r{)}
+@kindex 1721 z RET @r{(}@code{vip-line-to-top}@r{)}
 Put point on the top (@i{home}) line in the window.  So the current line
 becomes the top line in the window.  Given a count @var{n}, point will be
 placed in the @var{n}-th line from top (@code{vip-line-to-top}).
@@ -1368,7 +1368,7 @@ Delete to the end of a line (@code{vip-kill-line}).
 Delete a character after point.  Given @var{n}, delete @var{n} characters
 (@code{vip-delete-char}).
 @item @key{DEL}
-@kindex 177 @key{DEL} @r{(}@code{vip-delete-backward-char}@r{)}
+@kindex 177 DEL @r{(}@code{vip-delete-backward-char}@r{)}
 Delete a character before point.  Given @var{n}, delete @var{n} characters
 (@code{vip-delete-backward-char}).
 @end table
@@ -1570,7 +1570,7 @@ keymap.  See GNU Emacs Manual for details.
 @kindex 000 C-@@ @r{(}@code{set-mark-command}@r{)}
 Set mark and push previous mark on mark ring (@code{set-mark-command}).
 @item TAB
-@kindex 011 @key{TAB} @r{(}@code{indent-for-tab-command}@r{)}
+@kindex 011 TAB @r{(}@code{indent-for-tab-command}@r{)}
 Indent line for current major mode (@code{indent-for-tab-command}).
 @item C-j
 @kindex 012 C-j @r{(}@code{electric-newline-and-maybe-indent}@r{)}
@@ -1656,7 +1656,7 @@ differently from emacs mode.
 
 @table @kbd
 @item @key{ESC}
-@kindex 033 @key{ESC} @r{(}@code{vip-change-mode-to-vi}@r{) (insert mode)}
+@kindex 033 ESC @r{(}@code{vip-change-mode-to-vi}@r{) (insert mode)}
 This key will take you back to vi mode (@code{vip-change-mode-to-vi}).
 @item C-h
 @kindex 010 C-h @r{(}@code{delete-backward-char}@r{) (insert mode)}
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 366d576da2e..e1c45fb40e2 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -369,7 +369,7 @@ toggles Viperization of Emacs on and off.
 @section States in Viper
 
 @kindex C-z
-@kindex @key{ESC}
+@kindex ESC
 @kindex i
 @cindex Emacs state
 @cindex Vi state
@@ -2671,8 +2671,8 @@ purpose of mouse search and mouse insert.  By default, this is set to
 @end table
 @kindex S-mouse-1
 @kindex S-mouse-2
-@kindex @key{META} @key{SHIFT} button1up
-@kindex @key{META} @key{SHIFT} button2up
+@kindex META SHIFT button1up
+@kindex META SHIFT button2up
 @vindex viper-multiclick-timeout
 @findex viper-mouse-click-insert-word
 @findex viper-mouse-click-search-word
@@ -3423,14 +3423,14 @@ in your Viper customization file.
 @kindex f<char>
 @kindex |
 @kindex 0
-@kindex @key{CR}
+@kindex CR
 @kindex +
 @kindex -
 @kindex ^
 @kindex $
 @kindex C-p
-@kindex @key{LF}
-@kindex @key{SPC}
+@kindex LF
+@kindex SPC
 @kindex C-n
 @kindex C-h
 @kindex h
@@ -4447,8 +4447,8 @@ already bound to something else.
 @end table
 @kindex S-mouse-1
 @kindex S-mouse-2
-@kindex @key{META} button1up
-@kindex @key{META} button2up
+@kindex META button1up
+@kindex META button2up
 
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 07dd55e6043..f8ddbd2aff6 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -625,14 +625,14 @@ the @code{man} key bindings.
 
 @table @kbd
 @item @key{SPC}
-@kindex @key{SPC}
+@kindex SPC
 @findex scroll-up
 Scroll the man page up the window (@code{scroll-up}).
 
 @item @key{DEL}
 @itemx @kbd{S-@key{SPC}}
-@kindex @key{DEL}
-@kindex S-@key{SPC}
+@kindex DEL
+@kindex S-SPC
 @findex scroll-down
 Scroll the man page down the window (@code{scroll-down}).
 
@@ -690,7 +690,7 @@ word must be mouse-highlighted unless @code{woman-mouse-2} is used with
 the Meta key.
 
 @item @key{RET}
-@kindex @key{RET}
+@kindex RET
 @findex man-follow
 Get the man page for the topic under (or nearest to) point
 (@code{man-follow}).