Fix @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/lispref/files.texi:
* doc/misc/calc.texi:
* doc/misc/cc-mode.texi:
* doc/misc/ediff.texi:
* doc/misc/epa.texi:
* doc/misc/ert.texi:
* doc/misc/eww.texi:
* doc/misc/forms.texi:
* doc/misc/gnus.texi:
* doc/misc/info.texi:
* doc/misc/mairix-el.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/sc.texi:
* doc/misc/sieve.texi:
* doc/misc/vhdl-mode.texi:
* doc/misc/vip.texi:
* doc/misc/viper.texi:
* doc/misc/woman.texi: Fix @kindex entries.  Mark keys consistently.

52 files changed, 1584 insertions, 1633 deletions

diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index aa91f0555e1..cc689af6d2d 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 RET
+@kindex @key{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 RIGHT
+@kindex @key{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 LEFT
+@kindex @key{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 DOWN
+@kindex @key{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 UP
+@kindex @key{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 HOME key
+@kindex @key{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 END key
+@kindex @key{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-RIGHT
-@kindex M-RIGHT
+@kindex C-@key{RIGHT}
+@kindex M-@key{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-LEFT
-@kindex M-LEFT
+@kindex C-@key{LEFT}
+@kindex M-@key{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
@@ -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 TAB
+@kindex M-g @key{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 f8c1856058a..2f0bb9740d3 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 LEFT
-@kindex C-x RIGHT
+@kindex C-x @key{LEFT}
+@kindex C-x @key{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 DEL @r{(Buffer Menu)}
+@kindex @key{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-DEL @r{(Buffer Menu)}
+@kindex M-@key{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 RET @r{(Buffer Menu)}
+@kindex @key{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 7f86470ad4d..52a42a196a8 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 TAB @r{(GUD)}
+@kindex @key{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 SPC @r{(GDB Breakpoints buffer)}
+@kindex @key{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 RET @r{(GDB Breakpoints buffer)}
+@kindex @key{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 RET @r{(GDB speedbar)}
+@kindex @key{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}
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index c6a84b5ab12..98089fd20fb 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 SPC @r{(Calendar mode)}
+@kindex @key{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 9ba7e211013..da8f6f76a82 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 TAB @r{(customization buffer)}
-@kindex S-TAB @r{(customization buffer)}
+@kindex @key{TAB} @r{(customization buffer)}
+@kindex @key{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-TAB @r{(customization buffer)}
+@kindex M-@key{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 15c9cb56878..2c2d9dded20 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 SPC @r{(Dired)}
+@kindex @key{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 DEL @r{(Dired)}
+@kindex @key{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 RET @r{(Dired)}
+@kindex @key{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 * DEL @r{(Dired)}
+@kindex * @key{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-DEL @r{(Dired)}
+@kindex M-@key{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 42b07cc0fe3..e86c3e8fc99 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 next
-@kindex prior
-@kindex PageDown
-@kindex PageUp
+@kindex @key{next}
+@kindex @key{prior}
+@kindex @key{PageDown}
+@kindex @key{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 SPC @r{(View mode)}
-@kindex DEL @r{(View mode)}
+@kindex @key{SPC} @r{(View mode)}
+@kindex @key{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 d7ca1e91611..9c2a922bfc0 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-TAB
+@kindex C-@key{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 6f19576bb6a..4eb44ba96b4 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -479,14 +479,14 @@ cycles through all the frames on your terminal.
 @findex delete-other-frames
 Delete all frames on the current terminal, except the selected one.
 
-@item M-<F10>
-@kindex M-<F10>
+@item M-@key{F10}
+@kindex M-@key{F10}
 @findex toggle-frame-maximized
 Toggle the maximization state of the current frame.  When a frame is
 maximized, it fills the screen.
 
-@item <F11>
-@kindex <F11>
+@item @key{F11>}
+@kindex @key{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 e005fe358da..4abd267276e 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -4,12 +4,11 @@
 @c See file emacs.texi for copying conditions.
 @node Help
 @chapter Help
-@kindex Help
 @cindex help
 @cindex self-documentation
 @findex help-command
 @kindex C-h
-@kindex F1
+@kindex @key{F1}
 
 @kindex C-h C-h
 @findex help-for-help
@@ -432,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 RET @r{(Help mode)}
+@kindex @key{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)}
@@ -456,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 TAB @r{(Help mode)}
+@kindex @key{TAB} @r{(Help mode)}
 @findex forward-button
-@kindex S-TAB @r{(Help mode)}
+@kindex S-@key{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 b38e85819ce..eae334449ce 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 TAB @r{(indentation)}
+@kindex @key{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 TAB
+@kindex C-x @key{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 4118b752e62..7b89dce4e6f 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-SPC
+@kindex M-@key{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 8528c9f6bd5..83fe1979e0c 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 F3
-@kindex F4
+@kindex @key{F3}
+@kindex @key{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 RET
+@kindex C-x C-k @key{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 SPC
+@kindex C-x C-k @key{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 0ffa9f74ac6..20cc67a1e79 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-SPC
+@kindex C-@key{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-SPC C-SPC
+@kindex C-@key{SPC} C-@key{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-SPC
+@kindex C-u C-@key{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-SPC
+@kindex C-x C-@key{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-SPC C-SPC@r{, disabling Transient Mark}
+@kindex C-@key{SPC} C-@key{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 579697f47bd..2a77b840e16 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -266,7 +266,7 @@ Completion}.
 @node Completion Example
 @subsection Completion Example
 
-@kindex TAB @r{(completion example)}
+@kindex @key{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 TAB @r{(completion)}
+@kindex @key{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 SPC @r{(completion)}
+@kindex @key{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 RET @r{(completion in minibuffer)}
+@kindex @key{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 UP @r{(minibuffer history)}
-@kindex DOWN @r{(minibuffer history)}
+@kindex @key{UP} @r{(minibuffer history)}
+@kindex @key{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 ESC ESC
+@kindex C-x @key{ESC} @key{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 e1b8070f432..7f2a0a11071 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 SPC @r{(Gnus Group mode)}
+@kindex @key{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 DEL @r{(Gnus Group mode)}
+@kindex @key{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 SPC @r{(Gnus Summary mode)}
+@kindex @key{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 DEL @r{(Gnus Summary mode)}
+@kindex @key{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 SPC @r{(DocView mode)}
-@kindex DEL @r{(DocView mode)}
+@kindex @key{SPC} @r{(DocView mode)}
+@kindex @key{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 RET @r{(Shell mode)}
+@kindex @key{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 TAB @r{(Shell mode)}
+@kindex @key{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 RET @r{(Shell mode)}
+@kindex C-c @key{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 RET @r{(Goto Address mode)}
+@kindex C-c @key{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 2bbc17b26db..fd8f0110a3f 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 TAB @r{(and major modes)}
-@kindex DEL @r{(and major modes)}
+@kindex @key{TAB} @r{(and major modes)}
+@kindex @key{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 INSERT
+@kindex @key{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 406ebd19051..94e4161c158 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 DEL @r{(MS-DOS)}
-@kindex BS @r{(MS-DOS)}
+@kindex @key{DEL} @r{(MS-DOS)}
+@kindex @key{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-Break @r{(MS-DOS)}
+@kindex C-@key{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 b3ec11d4fd5..9af0edaa124 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-TAB@r{, (MS-Windows)}
+@kindex M-@key{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,8 +693,8 @@ its normal effect: for example, @kbd{@key{Lwindow}} opens the
 @code{Start} menu, etc.
 
 @vindex w32-recognize-altgr
-@kindex AltGr @r{(MS-Windows)}
-@cindex AltGr key (MS-Windows)
+@kindex @key{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,
 the combination of the right @key{Alt} and left @key{Ctrl} keys
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index dc80bc92172..487285f8d3e 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 RET
+@kindex C-x @key{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 RET C-\
+@kindex C-x @key{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 RET f
+@kindex C-x @key{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 RET c
+@kindex C-x @key{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 RET r
+@kindex C-x @key{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 RET x
-@kindex C-x RET X
+@kindex C-x @key{RET} x
+@kindex C-x @key{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 RET p
+@kindex C-x @key{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 RET F
+@kindex C-x @key{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 RET t
+@kindex C-x @key{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 RET k
+@kindex C-x @key{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 RIGHT@r{, and bidirectional text}
-@kindex LEFT@r{, and bidirectional text}
+@kindex @key{RIGHT}@r{, and bidirectional text}
+@kindex @key{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 39c353b0ff1..35387a07b05 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-TAB @r{(Picture mode)}
+@kindex M-@key{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 TAB @r{(Picture mode)}
+@kindex C-c @key{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 b6bd173e4d9..76a7b896454 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 DEL @r{(programming modes)}
+@kindex @key{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 TAB @r{(programming modes)}
+@kindex @key{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 TAB
+@kindex C-u @key{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-SPC
+@kindex C-M-@key{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
@@ -1043,7 +1043,7 @@ effect as @kbd{C-u M-;} by typing @kbd{M-x comment-kill}
 (@code{comment-dwim} actually calls @code{comment-kill} as a
 subroutine when it is given a prefix argument).
 
-@kindex C-c C-c (C mode)
+@kindex C-c C-c @r{(C mode)}
 @findex comment-region
 @findex uncomment-region
   The command @kbd{M-x comment-region} is equivalent to calling
@@ -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-TAB
+@kindex M-@key{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 , SPC
+@kindex C-c , @key{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}}
@@ -1660,7 +1660,7 @@ behind.  A prefix argument acts as a repeat count.  With a negative
 argument, move backward.
 
 @item M-a
-@kindex M-a (C mode)
+@kindex M-a @r{(C mode)}
 @findex c-beginning-of-statement
 Move point to the beginning of the innermost C statement
 (@code{c-beginning-of-statement}).  If point is already at the beginning
@@ -1671,7 +1671,7 @@ In comments or in strings which span more than one line, this command
 moves by sentences instead of statements.
 
 @item M-e
-@kindex M-e (C mode)
+@kindex M-e @r{(C mode)}
 @findex c-end-of-statement
 Move point to the end of the innermost C statement or sentence; like
 @kbd{M-a} except that it moves in the other direction
@@ -1736,17 +1736,17 @@ preprocessor commands.
 @item C-c C-@key{DEL}
 @itemx C-c @key{DEL}
 @findex c-hungry-delete-backwards
-@kindex C-c C-DEL (C Mode)
-@kindex C-c DEL (C Mode)
+@kindex C-c C-@key{DEL} @r{(C Mode)}
+@kindex C-c @key{DEL} @r{(C Mode)}
 Delete the entire block of whitespace preceding point (@code{c-hungry-delete-backwards}).
 
 @item C-c C-d
 @itemx C-c C-@key{Delete}
 @itemx C-c @key{Delete}
 @findex c-hungry-delete-forward
-@kindex C-c C-d (C Mode)
-@kindex C-c C-Delete (C Mode)
-@kindex C-c Delete (C Mode)
+@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)}
 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 8ff36ca554d..37a69347f44 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 SPC
+@kindex C-x r @key{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 e9371f39a96..15d66a3840b 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 SPC @r{(Rmail)}
-@kindex DEL @r{(Rmail)}
-@kindex S-SPC @r{(Rmail)}
+@kindex @key{SPC} @r{(Rmail)}
+@kindex @key{DEL} @r{(Rmail)}
+@kindex S-@key{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 19a4a9e4b6c..674d1165d80 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 F10
+@kindex @key{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 723bdf1ad8c..7ca73f9b6d1 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-TAB @r{(Incremental search)}
+@kindex M-@key{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 SPC @r{(Incremental search)}
-@kindex SPC @r{(Incremental search)}
+@kindex M-s @key{SPC} @r{(Incremental search)}
+@kindex @key{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 SPC @r{(query-replace)}
-@kindex DEL @r{(query-replace)}
+@kindex @key{SPC} @r{(query-replace)}
+@kindex @key{DEL} @r{(query-replace)}
 @kindex , @r{(query-replace)}
-@kindex RET @r{(query-replace)}
+@kindex @key{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 RET @r{(Occur mode)}
+@kindex @key{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 b7bdd69c7c2..c7cc005a21c 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 TAB @r{(Message mode)}
+@kindex @key{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 9ee31ab466a..2170e8648b0 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-DEL
+@kindex M-@key{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 DEL
+@kindex C-x @key{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 TAB @r{(Text mode)}
+@kindex @key{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-TAB @r{(Text mode)}
+@kindex M-@key{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 TAB @r{(Org Mode)}
+@kindex @key{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,26 +1363,26 @@ 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-TAB @r{(Org Mode)}
+@kindex S-@key{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-<up> @r{(Org Mode)}
-@kindex M-<down> @r{(Org Mode)}
-@kindex M-<left> @r{(Org Mode)}
-@kindex M-<right> @r{(Org Mode)}
+@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)}
 @findex org-metaup
 @findex org-metadown
 @findex org-metaleft
 @findex org-metaright
   You can move an entire entry up or down in the buffer, including its
-body lines and subtree (if any), by typing @kbd{M-<up>}
-(@code{org-metaup}) or @kbd{M-<down>} (@code{org-metadown}) on the
+body lines and subtree (if any), by typing @kbd{M-@key{UP}}
+(@code{org-metaup}) or @kbd{M-@key{DOWN}} (@code{org-metadown}) on the
 heading line.  Similarly, you can promote or demote a heading line
-with @kbd{M-<left>} (@code{org-metaleft}) and @kbd{M-<right>}
+with @kbd{M-@key{LEFT}} (@code{org-metaleft}) and @kbd{M-@key{RIGHT}}
 (@code{org-metaright}).  These commands execute their global bindings
 if invoked on a body line.
 
@@ -1852,7 +1852,7 @@ in a local variable list in each of the subfiles.  @xref{File
 Variables}.
 
 @findex tex-bibtex-file
-@kindex C-c TAB @r{(@TeX{} mode)}
+@kindex C-c @key{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 TAB @r{(SGML mode)}
+@kindex C-c @key{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 TAB @r{(Enriched mode)}
+@kindex C-x @key{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 F2 2
+@kindex @key{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 F2 s
+@kindex @key{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 F2 b
+@kindex @key{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 F2 RET
-@kindex C-x 6 RET
+@kindex @key{F2} @key{RET}
+@kindex C-x 6 @key{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 F2 1
+@kindex @key{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 F2 d
+@kindex @key{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 c0dc3d472e3..1b81797f0d4 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 ESC ESC ESC
+@kindex @key{ESC} @key{ESC} @key{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/lispref/files.texi b/doc/lispref/files.texi
index 5a8eeddcf6b..e2eaa03f68f 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -3267,7 +3267,7 @@ shown above; the details are crucial for proper behavior in the case of
 multiple handlers, and for operations that have two file names that may
 each have handlers.
 
-@kindex safe-magic (@r{property})
+@kindex safe-magic @r{(property)}
   Handlers that don't really do anything special for actual access to the
 file---such as the ones that implement completion of host names for
 remote file names---should have a non-@code{nil} @code{safe-magic}
@@ -3277,7 +3277,7 @@ file names, by prefixing them with @samp{/:}.  But if the handler that
 would be used for them has a non-@code{nil} @code{safe-magic}
 property, the @samp{/:} is not added.
 
-@kindex operations (@r{property})
+@kindex operations @r{(property)}
   A file name handler can have an @code{operations} property to
 declare which operations it handles in a nontrivial way.  If this
 property has a non-@code{nil} value, it should be a list of
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index a4a091f243a..a29097cfda9 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -10906,27 +10906,27 @@ degrees, minutes, and seconds.
 @ignore
 @mindex @null
 @end ignore
-@kindex ' (HMS forms)
+@kindex ' @r{(HMS forms)}
 @ignore
 @mindex @null
 @end ignore
-@kindex " (HMS forms)
+@kindex " @r{(HMS forms)}
 @ignore
 @mindex @null
 @end ignore
-@kindex h (HMS forms)
+@kindex h @r{(HMS forms)}
 @ignore
 @mindex @null
 @end ignore
-@kindex o (HMS forms)
+@kindex o @r{(HMS forms)}
 @ignore
 @mindex @null
 @end ignore
-@kindex m (HMS forms)
+@kindex m @r{(HMS forms)}
 @ignore
 @mindex @null
 @end ignore
-@kindex s (HMS forms)
+@kindex s @r{(HMS forms)}
 The default format for HMS values is
 @samp{@var{hours}@@ @var{mins}' @var{secs}"}.  During entry, the letters
 @samp{h} (for ``hours'') or
@@ -11125,7 +11125,7 @@ integers but this is not required.
 @ignore
 @mindex M
 @end ignore
-@kindex M (modulo forms)
+@kindex M @r{(modulo forms)}
 @ignore
 @mindex mod
 @end ignore
@@ -11280,7 +11280,7 @@ would indeed have been negligible.
 @ignore
 @mindex p
 @end ignore
-@kindex p (error forms)
+@kindex p @r{(error forms)}
 @tindex +/-
 To enter an error form during regular numeric entry, use the @kbd{p}
 (``plus-or-minus'') key to type the @samp{+/-} symbol.  (If you try actually
@@ -16682,8 +16682,8 @@ or matrix argument, these functions operate element-wise.
 @ignore
 @mindex v p
 @end ignore
-@kindex v p (complex)
-@kindex V p (complex)
+@kindex v p @r{(complex)}
+@kindex V p @r{(complex)}
 @pindex calc-pack
 The @kbd{v p} (@code{calc-pack}) command can pack the top two numbers on
 the stack into a composite object such as a complex number.  With
@@ -16694,8 +16694,8 @@ with an argument of @mathit{-2}, it produces a polar complex number.
 @ignore
 @mindex v u
 @end ignore
-@kindex v u (complex)
-@kindex V u (complex)
+@kindex v u @r{(complex)}
+@kindex V u @r{(complex)}
 @pindex calc-unpack
 The @kbd{v u} (@code{calc-unpack}) command takes the complex number
 (or other composite object) on the top of the stack and unpacks it
@@ -20234,7 +20234,7 @@ the conjugate transpose of its argument, i.e., @samp{conj(trn(x))}.
 @ignore
 @mindex A
 @end ignore
-@kindex A (vectors)
+@kindex A @r{(vectors)}
 @pindex calc-abs (vectors)
 @ignore
 @mindex abs
@@ -20280,7 +20280,7 @@ exactly three elements.
 @ignore
 @mindex &
 @end ignore
-@kindex & (matrices)
+@kindex & @r{(matrices)}
 @pindex calc-inv (matrices)
 @ignore
 @mindex inv
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index e10808954d2..438919b2d8b 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 TAB
+@kindex @key{TAB}
 @findex c-indent-command
 @findex indent-command @r{(c-)}
 This command indents the current line.  That is all you need to know
@@ -920,8 +920,8 @@ must be in column zero.  See @ref{Defuns,,,@emacsman{},
 
 @item @kbd{C-M-a} (AWK Mode) (@code{c-awk-beginning-of-defun})
 @itemx @kbd{C-M-e} (AWK Mode) (@code{c-awk-end-of-defun})
-@kindex C-M-a (AWK Mode)
-@kindex C-M-e (AWK Mode)
+@kindex C-M-a @r{(AWK Mode)}
+@kindex C-M-e @r{(AWK Mode)}
 @findex c-awk-beginning-of-defun
 @findex awk-beginning-of-defun @r{(c-)}
 @findex c-awk-end-of-defun
@@ -1518,10 +1518,10 @@ deletion.
 
 @table @asis
 @item @kbd{@key{DEL}} (@code{c-electric-backspace})
-@kindex DEL
+@kindex @key{DEL}
 @findex c-electric-backspace
 @findex electric-backspace @r{(c-)}
-This command is run by default when you hit the @kbd{DEL} key.  When
+This command is run by default when you hit the @kbd{@key{DEL}} key.  When
 hungry delete mode is enabled, it deletes any amount of whitespace in
 the backwards direction.  Otherwise, or when used with a prefix
 argument or in a literal (@pxref{Auto-newlines}), the command just
@@ -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-<backspace>
-@kindex C-c <backspace>
-@kindex C-c C-DEL
-@kindex C-c DEL
+@kindex C-c C-@key{Backspace}
+@kindex C-c @key{Backspace}
+@kindex C-c C-@key{DEL}
+@kindex C-c @key{DEL}
 @findex c-hungry-delete-backwards
 @findex hungry-delete-backwards @r{(c-)}
 Delete any amount of whitespace in the backwards direction (regardless
@@ -1581,21 +1581,21 @@ 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-<DELETE>
-@kindex C-c <DELETE>
+@kindex C-c C-@key{Delete}
+@kindex C-c @key{Delete}
 @findex c-hungry-delete-forward
 @findex hungry-delete-forward @r{(c-)}
 Delete any amount of whitespace in the forward direction (regardless
 whether hungry-delete mode is enabled or not).  This command is bound
-to both @kbd{C-c C-@key{DELETE}} and @kbd{C-c @key{DELETE}} for the
+to both @kbd{C-c C-@key{Delete}} and @kbd{C-c @key{Delete}} for the
 same reason as for @key{DEL} above.
 @end table
 @end table
 
-@kindex <delete>
-@kindex <backspace>
+@kindex @key{Delete}
+@kindex @key{Backspace}
 
-When we talk about @kbd{@key{DEL}}, and @kbd{@key{DELETE}} above, we
+When we talk about @kbd{@key{DEL}}, and @kbd{@key{Delete}} above, we
 actually do so without connecting them to the physical keys commonly
 known as @key{Backspace} and @key{Delete}.  The default bindings to
 those two keys depends on the flavor of (X)Emacs you are using.
@@ -7248,15 +7248,15 @@ early on:
 Set the variable @code{c-basic-offset}.  @xref{Getting Started}.
 
 @item
-@kindex RET
+@kindex @key{RET}
 @kindex C-j
-@emph{Why does/doesn't the @kbd{RET} key indent the new line?}
+@emph{Why does/doesn't the @kbd{@key{RET}} key indent the new line?}
 
 Emacs's convention used to be that @kbd{RET} just adds a newline, and that
 @kbd{C-j} adds a newline and indents it.  In Emacs-24.4, this convention was
 reversed.
 
-If you use an older Emacs and you want @kbd{RET} do this
+If you use an older Emacs and you want @kbd{@key{RET}} do this
 too, add this to your @code{c-initialization-hook}:
 
 @example
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index e488fc07f8e..86b93056d1a 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -541,14 +541,14 @@ Copies the difference region from buffer C to buffer B@.
 The command @kbd{rb} undoes this.
 
 @item p
-@itemx DEL
+@itemx @key{DEL}
 @kindex p
-@kindex DEL
+@kindex @key{DEL}
 Makes the previous difference region current.
 @item n
-@itemx SPC
+@itemx @key{SPC}
 @kindex n
-@kindex SPC
+@kindex @key{SPC}
 Makes the next difference region current.
 
 @item j
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 237617a524b..d5dfe70760e 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -281,22 +281,22 @@ The following keys are assigned.
 
 @table @kbd
 @item : d
-@kindex @kbd{: d}
+@kindex : d
 @findex epa-dired-do-decrypt
 Decrypt marked files.
 
 @item : v
-@kindex @kbd{: v}
+@kindex : v
 @findex epa-dired-do-verify
 Verify marked files.
 
 @item : s
-@kindex @kbd{: s}
+@kindex : s
 @findex epa-dired-do-sign
 Sign marked files.
 
 @item : e
-@kindex @kbd{: e}
+@kindex : e
 @findex epa-dired-do-encrypt
 Encrypt marked files.
 
@@ -322,26 +322,26 @@ interface.  Try @kbd{M-x customize-variable epa-global-mail-mode}.
 
 @table @kbd
 @item C-c C-e C-d and C-c C-e d
-@kindex @kbd{C-c C-e C-d}
-@kindex @kbd{C-c C-e d}
+@kindex C-c C-e C-d
+@kindex C-c C-e d
 @findex epa-mail-decrypt
 Decrypt OpenPGP armors in the current buffer.
 
 @item C-c C-e C-v and C-c C-e v
-@kindex @kbd{C-c C-e C-v}
-@kindex @kbd{C-c C-e v}
+@kindex C-c C-e C-v
+@kindex C-c C-e v
 @findex epa-mail-verify
 Verify OpenPGP cleartext signed messages in the current buffer.
 
 @item C-c C-e C-s and C-c C-e s
-@kindex @kbd{C-c C-e C-s}
-@kindex @kbd{C-c C-e s}
+@kindex C-c C-e C-s
+@kindex C-c C-e s
 @findex epa-mail-sign
 Compose a signed message from the current buffer.
 
 @item C-c C-e C-e and C-c C-e e
-@kindex @kbd{C-c C-e C-e}
-@kindex @kbd{C-c C-e e}
+@kindex C-c C-e C-e
+@kindex C-c C-e e
 @findex epa-mail-encrypt
 @vindex epa-mail-aliases
 Compose an encrypted message from the current buffer.
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 9efca79e95a..f80b23f374a 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -203,7 +203,7 @@ different Emacs versions.
 
 @findex ert
 You can run the tests that are currently defined in your Emacs with
-the command @kbd{@kbd{M-x} ert @kbd{RET} t @kbd{RET}}.  (For an
+the command @kbd{M-x ert @key{RET} t @key{RET}}.  (For an
 explanation of the @code{t} argument, @pxref{Test Selectors}.) ERT will pop
 up a new buffer, the ERT results buffer, showing the results of the
 tests run.  It looks like this:
@@ -260,11 +260,11 @@ unexpected result.  In the example above, there are two failures, both
 due to failed @code{should} forms.  @xref{Understanding Explanations},
 for more details.
 
-@kindex TAB@r{, in ert results buffer}
-@kindex S-TAB@r{, in ert results buffer}
-In the ERT results buffer, @kbd{TAB} and @kbd{S-TAB} cycle between
+@kindex @key{TAB}@r{, in ert results buffer}
+@kindex S-@key{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{RET} jumps to its definition.
+moving point to it and typing @kbd{@key{RET}} jumps to its definition.
 
 @kindex r@r{, in ert results buffer}
 @kindex d@r{, in ert results buffer}
@@ -273,7 +273,7 @@ moving point to it and typing @kbd{RET} jumps to its definition.
 @cindex backtrace of a failed test
 Pressing @kbd{r} re-runs the test near point on its own.  Pressing
 @kbd{d} re-runs it with the debugger enabled.  @kbd{.} jumps to the
-definition of the test near point (@kbd{RET} has the same effect if
+definition of the test near point (@kbd{@key{RET}} has the same effect if
 point is on the name of the test).  On a failed test, @kbd{b} shows
 the backtrace of the failure.
 
@@ -803,7 +803,7 @@ failed.  This can be useful to figure out how far it got.
 @item
 You can instrument tests for debugging the same way you instrument
 @code{defun}s for debugging: go to the source code of the test and
-type @kbd{@kbd{C-u} @kbd{C-M-x}}.  Then, go back to the ERT buffer and
+type @kbd{C-u C-M-x}.  Then, go back to the ERT buffer and
 re-run the test with @kbd{r} or @kbd{d}.
 
 @cindex discard obsolete test results
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 258a2f2bff9..0b1fb6598b7 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -98,8 +98,8 @@ 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-RET
-  The @kbd{M-RET} command (@code{eww-open-in-new-buffer}) opens the
+@kindex M-@key{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 9857a67745e..41847dfcffb 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 TAB
+@kindex @key{TAB}
 @item @key{TAB}
-@kindex C-c TAB
+@kindex C-c @key{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
@@ -334,25 +334,25 @@ The following function key definitions are set up in Forms mode
 (whether read-only or not):
 
 @table @kbd
-@kindex next
-@item next
+@kindex @key{NEXT}
+@item @key{NEXT}
 forms-next-record
 
-@kindex prior
-@item prior
+@kindex @key{PRIOR}
+@item @key{PRIOR}
 forms-prev-record
 
-@kindex begin
-@item begin
+@kindex @key{BEGIN}
+@item @key{BEGIN}
 forms-first-record
 
-@kindex end
-@item end
+@kindex @key{END}
+@item @key{END}
 forms-last-record
 
-@kindex S-Tab
+@kindex S-@key{TAB}
 @findex forms-prev-field
-@item S-Tab
+@item S-@key{TAB}
 forms-prev-field
 @end table
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index be00ddabdf1..43d6820c31b 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -959,7 +959,6 @@ Emacs for Heathens
 If you haven't used Emacs much before using Gnus, read @ref{Emacs for
 Heathens} first.
 
-@kindex M-x gnus
 @findex gnus
 If your system administrator has set things up properly, starting Gnus
 and reading news is extremely easy---you just type @kbd{M-x gnus} in
@@ -969,7 +968,6 @@ minimal setup for posting should also customize the variables
 @code{user-full-name} and @code{user-mail-address}.
 
 @findex gnus-other-frame
-@kindex M-x gnus-other-frame
 If you want to start Gnus in a different frame, you can use the command
 @kbd{M-x gnus-other-frame} instead.
 
@@ -1000,7 +998,7 @@ terminology section (@pxref{Terminology}).
 First of all, you should know that there is a special buffer called
 @file{*Server*} that lists all the servers Gnus knows about.  You can
 press @kbd{^} from the Group buffer to see it.  In the Server buffer,
-you can press @kbd{RET} on a defined server to see all the groups it
+you can press @kbd{@key{RET}} on a defined server to see all the groups it
 serves (subscribed or not!).  You can also add or delete servers, edit
 a foreign server's definition, agentize or de-agentize a server, and
 do many other neat things.  @xref{Server Buffer}.
@@ -1043,7 +1041,7 @@ If that fails as well, Gnus will try to use the machine running Emacs
 as an @acronym{NNTP} server.  That's a long shot, though.
 
 @findex gnus-group-browse-foreign-server
-@kindex B (Group)
+@kindex B @r{(Group)}
 However, if you use one @acronym{NNTP} server regularly and are just
 interested in a couple of groups from a different server, you would be
 better served by using the @kbd{B} command in the group buffer.  It will
@@ -1087,7 +1085,6 @@ groups, you'll find it difficult to actually do anything in the group
 buffer.  But, hey, that's your problem.  Blllrph!
 
 @findex gnus-no-server
-@kindex M-x gnus-no-server
 @c @head
 If you know that the server is definitely down, or you just want to read
 your mail without bothering with the server at all, you can use the
@@ -1354,13 +1351,11 @@ you have read is by keeping track of article numbers.  So when you
 change @code{gnus-select-method}, your @file{.newsrc} file becomes
 worthless.
 
-@kindex M-x gnus-group-clear-data-on-native-groups
 @findex gnus-group-clear-data-on-native-groups
 You can use the @kbd{M-x gnus-group-clear-data-on-native-groups}
 command to clear out all data that you have on your native groups.
 Use with caution.
 
-@kindex M-x gnus-group-clear-data
 @findex gnus-group-clear-data
 Clear the data from the current group only---nix out marks and the
 list of read articles (@code{gnus-group-clear-data}).
@@ -1704,7 +1699,7 @@ long as Gnus is active.
 @end menu
 
 You can customize the Group Mode tool bar, see @kbd{M-x
-customize-apropos RET gnus-group-tool-bar}.  This feature is only
+customize-apropos @key{RET} gnus-group-tool-bar}.  This feature is only
 available in Emacs.
 
 The tool bar icons are now (de)activated correctly depending on the
@@ -1989,37 +1984,37 @@ expected, hopefully.
 @table @kbd
 
 @item n
-@kindex n (Group)
+@kindex n @r{(Group)}
 @findex gnus-group-next-unread-group
 Go to the next group that has unread articles
 (@code{gnus-group-next-unread-group}).
 
 @item p
-@itemx DEL
-@kindex DEL (Group)
-@kindex p (Group)
+@itemx @key{DEL}
+@kindex @key{DEL} @r{(Group)}
+@kindex p @r{(Group)}
 @findex gnus-group-prev-unread-group
 Go to the previous group that has unread articles
 (@code{gnus-group-prev-unread-group}).
 
 @item N
-@kindex N (Group)
+@kindex N @r{(Group)}
 @findex gnus-group-next-group
 Go to the next group (@code{gnus-group-next-group}).
 
 @item P
-@kindex P (Group)
+@kindex P @r{(Group)}
 @findex gnus-group-prev-group
 Go to the previous group (@code{gnus-group-prev-group}).
 
 @item M-n
-@kindex M-n (Group)
+@kindex M-n @r{(Group)}
 @findex gnus-group-next-unread-group-same-level
 Go to the next unread group on the same (or lower) level
 (@code{gnus-group-next-unread-group-same-level}).
 
 @item M-p
-@kindex M-p (Group)
+@kindex M-p @r{(Group)}
 @findex gnus-group-prev-unread-group-same-level
 Go to the previous unread group on the same (or lower) level
 (@code{gnus-group-prev-unread-group-same-level}).
@@ -2030,20 +2025,20 @@ Three commands for jumping to groups:
 @table @kbd
 
 @item j
-@kindex j (Group)
+@kindex j @r{(Group)}
 @findex gnus-group-jump-to-group
 Jump to a group (and make it visible if it isn't already)
 (@code{gnus-group-jump-to-group}).  Killed groups can be jumped to, just
 like living groups.
 
 @item ,
-@kindex , (Group)
+@kindex , @r{(Group)}
 @findex gnus-group-best-unread-group
 Jump to the unread group with the lowest level
 (@code{gnus-group-best-unread-group}).
 
 @item .
-@kindex . (Group)
+@kindex . @r{(Group)}
 @findex gnus-group-first-unread-group
 Jump to the first group with unread articles
 (@code{gnus-group-first-unread-group}).
@@ -2067,8 +2062,8 @@ Otherwise, the point is set to the group just exited.  The default is
 
 @table @kbd
 
-@item SPACE
-@kindex SPACE (Group)
+@item @key{SPC}
+@kindex @key{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
@@ -2079,16 +2074,16 @@ determines the number of articles Gnus will fetch.  If @var{n} is
 positive, Gnus fetches the @var{n} newest articles, if @var{n} is
 negative, Gnus fetches the @code{abs(@var{n})} oldest articles.
 
-Thus, @kbd{SPC} enters the group normally, @kbd{C-u SPC} offers old
-articles, @kbd{C-u 4 2 SPC} fetches the 42 newest articles, and @kbd{C-u
-- 4 2 SPC} fetches the 42 oldest ones.
+Thus, @kbd{@key{SPC}} enters the group normally, @kbd{C-u @key{SPC}}
+offers old articles, @kbd{C-u 4 2 @key{SPC}} fetches the 42 newest
+articles, and @kbd{C-u - 4 2 @key{SPC}} fetches the 42 oldest ones.
 
 When you are in the group (in the Summary buffer), you can type
 @kbd{M-g} to fetch new articles, or @kbd{C-u M-g} to also show the old
 ones.
 
-@item RET
-@kindex RET (Group)
+@item @key{RET}
+@kindex @key{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
@@ -2096,27 +2091,27 @@ Select the current group and switch to the summary buffer
 does not display the first unread article automatically upon group
 entry.
 
-@item M-RET
-@kindex M-RET (Group)
+@item M-@key{RET}
+@kindex M-@key{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
 scoring/killing will be performed, there will be no highlights and no
 expunging.  This might be useful if you're in a real hurry and have to
 enter some humongous group.  If you give a 0 prefix to this command
-(i.e., @kbd{0 M-RET}), Gnus won't even generate the summary buffer,
+(i.e., @kbd{0 M-@key{RET}}), Gnus won't even generate the summary buffer,
 which is useful if you want to toggle threading before generating the
 summary buffer (@pxref{Summary Generation Commands}).
 
-@item M-SPACE
-@kindex M-SPACE (Group)
+@item M-@key{SPC}
+@kindex M-@key{SPC} @r{(Group)}
 @findex gnus-group-visible-select-group
-This is yet one more command that does the same as the @kbd{RET}
+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-RET
-@kindex C-M-RET (Group)
+@item C-M-@key{RET}
+@kindex C-M-@key{RET} @r{(Group)}
 @findex gnus-group-select-group-ephemerally
 Finally, this command selects the current group ephemerally without
 doing any processing of its contents
@@ -2164,7 +2159,7 @@ means Gnus never ignores old articles.
 @vindex gnus-auto-select-first
 @vindex gnus-auto-select-subject
 If @code{gnus-auto-select-first} is non-@code{nil}, select an article
-automatically when entering a group with the @kbd{SPACE} command.
+automatically when entering a group with the @kbd{@key{SPC}} command.
 Which article this is controlled by the
 @code{gnus-auto-select-subject} variable.  Valid values for this
 variable are:
@@ -2207,15 +2202,15 @@ selected.
 The following commands allow for managing your subscriptions in the
 Group buffer.  If you want to subscribe to many groups, it's probably
 more convenient to go to the @ref{Server Buffer}, and choose the
-server there using @kbd{RET} or @kbd{SPC}.  Then you'll have the
+server there using @kbd{@key{RET}} or @kbd{@key{SPC}}.  Then you'll have the
 commands listed in @ref{Browse Foreign Server} at hand.
 
 @table @kbd
 
 @item S t
 @itemx u
-@kindex S t (Group)
-@kindex u (Group)
+@kindex S t @r{(Group)}
+@kindex u @r{(Group)}
 @findex gnus-group-unsubscribe-current-group
 @c @icon{gnus-group-unsubscribe}
 Toggle subscription to the current group
@@ -2223,8 +2218,8 @@ Toggle subscription to the current group
 
 @item S s
 @itemx U
-@kindex S s (Group)
-@kindex U (Group)
+@kindex S s @r{(Group)}
+@kindex U @r{(Group)}
 @findex gnus-group-unsubscribe-group
 Prompt for a group to subscribe, and then subscribe it.  If it was
 subscribed already, unsubscribe it instead
@@ -2232,21 +2227,21 @@ subscribed already, unsubscribe it instead
 
 @item S k
 @itemx C-k
-@kindex S k (Group)
-@kindex C-k (Group)
+@kindex S k @r{(Group)}
+@kindex C-k @r{(Group)}
 @findex gnus-group-kill-group
 @c @icon{gnus-group-kill-group}
 Kill the current group (@code{gnus-group-kill-group}).
 
 @item S y
 @itemx C-y
-@kindex S y (Group)
-@kindex C-y (Group)
+@kindex S y @r{(Group)}
+@kindex C-y @r{(Group)}
 @findex gnus-group-yank-group
 Yank the last killed group (@code{gnus-group-yank-group}).
 
 @item C-x C-t
-@kindex C-x C-t (Group)
+@kindex C-x C-t @r{(Group)}
 @findex gnus-group-transpose-groups
 Transpose two groups (@code{gnus-group-transpose-groups}).  This isn't
 really a subscription command, but you can use it instead of a
@@ -2254,18 +2249,18 @@ kill-and-yank sequence sometimes.
 
 @item S w
 @itemx C-w
-@kindex S w (Group)
-@kindex C-w (Group)
+@kindex S w @r{(Group)}
+@kindex C-w @r{(Group)}
 @findex gnus-group-kill-region
 Kill all groups in the region (@code{gnus-group-kill-region}).
 
 @item S z
-@kindex S z (Group)
+@kindex S z @r{(Group)}
 @findex gnus-group-kill-all-zombies
 Kill all zombie groups (@code{gnus-group-kill-all-zombies}).
 
 @item S C-k
-@kindex S C-k (Group)
+@kindex S C-k @r{(Group)}
 @findex gnus-group-kill-level
 Kill all groups on a certain level (@code{gnus-group-kill-level}).
 These groups can't be yanked back after killing, so this command should
@@ -2286,7 +2281,7 @@ Also @pxref{Group Levels}.
 @table @kbd
 
 @item c
-@kindex c (Group)
+@kindex c @r{(Group)}
 @findex gnus-group-catchup-current
 @vindex gnus-group-catchup-group-hook
 @c @icon{gnus-group-catchup-current}
@@ -2296,19 +2291,18 @@ Mark all unticked articles in this group as read
 the group buffer.
 
 @item C
-@kindex C (Group)
+@kindex C @r{(Group)}
 @findex gnus-group-catchup-current-all
 Mark all articles in this group, even the ticked ones, as read
 (@code{gnus-group-catchup-current-all}).
 
 @item M-c
-@kindex M-c (Group)
+@kindex M-c @r{(Group)}
 @findex gnus-group-clear-data
 Clear the data from the current group---nix out marks and the list of
 read articles (@code{gnus-group-clear-data}).
 
 @item M-x gnus-group-clear-data-on-native-groups
-@kindex M-x gnus-group-clear-data-on-native-groups
 @findex gnus-group-clear-data-on-native-groups
 If you have switched from one @acronym{NNTP} server to another, all your marks
 and read ranges have become worthless.  You can use this command to
@@ -2334,7 +2328,7 @@ Remember:  The higher the level of the group, the less important it is.
 @table @kbd
 
 @item S l
-@kindex S l (Group)
+@kindex S l @r{(Group)}
 @findex gnus-group-set-current-level
 Set the level of the current group.  If a numeric prefix is given, the
 next @var{n} groups will have their levels set.  The user will be
@@ -2478,37 +2472,37 @@ with the process mark and then execute the command.
 @table @kbd
 
 @item #
-@kindex # (Group)
+@kindex # @r{(Group)}
 @itemx M m
-@kindex M m (Group)
+@kindex M m @r{(Group)}
 @findex gnus-group-mark-group
 Set the mark on the current group (@code{gnus-group-mark-group}).
 
 @item M-#
-@kindex M-# (Group)
+@kindex M-# @r{(Group)}
 @itemx M u
-@kindex M u (Group)
+@kindex M u @r{(Group)}
 @findex gnus-group-unmark-group
 Remove the mark from the current group
 (@code{gnus-group-unmark-group}).
 
 @item M U
-@kindex M U (Group)
+@kindex M U @r{(Group)}
 @findex gnus-group-unmark-all-groups
 Remove the mark from all groups (@code{gnus-group-unmark-all-groups}).
 
 @item M w
-@kindex M w (Group)
+@kindex M w @r{(Group)}
 @findex gnus-group-mark-region
 Mark all groups between point and mark (@code{gnus-group-mark-region}).
 
 @item M b
-@kindex M b (Group)
+@kindex M b @r{(Group)}
 @findex gnus-group-mark-buffer
 Mark all groups in the buffer (@code{gnus-group-mark-buffer}).
 
 @item M r
-@kindex M r (Group)
+@kindex M r @r{(Group)}
 @findex gnus-group-mark-regexp
 Mark all groups that match some regular expression
 (@code{gnus-group-mark-regexp}).
@@ -2549,7 +2543,7 @@ variable @code{gnus-parameters}, @xref{Group Parameters}.
 @table @kbd
 
 @item G m
-@kindex G m (Group)
+@kindex G m @r{(Group)}
 @findex gnus-group-make-group
 @cindex making groups
 Make a new group (@code{gnus-group-make-group}).  Gnus will prompt you
@@ -2557,13 +2551,13 @@ for a name, a method and possibly an @dfn{address}.  For an easier way
 to subscribe to @acronym{NNTP} groups (@pxref{Browse Foreign Server}).
 
 @item G M
-@kindex G M (Group)
+@kindex G M @r{(Group)}
 @findex gnus-group-read-ephemeral-group
 Make an ephemeral group (@code{gnus-group-read-ephemeral-group}).  Gnus
 will prompt you for a name, a method and an @dfn{address}.
 
 @item G r
-@kindex G r (Group)
+@kindex G r @r{(Group)}
 @findex gnus-group-rename-group
 @cindex renaming groups
 Rename the current group to something else
@@ -2572,45 +2566,45 @@ groups---mail groups mostly.  This command might very well be quite slow
 on some back ends.
 
 @item G c
-@kindex G c (Group)
+@kindex G c @r{(Group)}
 @cindex customizing
 @findex gnus-group-customize
 Customize the group parameters (@code{gnus-group-customize}).
 
 @item G e
-@kindex G e (Group)
+@kindex G e @r{(Group)}
 @findex gnus-group-edit-group-method
 @cindex renaming groups
 Enter a buffer where you can edit the select method of the current
 group (@code{gnus-group-edit-group-method}).
 
 @item G p
-@kindex G p (Group)
+@kindex G p @r{(Group)}
 @findex gnus-group-edit-group-parameters
 Enter a buffer where you can edit the group parameters
 (@code{gnus-group-edit-group-parameters}).
 
 @item G E
-@kindex G E (Group)
+@kindex G E @r{(Group)}
 @findex gnus-group-edit-group
 Enter a buffer where you can edit the group info
 (@code{gnus-group-edit-group}).
 
 @item G d
-@kindex G d (Group)
+@kindex G d @r{(Group)}
 @findex gnus-group-make-directory-group
 @cindex nndir
 Make a directory group (@pxref{Directory Groups}).  You will be prompted
 for the directory's name (@code{gnus-group-make-directory-group}).
 
 @item G h
-@kindex G h (Group)
+@kindex G h @r{(Group)}
 @cindex help group
 @findex gnus-group-make-help-group
 Make the Gnus help group (@code{gnus-group-make-help-group}).
 
 @item G D
-@kindex G D (Group)
+@kindex G D @r{(Group)}
 @findex gnus-group-enter-directory
 @cindex nneething
 Read an arbitrary directory as if it were a newsgroup with the
@@ -2618,7 +2612,7 @@ Read an arbitrary directory as if it were a newsgroup with the
 @xref{Anything Groups}.
 
 @item G f
-@kindex G f (Group)
+@kindex G f @r{(Group)}
 @findex gnus-group-make-doc-group
 @cindex ClariNet Briefs
 @cindex nndoc
@@ -2634,14 +2628,14 @@ you run this command without a prefix, Gnus will guess at the file
 type.  @xref{Document Groups}.
 
 @item G u
-@kindex G u (Group)
+@kindex G u @r{(Group)}
 @vindex gnus-useful-groups
 @findex gnus-group-make-useful-group
 Create one of the groups mentioned in @code{gnus-useful-groups}
 (@code{gnus-group-make-useful-group}).
 
 @item G w
-@kindex G w (Group)
+@kindex G w @r{(Group)}
 @findex gnus-group-make-web-group
 @cindex Google
 @cindex nnweb
@@ -2658,14 +2652,14 @@ to a particular group by using a match string like
 @samp{shaving group:alt.sysadmin.recovery}.
 
 @item G R
-@kindex G R (Group)
+@kindex G R @r{(Group)}
 @findex gnus-group-make-rss-group
 Make a group based on an @acronym{RSS} feed
 (@code{gnus-group-make-rss-group}).  You will be prompted for an URL@.
 @xref{RSS}.
 
-@item G DEL
-@kindex G DEL (Group)
+@item G @key{DEL}
+@kindex G @key{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
@@ -2675,13 +2669,13 @@ absolutely sure of what you are doing.  This command can't be used on
 read-only groups (like @code{nntp} groups), though.
 
 @item G V
-@kindex G V (Group)
+@kindex G V @r{(Group)}
 @findex gnus-group-make-empty-virtual
 Make a new, fresh, empty @code{nnvirtual} group
 (@code{gnus-group-make-empty-virtual}).  @xref{Virtual Groups}.
 
 @item G v
-@kindex G v (Group)
+@kindex G v @r{(Group)}
 @findex gnus-group-add-to-virtual
 Add the current group to an @code{nnvirtual} group
 (@code{gnus-group-add-to-virtual}).  Uses the process/prefix convention.
@@ -3260,8 +3254,8 @@ These commands all list various slices of the groups available.
 
 @item l
 @itemx A s
-@kindex A s (Group)
-@kindex l (Group)
+@kindex A s @r{(Group)}
+@kindex l @r{(Group)}
 @findex gnus-group-list-groups
 List all groups that have unread articles
 (@code{gnus-group-list-groups}).  If the numeric prefix is used, this
@@ -3272,8 +3266,8 @@ groups).
 
 @item L
 @itemx A u
-@kindex A u (Group)
-@kindex L (Group)
+@kindex A u @r{(Group)}
+@kindex L @r{(Group)}
 @findex gnus-group-list-all-groups
 List all groups, whether they have unread articles or not
 (@code{gnus-group-list-all-groups}).  If the numeric prefix is used,
@@ -3282,14 +3276,14 @@ it lists groups of level seven or lower (i.e., just subscribed and
 unsubscribed groups).
 
 @item A l
-@kindex A l (Group)
+@kindex A l @r{(Group)}
 @findex gnus-group-list-level
 List all unread groups on a specific level
 (@code{gnus-group-list-level}).  If given a prefix, also list the groups
 with no unread articles.
 
 @item A k
-@kindex A k (Group)
+@kindex A k @r{(Group)}
 @findex gnus-group-list-killed
 List all killed groups (@code{gnus-group-list-killed}).  If given a
 prefix argument, really list all groups that are available, but aren't
@@ -3297,23 +3291,23 @@ currently (un)subscribed.  This could entail reading the active file
 from the server.
 
 @item A z
-@kindex A z (Group)
+@kindex A z @r{(Group)}
 @findex gnus-group-list-zombies
 List all zombie groups (@code{gnus-group-list-zombies}).
 
 @item A m
-@kindex A m (Group)
+@kindex A m @r{(Group)}
 @findex gnus-group-list-matching
 List all unread, subscribed groups with names that match a regexp
 (@code{gnus-group-list-matching}).
 
 @item A M
-@kindex A M (Group)
+@kindex A M @r{(Group)}
 @findex gnus-group-list-all-matching
 List groups that match a regexp (@code{gnus-group-list-all-matching}).
 
 @item A A
-@kindex A A (Group)
+@kindex A A @r{(Group)}
 @findex gnus-group-list-active
 List absolutely all groups in the active file(s) of the
 server(s) you are connected to (@code{gnus-group-list-active}).  This
@@ -3324,34 +3318,34 @@ don't exist (yet)---these will be listed as if they were killed groups.
 Take the output with some grains of salt.
 
 @item A a
-@kindex A a (Group)
+@kindex A a @r{(Group)}
 @findex gnus-group-apropos
 List all groups that have names that match a regexp
 (@code{gnus-group-apropos}).
 
 @item A d
-@kindex A d (Group)
+@kindex A d @r{(Group)}
 @findex gnus-group-description-apropos
 List all groups that have names or descriptions that match a regexp
 (@code{gnus-group-description-apropos}).
 
 @item A c
-@kindex A c (Group)
+@kindex A c @r{(Group)}
 @findex gnus-group-list-cached
 List all groups with cached articles (@code{gnus-group-list-cached}).
 
 @item A ?
-@kindex A ? (Group)
+@kindex A ? @r{(Group)}
 @findex gnus-group-list-dormant
 List all groups with dormant articles (@code{gnus-group-list-dormant}).
 
 @item A !
-@kindex A ! (Group)
+@kindex A ! @r{(Group)}
 @findex gnus-group-list-ticked
 List all groups with ticked articles (@code{gnus-group-list-ticked}).
 
 @item A /
-@kindex A / (Group)
+@kindex A / @r{(Group)}
 @findex gnus-group-list-limit
 Further limit groups within the current selection
 (@code{gnus-group-list-limit}).  If you've first limited to groups
@@ -3361,12 +3355,12 @@ giving you the groups that have both dormant articles and cached
 articles.
 
 @item A f
-@kindex A f (Group)
+@kindex A f @r{(Group)}
 @findex gnus-group-list-flush
 Flush groups from the current selection (@code{gnus-group-list-flush}).
 
 @item A p
-@kindex A p (Group)
+@kindex A p @r{(Group)}
 @findex gnus-group-list-plus
 List groups plus the current selection (@code{gnus-group-list-plus}).
 
@@ -3390,7 +3384,7 @@ groups.  It is @code{t} by default.
 @section Sorting Groups
 @cindex sorting groups
 
-@kindex C-c C-s (Group)
+@kindex C-c C-s @r{(Group)}
 @findex gnus-group-sort-groups
 @vindex gnus-group-sort-function
 The @kbd{C-c C-s} (@code{gnus-group-sort-groups}) command sorts the
@@ -3446,43 +3440,43 @@ some sorting criteria:
 
 @table @kbd
 @item G S a
-@kindex G S a (Group)
+@kindex G S a @r{(Group)}
 @findex gnus-group-sort-groups-by-alphabet
 Sort the group buffer alphabetically by group name
 (@code{gnus-group-sort-groups-by-alphabet}).
 
 @item G S u
-@kindex G S u (Group)
+@kindex G S u @r{(Group)}
 @findex gnus-group-sort-groups-by-unread
 Sort the group buffer by the number of unread articles
 (@code{gnus-group-sort-groups-by-unread}).
 
 @item G S l
-@kindex G S l (Group)
+@kindex G S l @r{(Group)}
 @findex gnus-group-sort-groups-by-level
 Sort the group buffer by group level
 (@code{gnus-group-sort-groups-by-level}).
 
 @item G S v
-@kindex G S v (Group)
+@kindex G S v @r{(Group)}
 @findex gnus-group-sort-groups-by-score
 Sort the group buffer by group score
 (@code{gnus-group-sort-groups-by-score}).  @xref{Group Score}.
 
 @item G S r
-@kindex G S r (Group)
+@kindex G S r @r{(Group)}
 @findex gnus-group-sort-groups-by-rank
 Sort the group buffer by group rank
 (@code{gnus-group-sort-groups-by-rank}).  @xref{Group Score}.
 
 @item G S m
-@kindex G S m (Group)
+@kindex G S m @r{(Group)}
 @findex gnus-group-sort-groups-by-method
 Sort the group buffer alphabetically by back end name@*
 (@code{gnus-group-sort-groups-by-method}).
 
 @item G S n
-@kindex G S n (Group)
+@kindex G S n @r{(Group)}
 @findex gnus-group-sort-groups-by-real-name
 Sort the group buffer alphabetically by real (unprefixed) group name
 (@code{gnus-group-sort-groups-by-real-name}).
@@ -3499,49 +3493,49 @@ You can also sort a subset of the groups:
 
 @table @kbd
 @item G P a
-@kindex G P a (Group)
+@kindex G P a @r{(Group)}
 @findex gnus-group-sort-selected-groups-by-alphabet
 Sort the groups alphabetically by group name
 (@code{gnus-group-sort-selected-groups-by-alphabet}).
 
 @item G P u
-@kindex G P u (Group)
+@kindex G P u @r{(Group)}
 @findex gnus-group-sort-selected-groups-by-unread
 Sort the groups by the number of unread articles
 (@code{gnus-group-sort-selected-groups-by-unread}).
 
 @item G P l
-@kindex G P l (Group)
+@kindex G P l @r{(Group)}
 @findex gnus-group-sort-selected-groups-by-level
 Sort the groups by group level
 (@code{gnus-group-sort-selected-groups-by-level}).
 
 @item G P v
-@kindex G P v (Group)
+@kindex G P v @r{(Group)}
 @findex gnus-group-sort-selected-groups-by-score
 Sort the groups by group score
 (@code{gnus-group-sort-selected-groups-by-score}).  @xref{Group Score}.
 
 @item G P r
-@kindex G P r (Group)
+@kindex G P r @r{(Group)}
 @findex gnus-group-sort-selected-groups-by-rank
 Sort the groups by group rank
 (@code{gnus-group-sort-selected-groups-by-rank}).  @xref{Group Score}.
 
 @item G P m
-@kindex G P m (Group)
+@kindex G P m @r{(Group)}
 @findex gnus-group-sort-selected-groups-by-method
 Sort the groups alphabetically by back end name@*
 (@code{gnus-group-sort-selected-groups-by-method}).
 
 @item G P n
-@kindex G P n (Group)
+@kindex G P n @r{(Group)}
 @findex gnus-group-sort-selected-groups-by-real-name
 Sort the groups alphabetically by real (unprefixed) group name
 (@code{gnus-group-sort-selected-groups-by-real-name}).
 
 @item G P s
-@kindex G P s (Group)
+@kindex G P s @r{(Group)}
 @findex gnus-group-sort-selected-groups
 Sort the groups according to @code{gnus-group-sort-function}.
 
@@ -3557,13 +3551,13 @@ move groups around.
 
 @table @kbd
 @item b
-@kindex b (Group)
+@kindex b @r{(Group)}
 @findex gnus-group-check-bogus-groups
 Find bogus groups and delete them
 (@code{gnus-group-check-bogus-groups}).
 
 @item F
-@kindex F (Group)
+@kindex F @r{(Group)}
 @findex gnus-group-find-new-groups
 Find new groups and process them (@code{gnus-group-find-new-groups}).
 With 1 @kbd{C-u}, use the @code{ask-server} method to query the server
@@ -3572,7 +3566,7 @@ to query the server for new groups, and subscribe the new groups as
 zombies.
 
 @item C-c C-x
-@kindex C-c C-x (Group)
+@kindex C-c C-x @r{(Group)}
 @findex gnus-group-expire-articles
 @cindex expiring mail
 Run all expirable articles in the current group through the expiry
@@ -3581,7 +3575,7 @@ all expirable articles in the group that have been around for a while.
 (@pxref{Expiring Mail}).
 
 @item C-c C-M-x
-@kindex C-c C-M-x (Group)
+@kindex C-c C-M-x @r{(Group)}
 @findex gnus-group-expire-all-groups
 @cindex expiring mail
 Run all expirable articles in all groups through the expiry process
@@ -3597,7 +3591,7 @@ Run all expirable articles in all groups through the expiry process
 
 @table @kbd
 @item B
-@kindex B (Group)
+@kindex B @r{(Group)}
 @findex gnus-group-browse-foreign-server
 You will be queried for a select method and a server name.  Gnus will
 then attempt to contact this server and let you browse the groups there
@@ -3613,28 +3607,28 @@ Here's a list of keystrokes available in the browse mode:
 
 @table @kbd
 @item n
-@kindex n (Browse)
+@kindex n @r{(Browse)}
 @findex gnus-group-next-group
 Go to the next group (@code{gnus-group-next-group}).
 
 @item p
-@kindex p (Browse)
+@kindex p @r{(Browse)}
 @findex gnus-group-prev-group
 Go to the previous group (@code{gnus-group-prev-group}).
 
-@item SPACE
-@kindex SPACE (Browse)
+@item @key{SPC}
+@kindex @key{SPC} @r{(Browse)}
 @findex gnus-browse-read-group
 Enter the current group and display the first article
 (@code{gnus-browse-read-group}).
 
-@item RET
-@kindex RET (Browse)
+@item @key{RET}
+@kindex @key{RET} @r{(Browse)}
 @findex gnus-browse-select-group
 Enter the current group (@code{gnus-browse-select-group}).
 
 @item u
-@kindex u (Browse)
+@kindex u @r{(Browse)}
 @findex gnus-browse-unsubscribe-current-group
 @vindex gnus-browse-subscribe-newsgroup-method
 Unsubscribe to the current group, or, as will be the case here,
@@ -3645,24 +3639,24 @@ using the variable @code{gnus-browse-subscribe-newsgroup-method}.  See
 
 @item l
 @itemx q
-@kindex q (Browse)
-@kindex l (Browse)
+@kindex q @r{(Browse)}
+@kindex l @r{(Browse)}
 @findex gnus-browse-exit
 Exit browse mode (@code{gnus-browse-exit}).
 
 @item d
-@kindex d (Browse)
+@kindex d @r{(Browse)}
 @findex gnus-browse-describe-group
 Describe the current group (@code{gnus-browse-describe-group}).
 
 @item ?
-@kindex ? (Browse)
+@kindex ? @r{(Browse)}
 @findex gnus-browse-describe-briefly
 Describe browse mode briefly (well, there's not much to describe, is
 there) (@code{gnus-browse-describe-briefly}).
 
-@item DEL
-@kindex DEL (Browse)
+@item @key{DEL}
+@kindex @key{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
@@ -3680,20 +3674,20 @@ Yes, Gnus is ex(c)iting.
 
 @table @kbd
 @item z
-@kindex z (Group)
+@kindex z @r{(Group)}
 @findex gnus-group-suspend
 Suspend Gnus (@code{gnus-group-suspend}).  This doesn't really exit Gnus,
 but it kills all buffers except the Group buffer.  I'm not sure why this
 is a gain, but then who am I to judge?
 
 @item q
-@kindex q (Group)
+@kindex q @r{(Group)}
 @findex gnus-group-exit
 @c @icon{gnus-group-exit}
 Quit Gnus (@code{gnus-group-exit}).
 
 @item Q
-@kindex Q (Group)
+@kindex Q @r{(Group)}
 @findex gnus-group-quit
 Quit Gnus without saving the @file{.newsrc} files (@code{gnus-group-quit}).
 The dribble file will be saved, though (@pxref{Auto Save}).
@@ -3752,7 +3746,7 @@ Gnus
 @end example
 
 @findex gnus-topic-mode
-@kindex t (Group)
+@kindex t @r{(Group)}
 To get this @emph{fab} functionality you simply turn on (ooh!) the
 @code{gnus-topic} minor mode---type @kbd{t} in the group buffer.  (This
 is a toggling command.)
@@ -3801,22 +3795,22 @@ the way you like.
 @table @kbd
 
 @item T n
-@kindex T n (Topic)
+@kindex T n @r{(Topic)}
 @findex gnus-topic-create-topic
 Prompt for a new topic name and create it
 (@code{gnus-topic-create-topic}).
 
-@item T TAB
-@itemx TAB
-@kindex T TAB (Topic)
-@kindex TAB (Topic)
+@item T @key{TAB}
+@itemx @key{TAB}
+@kindex T @key{TAB} @r{(Topic)}
+@kindex @key{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-TAB
-@kindex M-TAB (Topic)
+@item M-@key{TAB}
+@kindex M-@key{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}).
@@ -3831,13 +3825,13 @@ kill and yank rather than cut and paste.
 @table @kbd
 
 @item C-k
-@kindex C-k (Topic)
+@kindex C-k @r{(Topic)}
 @findex gnus-topic-kill-group
 Kill a group or topic (@code{gnus-topic-kill-group}).  All groups in the
 topic will be removed along with the topic.
 
 @item C-y
-@kindex C-y (Topic)
+@kindex C-y @r{(Topic)}
 @findex gnus-topic-yank-group
 Yank the previously killed group or topic
 (@code{gnus-topic-yank-group}).  Note that all topics will be yanked
@@ -3860,10 +3854,10 @@ key.
 
 @table @kbd
 
-@item RET
-@kindex RET (Topic)
+@item @key{RET}
+@kindex @key{RET} @r{(Topic)}
 @findex gnus-topic-select-group
-@itemx SPACE
+@itemx @key{SPC}
 Either select a group or fold a topic (@code{gnus-topic-select-group}).
 When you perform this command on a group, you'll enter the group, as
 usual.  When done on a topic line, the topic will be folded (if it was
@@ -3878,38 +3872,38 @@ Now for a list of other commands, in no particular order.
 @table @kbd
 
 @item T m
-@kindex T m (Topic)
+@kindex T m @r{(Topic)}
 @findex gnus-topic-move-group
 Move the current group to some other topic
 (@code{gnus-topic-move-group}).  This command uses the process/prefix
 convention (@pxref{Process/Prefix}).
 
 @item T j
-@kindex T j (Topic)
+@kindex T j @r{(Topic)}
 @findex gnus-topic-jump-to-topic
 Go to a topic (@code{gnus-topic-jump-to-topic}).
 
 @item T c
-@kindex T c (Topic)
+@kindex T c @r{(Topic)}
 @findex gnus-topic-copy-group
 Copy the current group to some other topic
 (@code{gnus-topic-copy-group}).  This command uses the process/prefix
 convention (@pxref{Process/Prefix}).
 
 @item T h
-@kindex T h (Topic)
+@kindex T h @r{(Topic)}
 @findex gnus-topic-hide-topic
 Hide the current topic (@code{gnus-topic-hide-topic}).  If given
 a prefix, hide the topic permanently.
 
 @item T s
-@kindex T s (Topic)
+@kindex T s @r{(Topic)}
 @findex gnus-topic-show-topic
 Show the current topic (@code{gnus-topic-show-topic}).  If given
 a prefix, show the topic permanently.
 
 @item T D
-@kindex T D (Topic)
+@kindex T D @r{(Topic)}
 @findex gnus-topic-remove-group
 Remove a group from the current topic (@code{gnus-topic-remove-group}).
 This command is mainly useful if you have the same group in several
@@ -3923,39 +3917,39 @@ This command uses the process/prefix convention
 (@pxref{Process/Prefix}).
 
 @item T M
-@kindex T M (Topic)
+@kindex T M @r{(Topic)}
 @findex gnus-topic-move-matching
 Move all groups that match some regular expression to a topic
 (@code{gnus-topic-move-matching}).
 
 @item T C
-@kindex T C (Topic)
+@kindex T C @r{(Topic)}
 @findex gnus-topic-copy-matching
 Copy all groups that match some regular expression to a topic
 (@code{gnus-topic-copy-matching}).
 
 @item T H
-@kindex T H (Topic)
+@kindex T H @r{(Topic)}
 @findex gnus-topic-toggle-display-empty-topics
 Toggle hiding empty topics
 (@code{gnus-topic-toggle-display-empty-topics}).
 
 @item T #
-@kindex T # (Topic)
+@kindex T # @r{(Topic)}
 @findex gnus-topic-mark-topic
 Mark all groups in the current topic with the process mark
 (@code{gnus-topic-mark-topic}).  This command works recursively on
 sub-topics unless given a prefix.
 
 @item T M-#
-@kindex T M-# (Topic)
+@kindex T M-# @r{(Topic)}
 @findex gnus-topic-unmark-topic
 Remove the process mark from all groups in the current topic
 (@code{gnus-topic-unmark-topic}).  This command works recursively on
 sub-topics unless given a prefix.
 
 @item C-c C-x
-@kindex C-c C-x (Topic)
+@kindex C-c C-x @r{(Topic)}
 @findex gnus-topic-expire-articles
 @cindex expiring mail
 Run all expirable articles in the current group or topic through the
@@ -3963,33 +3957,33 @@ expiry process (if any)
 (@code{gnus-topic-expire-articles}).  (@pxref{Expiring Mail}).
 
 @item T r
-@kindex T r (Topic)
+@kindex T r @r{(Topic)}
 @findex gnus-topic-rename
 Rename a topic (@code{gnus-topic-rename}).
 
-@item T DEL
-@kindex T DEL (Topic)
+@item T @key{DEL}
+@kindex T @key{DEL} @r{(Topic)}
 @findex gnus-topic-delete
 Delete an empty topic (@code{gnus-topic-delete}).
 
 @item A T
-@kindex A T (Topic)
+@kindex A T @r{(Topic)}
 @findex gnus-topic-list-active
 List all groups that Gnus knows about in a topics-ified way
 (@code{gnus-topic-list-active}).
 
 @item T M-n
-@kindex T M-n (Topic)
+@kindex T M-n @r{(Topic)}
 @findex gnus-topic-goto-next-topic
 Go to the next topic (@code{gnus-topic-goto-next-topic}).
 
 @item T M-p
-@kindex T M-p (Topic)
+@kindex T M-p @r{(Topic)}
 @findex gnus-topic-goto-previous-topic
 Go to the previous topic (@code{gnus-topic-goto-previous-topic}).
 
 @item G p
-@kindex G p (Topic)
+@kindex G p @r{(Topic)}
 @findex gnus-topic-edit-parameters
 @cindex group parameters
 @cindex topic parameters
@@ -4052,49 +4046,49 @@ commands:
 
 @table @kbd
 @item T S a
-@kindex T S a (Topic)
+@kindex T S a @r{(Topic)}
 @findex gnus-topic-sort-groups-by-alphabet
 Sort the current topic alphabetically by group name
 (@code{gnus-topic-sort-groups-by-alphabet}).
 
 @item T S u
-@kindex T S u (Topic)
+@kindex T S u @r{(Topic)}
 @findex gnus-topic-sort-groups-by-unread
 Sort the current topic by the number of unread articles
 (@code{gnus-topic-sort-groups-by-unread}).
 
 @item T S l
-@kindex T S l (Topic)
+@kindex T S l @r{(Topic)}
 @findex gnus-topic-sort-groups-by-level
 Sort the current topic by group level
 (@code{gnus-topic-sort-groups-by-level}).
 
 @item T S v
-@kindex T S v (Topic)
+@kindex T S v @r{(Topic)}
 @findex gnus-topic-sort-groups-by-score
 Sort the current topic by group score
 (@code{gnus-topic-sort-groups-by-score}).  @xref{Group Score}.
 
 @item T S r
-@kindex T S r (Topic)
+@kindex T S r @r{(Topic)}
 @findex gnus-topic-sort-groups-by-rank
 Sort the current topic by group rank
 (@code{gnus-topic-sort-groups-by-rank}).  @xref{Group Score}.
 
 @item T S m
-@kindex T S m (Topic)
+@kindex T S m @r{(Topic)}
 @findex gnus-topic-sort-groups-by-method
 Sort the current topic alphabetically by back end name
 (@code{gnus-topic-sort-groups-by-method}).
 
 @item T S e
-@kindex T S e (Topic)
+@kindex T S e @r{(Topic)}
 @findex gnus-topic-sort-groups-by-server
 Sort the current topic alphabetically by server name
 (@code{gnus-topic-sort-groups-by-server}).
 
 @item T S s
-@kindex T S s (Topic)
+@kindex T S s @r{(Topic)}
 @findex gnus-topic-sort-groups
 Sort the current topic according to the function(s) given by the
 @code{gnus-group-sort-function} variable
@@ -4369,7 +4363,7 @@ header will be displayed incorrectly in the article buffer.
 @table @kbd
 
 @item v
-@kindex v (Group)
+@kindex v @r{(Group)}
 @cindex keys, reserved for users (Group)
 The key @kbd{v} is reserved for users.  You can bind it to some
 command or better use it as a prefix key.  For example:
@@ -4385,13 +4379,13 @@ On keys reserved for users in Emacs and on keybindings in general
 @xref{Keymaps, Keymaps, , emacs, The Emacs Editor}.
 
 @item ^
-@kindex ^ (Group)
+@kindex ^ @r{(Group)}
 @findex gnus-group-enter-server-mode
 Enter the server buffer (@code{gnus-group-enter-server-mode}).
 @xref{Server Buffer}.
 
 @item a
-@kindex a (Group)
+@kindex a @r{(Group)}
 @findex gnus-group-post-news
 Start composing a message (a news by default)
 (@code{gnus-group-post-news}).  If given a prefix, post to the group
@@ -4401,7 +4395,7 @@ article might be a mail instead of a news, if a mail group is specified
 with the prefix argument.  @xref{Composing Messages}.
 
 @item m
-@kindex m (Group)
+@kindex m @r{(Group)}
 @findex gnus-group-mail
 Mail a message somewhere (@code{gnus-group-mail}).  If given a prefix,
 use the posting style of the group under the point.  If the prefix is 1,
@@ -4409,7 +4403,7 @@ prompt for a group name to find the posting style.
 @xref{Composing Messages}.
 
 @item i
-@kindex i (Group)
+@kindex i @r{(Group)}
 @findex gnus-group-news
 Start composing a news (@code{gnus-group-news}).  If given a prefix,
 post to the group under the point.  If the prefix is 1, prompt
@@ -4422,7 +4416,7 @@ in question.  The corresponding back end must have a request-post method
 for this to work though.
 
 @item G z
-@kindex G z (Group)
+@kindex G z @r{(Group)}
 @findex gnus-group-compact-group
 
 Compact the group under point (@code{gnus-group-compact-group}).
@@ -4467,7 +4461,7 @@ whether they are empty or not.
 @table @kbd
 
 @item g
-@kindex g (Group)
+@kindex g @r{(Group)}
 @findex gnus-group-get-new-news
 @c @icon{gnus-group-get-new-news}
 Check the server(s) for new articles.  If the numerical prefix is used,
@@ -4477,7 +4471,7 @@ command will force a total re-reading of the active file(s) from the
 back end(s).
 
 @item M-g
-@kindex M-g (Group)
+@kindex M-g @r{(Group)}
 @findex gnus-group-get-new-news-this-group
 @vindex gnus-goto-next-group-when-activating
 @c @icon{gnus-group-get-new-news-this-group}
@@ -4489,11 +4483,11 @@ to move point to the next group or not.  It is @code{t} by default.
 @findex gnus-activate-all-groups
 @cindex activating groups
 @item C-c M-g
-@kindex C-c M-g (Group)
+@kindex C-c M-g @r{(Group)}
 Activate absolutely all groups (@code{gnus-activate-all-groups}).
 
 @item R
-@kindex R (Group)
+@kindex R @r{(Group)}
 @cindex restarting
 @findex gnus-group-restart
 Restart Gnus (@code{gnus-group-restart}).  This saves the @file{.newsrc}
@@ -4521,8 +4515,8 @@ news.
 @item H d
 @itemx C-c C-d
 @c @icon{gnus-group-describe-group}
-@kindex H d (Group)
-@kindex C-c C-d (Group)
+@kindex H d @r{(Group)}
+@kindex C-c C-d @r{(Group)}
 @cindex describing groups
 @cindex group description
 @findex gnus-group-describe-group
@@ -4530,26 +4524,26 @@ Describe the current group (@code{gnus-group-describe-group}).  If given
 a prefix, force Gnus to re-read the description from the server.
 
 @item M-d
-@kindex M-d (Group)
+@kindex M-d @r{(Group)}
 @findex gnus-group-describe-all-groups
 Describe all groups (@code{gnus-group-describe-all-groups}).  If given a
 prefix, force Gnus to re-read the description file from the server.
 
 @item H v
 @itemx V
-@kindex V (Group)
-@kindex H v (Group)
+@kindex V @r{(Group)}
+@kindex H v @r{(Group)}
 @cindex version
 @findex gnus-version
 Display current Gnus version numbers (@code{gnus-version}).
 
 @item ?
-@kindex ? (Group)
+@kindex ? @r{(Group)}
 @findex gnus-group-describe-briefly
 Give a very short help message (@code{gnus-group-describe-briefly}).
 
 @item C-c C-i
-@kindex C-c C-i (Group)
+@kindex C-c C-i @r{(Group)}
 @cindex info
 @cindex manual
 @findex gnus-info-find-node
@@ -4623,7 +4617,7 @@ either.
 @table @kbd
 
 @item r
-@kindex r (Group)
+@kindex r @r{(Group)}
 @findex gnus-group-read-init-file
 @vindex gnus-init-file
 @cindex reading init file
@@ -4631,7 +4625,7 @@ Re-read the init file (@code{gnus-init-file}, which defaults to
 @file{~/.gnus.el}) (@code{gnus-group-read-init-file}).
 
 @item s
-@kindex s (Group)
+@kindex s @r{(Group)}
 @findex gnus-group-save-newsrc
 @cindex saving .newsrc
 Save the @file{.newsrc.eld} file (and @file{.newsrc} if wanted)
@@ -4639,7 +4633,7 @@ Save the @file{.newsrc.eld} file (and @file{.newsrc} if wanted)
 file(s) whether Gnus thinks it is necessary or not.
 
 @c @item Z
-@c @kindex Z (Group)
+@c @kindex Z @r{(Group)}
 @c @findex gnus-group-clear-dribble
 @c Clear the dribble buffer (@code{gnus-group-clear-dribble}).
 
@@ -4689,7 +4683,7 @@ if address "sender" "owner-ding@@hpc.uh.edu" @{
 @table @kbd
 
 @item D g
-@kindex D g (Group)
+@kindex D g @r{(Group)}
 @findex gnus-sieve-generate
 @vindex gnus-sieve-file
 @cindex generating sieve script
@@ -4697,7 +4691,7 @@ Regenerate a Sieve script from the @code{sieve} group parameters and
 put you into the @code{gnus-sieve-file} without saving it.
 
 @item D u
-@kindex D u (Group)
+@kindex D u @r{(Group)}
 @findex gnus-sieve-update
 @vindex gnus-sieve-file
 @cindex updating sieve script
@@ -4721,10 +4715,10 @@ group buffer (@pxref{Selecting a Group}).
 You can have as many summary buffers open as you wish.
 
 You can customize the Summary Mode tool bar, see @kbd{M-x
-customize-apropos RET gnus-summary-tool-bar}.  This feature is only
+customize-apropos @key{RET} gnus-summary-tool-bar}.  This feature is only
 available in Emacs.
 
-@kindex v (Summary)
+@kindex v @r{(Summary)}
 @cindex keys, reserved for users (Summary)
 The key @kbd{v} is reserved for users.  You can bind it to some
 command or better use it as a prefix key.  For example:
@@ -5204,22 +5198,22 @@ None of these commands select articles.
 @table @kbd
 @item G M-n
 @itemx M-n
-@kindex M-n (Summary)
-@kindex G M-n (Summary)
+@kindex M-n @r{(Summary)}
+@kindex G M-n @r{(Summary)}
 @findex gnus-summary-next-unread-subject
 Go to the next summary line of an unread article
 (@code{gnus-summary-next-unread-subject}).
 
 @item G M-p
 @itemx M-p
-@kindex M-p (Summary)
-@kindex G M-p (Summary)
+@kindex M-p @r{(Summary)}
+@kindex G M-p @r{(Summary)}
 @findex gnus-summary-prev-unread-subject
 Go to the previous summary line of an unread article
 (@code{gnus-summary-prev-unread-subject}).
 
 @item G g
-@kindex G g (Summary)
+@kindex G g @r{(Summary)}
 @findex gnus-summary-goto-subject
 Ask for an article number and then go to the summary line of that article
 without displaying the article (@code{gnus-summary-goto-subject}).
@@ -5281,7 +5275,7 @@ the given number of lines from the top.
 @item gnus-summary-stop-at-end-of-message
 @vindex gnus-summary-stop-at-end-of-message
 If non-@code{nil}, don't go to the next article when hitting
-@kbd{SPC}, and you're at the end of the article.
+@kbd{@key{SPC}}, and you're at the end of the article.
 
 @end table
 
@@ -5306,69 +5300,69 @@ If you want to fetch new articles or redisplay the group, see
 @ref{Exiting the Summary Buffer}.
 
 @table @kbd
-@item SPACE
-@kindex SPACE (Summary)
+@item @key{SPC}
+@kindex @key{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}).
 
-If you have an article window open already and you press @kbd{SPACE}
+If you have an article window open already and you press @kbd{@key{SPC}}
 again, the article will be scrolled.  This lets you conveniently
-@kbd{SPACE} through an entire newsgroup.  @xref{Paging the Article}.
+@kbd{@key{SPC}} through an entire newsgroup.  @xref{Paging the Article}.
 
 @item G n
 @itemx n
-@kindex n (Summary)
-@kindex G n (Summary)
+@kindex n @r{(Summary)}
+@kindex G n @r{(Summary)}
 @findex gnus-summary-next-unread-article
 @c @icon{gnus-summary-next-unread}
 Go to next unread article (@code{gnus-summary-next-unread-article}).
 
 @item G p
 @itemx p
-@kindex p (Summary)
+@kindex p @r{(Summary)}
 @findex gnus-summary-prev-unread-article
 @c @icon{gnus-summary-prev-unread}
 Go to previous unread article (@code{gnus-summary-prev-unread-article}).
 
 @item G N
 @itemx N
-@kindex N (Summary)
-@kindex G N (Summary)
+@kindex N @r{(Summary)}
+@kindex G N @r{(Summary)}
 @findex gnus-summary-next-article
 Go to the next article (@code{gnus-summary-next-article}).
 
 @item G P
 @itemx P
-@kindex P (Summary)
-@kindex G P (Summary)
+@kindex P @r{(Summary)}
+@kindex G P @r{(Summary)}
 @findex gnus-summary-prev-article
 Go to the previous article (@code{gnus-summary-prev-article}).
 
 @item G C-n
-@kindex G C-n (Summary)
+@kindex G C-n @r{(Summary)}
 @findex gnus-summary-next-same-subject
 Go to the next article with the same subject
 (@code{gnus-summary-next-same-subject}).
 
 @item G C-p
-@kindex G C-p (Summary)
+@kindex G C-p @r{(Summary)}
 @findex gnus-summary-prev-same-subject
 Go to the previous article with the same subject
 (@code{gnus-summary-prev-same-subject}).
 
 @item G f
 @itemx .
-@kindex G f  (Summary)
-@kindex .  (Summary)
+@kindex G f  @r{(Summary)}
+@kindex .  @r{(Summary)}
 @findex gnus-summary-first-unread-article
 Go to the first unread article
 (@code{gnus-summary-first-unread-article}).
 
 @item G b
 @itemx ,
-@kindex G b (Summary)
-@kindex , (Summary)
+@kindex G b @r{(Summary)}
+@kindex , @r{(Summary)}
 @findex gnus-summary-best-unread-article
 Go to the unread article with the highest score
 (@code{gnus-summary-best-unread-article}).  If given a prefix argument,
@@ -5376,13 +5370,13 @@ go to the first unread article that has a score over the default score.
 
 @item G l
 @itemx l
-@kindex l (Summary)
-@kindex G l (Summary)
+@kindex l @r{(Summary)}
+@kindex G l @r{(Summary)}
 @findex gnus-summary-goto-last-article
 Go to the previous article read (@code{gnus-summary-goto-last-article}).
 
 @item G o
-@kindex G o (Summary)
+@kindex G o @r{(Summary)}
 @findex gnus-summary-pop-article
 @cindex history
 @cindex article history
@@ -5395,8 +5389,8 @@ For a somewhat related issue (if you use these commands a lot),
 
 @item G j
 @itemx j
-@kindex j (Summary)
-@kindex G j (Summary)
+@kindex j @r{(Summary)}
+@kindex G j @r{(Summary)}
 @findex gnus-summary-goto-article
 Ask for an article number or @code{Message-ID}, and then go to that
 article (@code{gnus-summary-goto-article}).
@@ -5448,10 +5442,10 @@ instead.  It will leave marks like @code{gnus-low-score-mark},
 
 @table @kbd
 
-@item SPACE
-@kindex SPACE (Summary)
+@item @key{SPC}
+@kindex @key{SPC} @r{(Summary)}
 @findex gnus-summary-next-page
-Pressing @kbd{SPACE} will scroll the current article forward one 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
 next article (@code{gnus-summary-next-page}).
 
@@ -5464,27 +5458,27 @@ what is considered uninteresting with
 @code{gnus-article-boring-faces}.  You can manually view the article's
 pages, no matter how boring, using @kbd{C-M-v}.
 
-@item DEL
-@kindex DEL (Summary)
+@item @key{DEL}
+@kindex @key{DEL} @r{(Summary)}
 @findex gnus-summary-prev-page
 Scroll the current article back one page (@code{gnus-summary-prev-page}).
 
-@item RET
-@kindex RET (Summary)
+@item @key{RET}
+@kindex @key{RET} @r{(Summary)}
 @findex gnus-summary-scroll-up
 Scroll the current article one line forward
 (@code{gnus-summary-scroll-up}).
 
-@item M-RET
-@kindex M-RET (Summary)
+@item M-@key{RET}
+@kindex M-@key{RET} @r{(Summary)}
 @findex gnus-summary-scroll-down
 Scroll the current article one line backward
 (@code{gnus-summary-scroll-down}).
 
 @item A g
 @itemx g
-@kindex A g (Summary)
-@kindex g (Summary)
+@kindex A g @r{(Summary)}
+@kindex g @r{(Summary)}
 @findex gnus-summary-show-article
 @vindex gnus-summary-show-article-charset-alist
 (Re)fetch the current article (@code{gnus-summary-show-article}).  If
@@ -5495,7 +5489,7 @@ treatment functions.
 
 @cindex charset, view article with different charset
 If given a numerical prefix, you can do semi-manual charset stuff.
-@kbd{C-u 0 g cn-gb-2312 RET} will decode the message as if it were
+@kbd{C-u 0 g cn-gb-2312 @key{RET}} will decode the message as if it were
 encoded in the @code{cn-gb-2312} charset.  If you have
 
 @lisp
@@ -5508,29 +5502,29 @@ then you can say @kbd{C-u 1 g} to get the same effect.
 
 @item A <
 @itemx <
-@kindex < (Summary)
-@kindex A < (Summary)
+@kindex < @r{(Summary)}
+@kindex A < @r{(Summary)}
 @findex gnus-summary-beginning-of-article
 Scroll to the beginning of the article
 (@code{gnus-summary-beginning-of-article}).
 
 @item A >
 @itemx >
-@kindex > (Summary)
-@kindex A > (Summary)
+@kindex > @r{(Summary)}
+@kindex A > @r{(Summary)}
 @findex gnus-summary-end-of-article
 Scroll to the end of the article (@code{gnus-summary-end-of-article}).
 
 @item A s
 @itemx s
-@kindex A s (Summary)
-@kindex s (Summary)
+@kindex A s @r{(Summary)}
+@kindex s @r{(Summary)}
 @findex gnus-summary-isearch-article
 Perform an isearch in the article buffer
 (@code{gnus-summary-isearch-article}).
 
 @item h
-@kindex h (Summary)
+@kindex h @r{(Summary)}
 @findex gnus-summary-select-article-buffer
 Select the article buffer (@code{gnus-summary-select-article-buffer}).
 
@@ -5559,8 +5553,8 @@ Commands for composing a mail message:
 
 @item S r
 @itemx r
-@kindex S r (Summary)
-@kindex r (Summary)
+@kindex S r @r{(Summary)}
+@kindex r @r{(Summary)}
 @findex gnus-summary-reply
 @c @icon{gnus-summary-mail-reply}
 @c @icon{gnus-summary-reply}
@@ -5569,8 +5563,8 @@ Mail a reply to the author of the current article
 
 @item S R
 @itemx R
-@kindex R (Summary)
-@kindex S R (Summary)
+@kindex R @r{(Summary)}
+@kindex S R @r{(Summary)}
 @findex gnus-summary-reply-with-original
 @c @icon{gnus-summary-reply-with-original}
 Mail a reply to the author of the current article and include the
@@ -5578,7 +5572,7 @@ original message (@code{gnus-summary-reply-with-original}).  This
 command uses the process/prefix convention.
 
 @item S w
-@kindex S w (Summary)
+@kindex S w @r{(Summary)}
 @findex gnus-summary-wide-reply
 Mail a wide reply to the author of the current article
 (@code{gnus-summary-wide-reply}).  A @dfn{wide reply} is a reply that
@@ -5587,7 +5581,7 @@ goes out to all people listed in the @code{To}, @code{From} (or
 present, that's used instead.
 
 @item S W
-@kindex S W (Summary)
+@kindex S W @r{(Summary)}
 @findex gnus-summary-wide-reply-with-original
 Mail a wide reply to the current article and include the original
 message (@code{gnus-summary-wide-reply-with-original}).  This command uses
@@ -5595,14 +5589,14 @@ the process/prefix convention, but only uses the headers from the
 first article to determine the recipients.
 
 @item S L
-@kindex S L (Summary)
+@kindex S L @r{(Summary)}
 @findex gnus-summary-reply-to-list-with-original
 When replying to a message from a mailing list, send a reply to that
 message to the mailing list, and include the original message
 (@code{gnus-summary-reply-to-list-with-original}).
 
 @item S v
-@kindex S v (Summary)
+@kindex S v @r{(Summary)}
 @findex gnus-summary-very-wide-reply
 Mail a very wide reply to the author of the current article
 (@code{gnus-summary-wide-reply}).  A @dfn{very wide reply} is a reply
@@ -5611,14 +5605,14 @@ that goes out to all people listed in the @code{To}, @code{From} (or
 articles.  This command uses the process/prefix convention.
 
 @item S V
-@kindex S V (Summary)
+@kindex S V @r{(Summary)}
 @findex gnus-summary-very-wide-reply-with-original
 Mail a very wide reply to the author of the current article and include the
 original message (@code{gnus-summary-very-wide-reply-with-original}).  This
 command uses the process/prefix convention.
 
 @item S B r
-@kindex S B r (Summary)
+@kindex S B r @r{(Summary)}
 @findex gnus-summary-reply-broken-reply-to
 Mail a reply to the author of the current article but ignore the
 @code{Reply-To} field (@code{gnus-summary-reply-broken-reply-to}).
@@ -5628,7 +5622,7 @@ the @code{broken-reply-to} group parameter instead, so things will work
 correctly.  @xref{Group Parameters}.
 
 @item S B R
-@kindex S B R (Summary)
+@kindex S B R @r{(Summary)}
 @findex gnus-summary-reply-broken-reply-to-with-original
 Mail a reply to the author of the current article and include the
 original message but ignore the @code{Reply-To} field
@@ -5636,8 +5630,8 @@ original message but ignore the @code{Reply-To} field
 
 @item S o m
 @itemx C-c C-f
-@kindex S o m (Summary)
-@kindex C-c C-f (Summary)
+@kindex S o m @r{(Summary)}
+@kindex C-c C-f @r{(Summary)}
 @findex gnus-summary-mail-forward
 @c @icon{gnus-summary-mail-forward}
 Forward the current article to some other person
@@ -5654,8 +5648,8 @@ section.
 
 @item S m
 @itemx m
-@kindex m (Summary)
-@kindex S m (Summary)
+@kindex m @r{(Summary)}
+@kindex S m @r{(Summary)}
 @findex gnus-summary-mail-other-window
 @c @icon{gnus-summary-mail-originate}
 Prepare a mail (@code{gnus-summary-mail-other-window}).  By default, use
@@ -5663,7 +5657,7 @@ the posting style of the current group.  If given a prefix, disable that.
 If the prefix is 1, prompt for a group name to find the posting style.
 
 @item S i
-@kindex S i (Summary)
+@kindex S i @r{(Summary)}
 @findex gnus-summary-news-other-window
 Prepare a news (@code{gnus-summary-news-other-window}).  By default,
 post to the current group.  If given a prefix, disable that.  If the
@@ -5676,7 +5670,7 @@ in question.  The corresponding back end must have a request-post method
 for this to work though.
 
 @item S D b
-@kindex S D b (Summary)
+@kindex S D b @r{(Summary)}
 @findex gnus-summary-resend-bounced-mail
 @cindex bouncing mail
 If you have sent a mail, but the mail was bounced back to you for some
@@ -5689,7 +5683,7 @@ that mail and display it for easy perusal of its headers.  This might
 very well fail, though.
 
 @item S D r
-@kindex S D r (Summary)
+@kindex S D r @r{(Summary)}
 @findex gnus-summary-resend-message
 Not to be confused with the previous command,
 @code{gnus-summary-resend-message} will prompt you for an address to
@@ -5710,21 +5704,21 @@ This command understands the process/prefix convention
 (@pxref{Process/Prefix}).
 
 @item S D e
-@kindex S D e (Summary)
+@kindex S D e @r{(Summary)}
 @findex gnus-summary-resend-message-edit
 
 Like the previous command, but will allow you to edit the message as
 if it were a new message before resending.
 
 @item S O m
-@kindex S O m (Summary)
+@kindex S O m @r{(Summary)}
 @findex gnus-uu-digest-mail-forward
 Digest the current series (@pxref{Decoding Articles}) and forward the
 result using mail (@code{gnus-uu-digest-mail-forward}).  This command
 uses the process/prefix convention (@pxref{Process/Prefix}).
 
 @item S M-c
-@kindex S M-c (Summary)
+@kindex S M-c @r{(Summary)}
 @findex gnus-summary-mail-crosspost-complaint
 @cindex crossposting
 @cindex excessive crossposting
@@ -5754,8 +5748,8 @@ Commands for posting a news article:
 @table @kbd
 @item S p
 @itemx a
-@kindex a (Summary)
-@kindex S p (Summary)
+@kindex a @r{(Summary)}
+@kindex S p @r{(Summary)}
 @findex gnus-summary-post-news
 @c @icon{gnus-summary-post-news}
 Prepare for posting an article (@code{gnus-summary-post-news}).  By
@@ -5764,16 +5758,16 @@ If the prefix is 1, prompt for another group instead.
 
 @item S f
 @itemx f
-@kindex f (Summary)
-@kindex S f (Summary)
+@kindex f @r{(Summary)}
+@kindex S f @r{(Summary)}
 @findex gnus-summary-followup
 @c @icon{gnus-summary-followup}
 Post a followup to the current article (@code{gnus-summary-followup}).
 
 @item S F
 @itemx F
-@kindex S F (Summary)
-@kindex F (Summary)
+@kindex S F @r{(Summary)}
+@kindex F @r{(Summary)}
 @c @icon{gnus-summary-followup-with-original}
 @findex gnus-summary-followup-with-original
 Post a followup to the current article and include the original message
@@ -5781,13 +5775,13 @@ Post a followup to the current article and include the original message
 process/prefix convention.
 
 @item S n
-@kindex S n (Summary)
+@kindex S n @r{(Summary)}
 @findex gnus-summary-followup-to-mail
 Post a followup to the current article via news, even if you got the
 message through mail (@code{gnus-summary-followup-to-mail}).
 
 @item S N
-@kindex S N (Summary)
+@kindex S N @r{(Summary)}
 @findex gnus-summary-followup-to-mail-with-original
 Post a followup to the current article via news, even if you got the
 message through mail and include the original message
@@ -5795,7 +5789,7 @@ message through mail and include the original message
 the process/prefix convention.
 
 @item S o p
-@kindex S o p (Summary)
+@kindex S o p @r{(Summary)}
 @findex gnus-summary-post-forward
 Forward the current article to a newsgroup
 (@code{gnus-summary-post-forward}).
@@ -5810,7 +5804,7 @@ but use the flipped value of (@code{message-forward-as-mime}).  By
 default, the message is decoded and forwarded as an rfc822 @acronym{MIME} section.
 
 @item S O p
-@kindex S O p (Summary)
+@kindex S O p @r{(Summary)}
 @findex gnus-uu-digest-post-forward
 @cindex digests
 @cindex making digests
@@ -5819,7 +5813,7 @@ Digest the current series and forward the result to a newsgroup
 process/prefix convention.
 
 @item S u
-@kindex S u (Summary)
+@kindex S u @r{(Summary)}
 @findex gnus-uu-post-news
 @c @icon{gnus-uu-post-news}
 Uuencode a file, split it into parts, and post it as a series
@@ -5835,7 +5829,7 @@ Manual}, for more information.
 
 @table @kbd
 @item S y
-@kindex S y (Summary)
+@kindex S y @r{(Summary)}
 @findex gnus-summary-yank-message
 Yank the current article into an already existing Message composition
 buffer (@code{gnus-summary-yank-message}).  This command prompts for
@@ -5856,7 +5850,7 @@ really, really wish you hadn't posted that?
 Well, you can't cancel mail, but you can cancel posts.
 
 @findex gnus-summary-cancel-article
-@kindex C (Summary)
+@kindex C @r{(Summary)}
 @c @icon{gnus-summary-cancel-article}
 Find the article you wish to cancel (you can only cancel your own
 articles, so don't try any funny stuff).  Then press @kbd{C} or @kbd{S
@@ -5881,7 +5875,7 @@ corrections, you can post a @dfn{superseding} article that will replace
 your original article.
 
 @findex gnus-summary-supersede-article
-@kindex S (Summary)
+@kindex S @r{(Summary)}
 Go to the original article and press @kbd{S s}
 (@code{gnus-summary-supersede-article}).  You will be put in a buffer
 where you can edit the article all you want before sending it off the
@@ -6064,7 +6058,7 @@ followups, you can use the @kbd{/ D} command (@pxref{Limiting}).
 Otherwise (except for the visibility issue), they are just like ticked
 messages.
 
-@item SPACE
+@item @key{SPC}
 @vindex gnus-unread-mark
 Marked as unread (@code{gnus-unread-mark}).
 
@@ -6248,8 +6242,8 @@ All the marking commands understand the numeric prefix.
 @table @kbd
 @item M c
 @itemx M-u
-@kindex M c (Summary)
-@kindex M-u (Summary)
+@kindex M c @r{(Summary)}
+@kindex M-u @r{(Summary)}
 @findex gnus-summary-clear-mark-forward
 @cindex mark as unread
 Clear all readedness-marks from the current article
@@ -6258,38 +6252,38 @@ article as unread.
 
 @item M t
 @itemx !
-@kindex ! (Summary)
-@kindex M t (Summary)
+@kindex ! @r{(Summary)}
+@kindex M t @r{(Summary)}
 @findex gnus-summary-tick-article-forward
 Tick the current article (@code{gnus-summary-tick-article-forward}).
 @xref{Article Caching}.
 
 @item M ?
 @itemx ?
-@kindex ? (Summary)
-@kindex M ? (Summary)
+@kindex ? @r{(Summary)}
+@kindex M ? @r{(Summary)}
 @findex gnus-summary-mark-as-dormant
 Mark the current article as dormant
 (@code{gnus-summary-mark-as-dormant}).  @xref{Article Caching}.
 
 @item M d
 @itemx d
-@kindex M d (Summary)
-@kindex d (Summary)
+@kindex M d @r{(Summary)}
+@kindex d @r{(Summary)}
 @findex gnus-summary-mark-as-read-forward
 Mark the current article as read
 (@code{gnus-summary-mark-as-read-forward}).
 
 @item D
-@kindex D (Summary)
+@kindex D @r{(Summary)}
 @findex gnus-summary-mark-as-read-backward
 Mark the current article as read and move point to the previous line
 (@code{gnus-summary-mark-as-read-backward}).
 
 @item M k
 @itemx k
-@kindex k (Summary)
-@kindex M k (Summary)
+@kindex k @r{(Summary)}
+@kindex M k @r{(Summary)}
 @findex gnus-summary-kill-same-subject-and-select
 Mark all articles that have the same subject as the current one as read,
 and then select the next unread article
@@ -6297,82 +6291,82 @@ and then select the next unread article
 
 @item M K
 @itemx C-k
-@kindex M K (Summary)
-@kindex C-k (Summary)
+@kindex M K @r{(Summary)}
+@kindex C-k @r{(Summary)}
 @findex gnus-summary-kill-same-subject
 Mark all articles that have the same subject as the current one as read
 (@code{gnus-summary-kill-same-subject}).
 
 @item M C
-@kindex M C (Summary)
+@kindex M C @r{(Summary)}
 @findex gnus-summary-catchup
 @c @icon{gnus-summary-catchup}
 Mark all unread articles as read (@code{gnus-summary-catchup}).
 
 @item M C-c
-@kindex M C-c (Summary)
+@kindex M C-c @r{(Summary)}
 @findex gnus-summary-catchup-all
 Mark all articles in the group as read---even the ticked and dormant
 articles (@code{gnus-summary-catchup-all}).
 
 @item M H
-@kindex M H (Summary)
+@kindex M H @r{(Summary)}
 @findex gnus-summary-catchup-to-here
 Catchup the current group to point (before the point)
 (@code{gnus-summary-catchup-to-here}).
 
 @item M h
-@kindex M h (Summary)
+@kindex M h @r{(Summary)}
 @findex gnus-summary-catchup-from-here
 Catchup the current group from point (after the point)
 (@code{gnus-summary-catchup-from-here}).
 
 @item C-w
-@kindex C-w (Summary)
+@kindex C-w @r{(Summary)}
 @findex gnus-summary-mark-region-as-read
 Mark all articles between point and mark as read
 (@code{gnus-summary-mark-region-as-read}).
 
 @item M V k
-@kindex M V k (Summary)
+@kindex M V k @r{(Summary)}
 @findex gnus-summary-kill-below
 Kill all articles with scores below the default score (or below the
 numeric prefix) (@code{gnus-summary-kill-below}).
 
 @item M e
 @itemx E
-@kindex M e (Summary)
-@kindex E (Summary)
+@kindex M e @r{(Summary)}
+@kindex E @r{(Summary)}
 @findex gnus-summary-mark-as-expirable
 Mark the current article as expirable
 (@code{gnus-summary-mark-as-expirable}).
 
 @item M b
-@kindex M b (Summary)
+@kindex M b @r{(Summary)}
 @findex gnus-summary-set-bookmark
 Set a bookmark in the current article
 (@code{gnus-summary-set-bookmark}).
 
 @item M B
-@kindex M B (Summary)
+@kindex M B @r{(Summary)}
 @findex gnus-summary-remove-bookmark
 Remove the bookmark from the current article
 (@code{gnus-summary-remove-bookmark}).
 
 @item M V c
-@kindex M V c (Summary)
+@kindex M V c @r{(Summary)}
 @findex gnus-summary-clear-above
 Clear all marks from articles with scores over the default score (or
 over the numeric prefix) (@code{gnus-summary-clear-above}).
 
 @item M V u
-@kindex M V u (Summary)
+@kindex M V u @r{(Summary)}
 @findex gnus-summary-tick-above
 Tick all articles with scores over the default score (or over the
 numeric prefix) (@code{gnus-summary-tick-above}).
 
 @item M V m
-@kindex M V m (Summary)
+@kindex M V m @r{(Summary)}
 @findex gnus-summary-mark-above
 Prompt for a mark, and mark all articles with scores over the default
 score (or over the numeric prefix) with this mark
@@ -6385,7 +6379,7 @@ be taken after setting a mark.  If non-@code{nil}, point will move to
 the next/previous unread article.  If @code{nil}, point will just move
 one line up or down.  As a special case, if this variable is
 @code{never}, all the marking commands as well as other commands (like
-@kbd{SPACE}) will move to the next article, whether it is unread or not.
+@kbd{@key{SPC}}) will move to the next article, whether it is unread or not.
 The default is @code{t}.
 
 
@@ -6445,8 +6439,8 @@ articles into the cache.  For more information,
 
 @item M P p
 @itemx #
-@kindex # (Summary)
-@kindex M P p (Summary)
+@kindex # @r{(Summary)}
+@kindex M P p @r{(Summary)}
 @findex gnus-summary-mark-as-processable
 Mark the current article with the process mark
 (@code{gnus-summary-mark-as-processable}).
@@ -6454,99 +6448,99 @@ Mark the current article with the process mark
 
 @item M P u
 @itemx M-#
-@kindex M P u (Summary)
-@kindex M-# (Summary)
+@kindex M P u @r{(Summary)}
+@kindex M-# @r{(Summary)}
 Remove the process mark, if any, from the current article
 (@code{gnus-summary-unmark-as-processable}).
 
 @item M P U
-@kindex M P U (Summary)
+@kindex M P U @r{(Summary)}
 @findex gnus-summary-unmark-all-processable
 Remove the process mark from all articles
 (@code{gnus-summary-unmark-all-processable}).
 
 @item M P i
-@kindex M P i (Summary)
+@kindex M P i @r{(Summary)}
 @findex gnus-uu-invert-processable
 Invert the list of process marked articles
 (@code{gnus-uu-invert-processable}).
 
 @item M P R
-@kindex M P R (Summary)
+@kindex M P R @r{(Summary)}
 @findex gnus-uu-mark-by-regexp
 Mark articles that have a @code{Subject} header that matches a regular
 expression (@code{gnus-uu-mark-by-regexp}).
 
 @item M P G
-@kindex M P G (Summary)
+@kindex M P G @r{(Summary)}
 @findex gnus-uu-unmark-by-regexp
 Unmark articles that have a @code{Subject} header that matches a regular
 expression (@code{gnus-uu-unmark-by-regexp}).
 
 @item M P r
-@kindex M P r (Summary)
+@kindex M P r @r{(Summary)}
 @findex gnus-uu-mark-region
 Mark articles in region (@code{gnus-uu-mark-region}).
 
 @item M P g
-@kindex M P g (Summary)
+@kindex M P g @r{(Summary)}
 @findex gnus-uu-unmark-region
 Unmark articles in region (@code{gnus-uu-unmark-region}).
 
 @item M P t
-@kindex M P t (Summary)
+@kindex M P t @r{(Summary)}
 @findex gnus-uu-mark-thread
 Mark all articles in the current (sub)thread
 (@code{gnus-uu-mark-thread}).
 
 @item M P T
-@kindex M P T (Summary)
+@kindex M P T @r{(Summary)}
 @findex gnus-uu-unmark-thread
 Unmark all articles in the current (sub)thread
 (@code{gnus-uu-unmark-thread}).
 
 @item M P v
-@kindex M P v (Summary)
+@kindex M P v @r{(Summary)}
 @findex gnus-uu-mark-over
 Mark all articles that have a score above the prefix argument
 (@code{gnus-uu-mark-over}).
 
 @item M P s
-@kindex M P s (Summary)
+@kindex M P s @r{(Summary)}
 @findex gnus-uu-mark-series
 Mark all articles in the current series (@code{gnus-uu-mark-series}).
 
 @item M P S
-@kindex M P S (Summary)
+@kindex M P S @r{(Summary)}
 @findex gnus-uu-mark-sparse
 Mark all series that have already had some articles marked
 (@code{gnus-uu-mark-sparse}).
 
 @item M P a
-@kindex M P a (Summary)
+@kindex M P a @r{(Summary)}
 @findex gnus-uu-mark-all
 Mark all articles in series order (@code{gnus-uu-mark-all}).
 
 @item M P b
-@kindex M P b (Summary)
+@kindex M P b @r{(Summary)}
 @findex gnus-uu-mark-buffer
 Mark all articles in the buffer in the order they appear
 (@code{gnus-uu-mark-buffer}).
 
 @item M P k
-@kindex M P k (Summary)
+@kindex M P k @r{(Summary)}
 @findex gnus-summary-kill-process-mark
 Push the current process mark set onto the stack and unmark all articles
 (@code{gnus-summary-kill-process-mark}).
 
 @item M P y
-@kindex M P y (Summary)
+@kindex M P y @r{(Summary)}
 @findex gnus-summary-yank-process-mark
 Pop the previous process mark set from the stack and restore it
 (@code{gnus-summary-yank-process-mark}).
 
 @item M P w
-@kindex M P w (Summary)
+@kindex M P w @r{(Summary)}
 @findex gnus-summary-save-process-mark
 Push the current process mark set onto the stack
 (@code{gnus-summary-save-process-mark}).
@@ -6574,42 +6568,42 @@ articles.
 
 @item / /
 @itemx / s
-@kindex / / (Summary)
+@kindex / / @r{(Summary)}
 @findex gnus-summary-limit-to-subject
 Limit the summary buffer to articles that match some subject
 (@code{gnus-summary-limit-to-subject}).  If given a prefix, exclude
 matching articles.
 
 @item / a
-@kindex / a (Summary)
+@kindex / a @r{(Summary)}
 @findex gnus-summary-limit-to-author
 Limit the summary buffer to articles that match some author
 (@code{gnus-summary-limit-to-author}).  If given a prefix, exclude
 matching articles.
 
 @item / R
-@kindex / R (Summary)
+@kindex / R @r{(Summary)}
 @findex gnus-summary-limit-to-recipient
 Limit the summary buffer to articles that match some recipient
 (@code{gnus-summary-limit-to-recipient}).  If given a prefix, exclude
 matching articles.
 
 @item / A
-@kindex / A (Summary)
+@kindex / A @r{(Summary)}
 @findex gnus-summary-limit-to-address
 Limit the summary buffer to articles in which contents of From, To or Cc
 header match a given address (@code{gnus-summary-limit-to-address}).  If
 given a prefix, exclude matching articles.
 
 @item / S
-@kindex / S (Summary)
+@kindex / S @r{(Summary)}
 @findex gnus-summary-limit-to-singletons
 Limit the summary buffer to articles that aren't part of any displayed
 threads (@code{gnus-summary-limit-to-singletons}).  If given a prefix,
 limit to articles that are part of displayed threads.
 
 @item / x
-@kindex / x (Summary)
+@kindex / x @r{(Summary)}
 @findex gnus-summary-limit-to-extra
 Limit the summary buffer to articles that match one of the ``extra''
 headers (@pxref{To From Newsgroups})
@@ -6618,8 +6612,8 @@ matching articles.
 
 @item / u
 @itemx x
-@kindex / u (Summary)
-@kindex x (Summary)
+@kindex / u @r{(Summary)}
+@kindex x @r{(Summary)}
 @findex gnus-summary-limit-to-unread
 Limit the summary buffer to articles not marked as read
 (@code{gnus-summary-limit-to-unread}).  If given a prefix, limit the
@@ -6627,46 +6621,46 @@ buffer to articles strictly unread.  This means that ticked and
 dormant articles will also be excluded.
 
 @item / m
-@kindex / m (Summary)
+@kindex / m @r{(Summary)}
 @findex gnus-summary-limit-to-marks
 Ask for a mark and then limit to all articles that have been marked
 with that mark (@code{gnus-summary-limit-to-marks}).
 
 @item / t
-@kindex / t (Summary)
+@kindex / t @r{(Summary)}
 @findex gnus-summary-limit-to-age
 Ask for a number and then limit the summary buffer to articles older than (or equal to) that number of days
 (@code{gnus-summary-limit-to-age}).  If given a prefix, limit to
 articles younger than that number of days.
 
 @item / n
-@kindex / n (Summary)
+@kindex / n @r{(Summary)}
 @findex gnus-summary-limit-to-articles
 With prefix @samp{n}, limit the summary buffer to the next @samp{n}
 articles.  If not given a prefix, use the process marked articles
 instead.  (@code{gnus-summary-limit-to-articles}).
 
 @item / w
-@kindex / w (Summary)
+@kindex / w @r{(Summary)}
 @findex gnus-summary-pop-limit
 Pop the previous limit off the stack and restore it
 (@code{gnus-summary-pop-limit}).  If given a prefix, pop all limits off
 the stack.
 
 @item / .
-@kindex / . (Summary)
+@kindex / . @r{(Summary)}
 @findex gnus-summary-limit-to-unseen
 Limit the summary buffer to the unseen articles
 (@code{gnus-summary-limit-to-unseen}).
 
 @item / v
-@kindex / v (Summary)
+@kindex / v @r{(Summary)}
 @findex gnus-summary-limit-to-score
 Limit the summary buffer to articles that have a score at or above some
 score (@code{gnus-summary-limit-to-score}).
 
 @item / p
-@kindex / p (Summary)
+@kindex / p @r{(Summary)}
 @findex gnus-summary-limit-to-display-predicate
 Limit the summary buffer to articles that satisfy the @code{display}
 group parameter predicate
@@ -6674,7 +6668,7 @@ group parameter predicate
 Parameters}, for more on this predicate.
 
 @item / r
-@kindex / r (Summary)
+@kindex / r @r{(Summary)}
 @findex gnus-summary-limit-to-replied
 Limit the summary buffer to replied articles
 (@code{gnus-summary-limit-to-replied}).  If given a prefix, exclude
@@ -6682,55 +6676,55 @@ replied articles.
 
 @item / E
 @itemx M S
-@kindex M S (Summary)
-@kindex / E (Summary)
+@kindex M S @r{(Summary)}
+@kindex / E @r{(Summary)}
 @findex gnus-summary-limit-include-expunged
 Include all expunged articles in the limit
 (@code{gnus-summary-limit-include-expunged}).
 
 @item / D
-@kindex / D (Summary)
+@kindex / D @r{(Summary)}
 @findex gnus-summary-limit-include-dormant
 Include all dormant articles in the limit
 (@code{gnus-summary-limit-include-dormant}).
 
 @item / *
-@kindex / * (Summary)
+@kindex / * @r{(Summary)}
 @findex gnus-summary-limit-include-cached
 Include all cached articles in the limit
 (@code{gnus-summary-limit-include-cached}).
 
 @item / d
-@kindex / d (Summary)
+@kindex / d @r{(Summary)}
 @findex gnus-summary-limit-exclude-dormant
 Exclude all dormant articles from the limit
 (@code{gnus-summary-limit-exclude-dormant}).
 
 @item / M
-@kindex / M (Summary)
+@kindex / M @r{(Summary)}
 @findex gnus-summary-limit-exclude-marks
 Exclude all marked articles (@code{gnus-summary-limit-exclude-marks}).
 
 @item / T
-@kindex / T (Summary)
+@kindex / T @r{(Summary)}
 @findex gnus-summary-limit-include-thread
 Include all the articles in the current thread in the limit.
 
 @item / c
-@kindex / c (Summary)
+@kindex / c @r{(Summary)}
 @findex gnus-summary-limit-exclude-childless-dormant
 Exclude all dormant articles that have no children from the limit@*
 (@code{gnus-summary-limit-exclude-childless-dormant}).
 
 @item / C
-@kindex / C (Summary)
+@kindex / C @r{(Summary)}
 @findex gnus-summary-limit-mark-excluded-as-read
 Mark all excluded unread articles as read
 (@code{gnus-summary-limit-mark-excluded-as-read}).  If given a prefix,
 also mark excluded ticked and dormant articles as read.
 
 @item / b
-@kindex / b (Summary)
+@kindex / b @r{(Summary)}
 @findex gnus-summary-limit-to-bodies
 Limit the summary buffer to articles that have bodies that match a
 certain regexp (@code{gnus-summary-limit-to-bodies}).  If given a
@@ -6738,7 +6732,7 @@ prefix, reverse the limit.  This command is quite slow since it
 requires selecting each article to find the matches.
 
 @item / h
-@kindex / h (Summary)
+@kindex / h @r{(Summary)}
 @findex gnus-summary-limit-to-headers
 Like the previous command, only limit to headers instead
 (@code{gnus-summary-limit-to-headers}).
@@ -6751,13 +6745,13 @@ prefix as well.
 
 @table @kbd
 @item / N
-@kindex / N (Summary)
+@kindex / N @r{(Summary)}
 @findex gnus-summary-insert-new-articles
 Insert all new articles in the summary buffer.  It scans for new emails
 if @var{back-end}@code{-get-new-mail} is non-@code{nil}.
 
 @item / o
-@kindex / o (Summary)
+@kindex / o @r{(Summary)}
 @findex gnus-summary-insert-old-articles
 Insert all old articles in the summary buffer.  If given a numbered
 prefix, fetch this number of articles.
@@ -7197,8 +7191,8 @@ meaningful.  Here's one example:
 
 @item T k
 @itemx C-M-k
-@kindex T k (Summary)
-@kindex C-M-k (Summary)
+@kindex T k @r{(Summary)}
+@kindex C-M-k @r{(Summary)}
 @findex gnus-summary-kill-thread
 Mark all articles in the current (sub-)thread as read
 (@code{gnus-summary-kill-thread}).  If the prefix argument is positive,
@@ -7207,71 +7201,71 @@ articles instead.
 
 @item T l
 @itemx C-M-l
-@kindex T l (Summary)
-@kindex C-M-l (Summary)
+@kindex T l @r{(Summary)}
+@kindex C-M-l @r{(Summary)}
 @findex gnus-summary-lower-thread
 Lower the score of the current (sub-)thread
 (@code{gnus-summary-lower-thread}).
 
 @item T i
-@kindex T i (Summary)
+@kindex T i @r{(Summary)}
 @findex gnus-summary-raise-thread
 Increase the score of the current (sub-)thread
 (@code{gnus-summary-raise-thread}).
 
 @item T #
-@kindex T # (Summary)
+@kindex T # @r{(Summary)}
 @findex gnus-uu-mark-thread
 Set the process mark on the current (sub-)thread
 (@code{gnus-uu-mark-thread}).
 
 @item T M-#
-@kindex T M-# (Summary)
+@kindex T M-# @r{(Summary)}
 @findex gnus-uu-unmark-thread
 Remove the process mark from the current (sub-)thread
 (@code{gnus-uu-unmark-thread}).
 
 @item T T
-@kindex T T (Summary)
+@kindex T T @r{(Summary)}
 @findex gnus-summary-toggle-threads
 Toggle threading (@code{gnus-summary-toggle-threads}).
 
 @item T s
-@kindex T s (Summary)
+@kindex T s @r{(Summary)}
 @findex gnus-summary-show-thread
 Expose the (sub-)thread hidden under the current article, if any@*
 (@code{gnus-summary-show-thread}).
 
 @item T h
-@kindex T h (Summary)
+@kindex T h @r{(Summary)}
 @findex gnus-summary-hide-thread
 Hide the current (sub-)thread (@code{gnus-summary-hide-thread}).
 
 @item T S
-@kindex T S (Summary)
+@kindex T S @r{(Summary)}
 @findex gnus-summary-show-all-threads
 Expose all hidden threads (@code{gnus-summary-show-all-threads}).
 
 @item T H
-@kindex T H (Summary)
+@kindex T H @r{(Summary)}
 @findex gnus-summary-hide-all-threads
 Hide all threads (@code{gnus-summary-hide-all-threads}).
 
 @item T t
-@kindex T t (Summary)
+@kindex T t @r{(Summary)}
 @findex gnus-summary-rethread-current
 Re-thread the current article's thread
 (@code{gnus-summary-rethread-current}).  This works even when the
 summary buffer is otherwise unthreaded.
 
 @item T ^
-@kindex T ^ (Summary)
+@kindex T ^ @r{(Summary)}
 @findex gnus-summary-reparent-thread
 Make the current article the child of the marked (or previous) article
 (@code{gnus-summary-reparent-thread}).
 
 @item T M-^
-@kindex T M-^ (Summary)
+@kindex T M-^ @r{(Summary)}
 @findex gnus-summary-reparent-children
 Make the current article the parent of the marked articles
 (@code{gnus-summary-reparent-children}).
@@ -7284,35 +7278,35 @@ understand the numeric prefix.
 @table @kbd
 
 @item T n
-@kindex T n (Summary)
+@kindex T n @r{(Summary)}
 @itemx C-M-f
-@kindex C-M-n (Summary)
-@itemx M-down
-@kindex M-down (Summary)
+@kindex C-M-n @r{(Summary)}
+@itemx M-@key{DOWN}
+@kindex M-@key{DOWN} @r{(Summary)}
 @findex gnus-summary-next-thread
 Go to the next thread (@code{gnus-summary-next-thread}).
 
 @item T p
-@kindex T p (Summary)
+@kindex T p @r{(Summary)}
 @itemx C-M-b
-@kindex C-M-p (Summary)
-@itemx M-up
-@kindex M-up (Summary)
+@kindex C-M-p @r{(Summary)}
+@itemx M-@key{UP}
+@kindex M-@key{UP} @r{(Summary)}
 @findex gnus-summary-prev-thread
 Go to the previous thread (@code{gnus-summary-prev-thread}).
 
 @item T d
-@kindex T d (Summary)
+@kindex T d @r{(Summary)}
 @findex gnus-summary-down-thread
 Descend the thread (@code{gnus-summary-down-thread}).
 
 @item T u
-@kindex T u (Summary)
+@kindex T u @r{(Summary)}
 @findex gnus-summary-up-thread
 Ascend the thread (@code{gnus-summary-up-thread}).
 
 @item T o
-@kindex T o (Summary)
+@kindex T o @r{(Summary)}
 @findex gnus-summary-top-thread
 Go to the top of the thread (@code{gnus-summary-top-thread}).
 @end table
@@ -7654,12 +7648,12 @@ you use two explicit commands for managing persistent articles:
 @table @kbd
 
 @item *
-@kindex * (Summary)
+@kindex * @r{(Summary)}
 @findex gnus-cache-enter-article
 Make the current article persistent (@code{gnus-cache-enter-article}).
 
 @item M-*
-@kindex M-* (Summary)
+@kindex M-* @r{(Summary)}
 @findex gnus-cache-remove-article
 Remove the current article from the persistent articles
 (@code{gnus-cache-remove-article}).  This will normally delete the
@@ -7697,7 +7691,7 @@ select another article.  You can make an article sticky with:
 
 @table @kbd
 @item A S
-@kindex A S (Summary)
+@kindex A S @r{(Summary)}
 @findex gnus-sticky-article
 Make the current article sticky.  If a prefix arg is given, ask for a
 name for this sticky article buffer.
@@ -7707,12 +7701,12 @@ To close a sticky article buffer you can use these commands:
 
 @table @kbd
 @item q
-@kindex q (Article)
+@kindex q @r{@r{(Article)}}
 @findex bury-buffer
 Puts this sticky article buffer at the end of the list of all buffers.
 
 @item k
-@kindex k (Article)
+@kindex k @r{(Article)}
 @findex gnus-kill-sticky-article-buffer
 Kills this sticky article buffer.
 @end table
@@ -7778,61 +7772,61 @@ deleted before saving.
 
 @item O o
 @itemx o
-@kindex O o (Summary)
-@kindex o (Summary)
+@kindex O o @r{(Summary)}
+@kindex o @r{(Summary)}
 @findex gnus-summary-save-article
 @c @icon{gnus-summary-save-article}
 Save the current article using the default article saver
 (@code{gnus-summary-save-article}).
 
 @item O m
-@kindex O m (Summary)
+@kindex O m @r{(Summary)}
 @findex gnus-summary-save-article-mail
 Save the current article in a Unix mail box (mbox) file
 (@code{gnus-summary-save-article-mail}).
 
 @item O r
-@kindex O r (Summary)
+@kindex O r @r{(Summary)}
 @findex gnus-summary-save-article-rmail
 Save the current article in Rmail format
 (@code{gnus-summary-save-article-rmail}).  This is mbox since Emacs 23,
 Babyl in older versions.
 
 @item O f
-@kindex O f (Summary)
+@kindex O f @r{(Summary)}
 @findex gnus-summary-save-article-file
 @c @icon{gnus-summary-save-article-file}
 Save the current article in plain file format
 (@code{gnus-summary-save-article-file}).
 
 @item O F
-@kindex O F (Summary)
+@kindex O F @r{(Summary)}
 @findex gnus-summary-write-article-file
 Write the current article in plain file format, overwriting any previous
 file contents (@code{gnus-summary-write-article-file}).
 
 @item O b
-@kindex O b (Summary)
+@kindex O b @r{(Summary)}
 @findex gnus-summary-save-article-body-file
 Save the current article body in plain file format
 (@code{gnus-summary-save-article-body-file}).
 
 @item O h
-@kindex O h (Summary)
+@kindex O h @r{(Summary)}
 @findex gnus-summary-save-article-folder
 Save the current article in mh folder format
 (@code{gnus-summary-save-article-folder}).
 
 @item O v
-@kindex O v (Summary)
+@kindex O v @r{(Summary)}
 @findex gnus-summary-save-article-vm
 Save the current article in a VM folder
 (@code{gnus-summary-save-article-vm}).
 
 @item O p
 @itemx |
-@kindex O p (Summary)
-@kindex | (Summary)
+@kindex O p @r{(Summary)}
+@kindex | @r{(Summary)}
 @findex gnus-summary-pipe-output
 @vindex gnus-summary-pipe-output-default-command
 Save the current article in a pipe.  Uhm, like, what I mean is---Pipe
@@ -7845,7 +7839,7 @@ to a string containing the default command and options (default
 @code{nil}).
 
 @item O P
-@kindex O P (Summary)
+@kindex O P @r{(Summary)}
 @findex gnus-summary-muttprint
 @vindex gnus-summary-muttprint-program
 Save the current article into muttprint.  That is, print it using the
@@ -8152,24 +8146,24 @@ commands, and you have to mark the articles manually with @kbd{#}.
 @table @kbd
 
 @item X u
-@kindex X u (Summary)
+@kindex X u @r{(Summary)}
 @findex gnus-uu-decode-uu
 @c @icon{gnus-uu-decode-uu}
 Uudecodes the current series (@code{gnus-uu-decode-uu}).
 
 @item X U
-@kindex X U (Summary)
+@kindex X U @r{(Summary)}
 @findex gnus-uu-decode-uu-and-save
 Uudecodes and saves the current series
 (@code{gnus-uu-decode-uu-and-save}).
 
 @item X v u
-@kindex X v u (Summary)
+@kindex X v u @r{(Summary)}
 @findex gnus-uu-decode-uu-view
 Uudecodes and views the current series (@code{gnus-uu-decode-uu-view}).
 
 @item X v U
-@kindex X v U (Summary)
+@kindex X v U @r{(Summary)}
 @findex gnus-uu-decode-uu-and-save-view
 Uudecodes, views and saves the current series
 (@code{gnus-uu-decode-uu-and-save-view}).
@@ -8210,22 +8204,22 @@ some commands to deal with these:
 @table @kbd
 
 @item X s
-@kindex X s (Summary)
+@kindex X s @r{(Summary)}
 @findex gnus-uu-decode-unshar
 Unshars the current series (@code{gnus-uu-decode-unshar}).
 
 @item X S
-@kindex X S (Summary)
+@kindex X S @r{(Summary)}
 @findex gnus-uu-decode-unshar-and-save
 Unshars and saves the current series (@code{gnus-uu-decode-unshar-and-save}).
 
 @item X v s
-@kindex X v s (Summary)
+@kindex X v s @r{(Summary)}
 @findex gnus-uu-decode-unshar-view
 Unshars and views the current series (@code{gnus-uu-decode-unshar-view}).
 
 @item X v S
-@kindex X v S (Summary)
+@kindex X v S @r{(Summary)}
 @findex gnus-uu-decode-unshar-and-save-view
 Unshars, views and saves the current series
 (@code{gnus-uu-decode-unshar-and-save-view}).
@@ -8239,24 +8233,24 @@ Unshars, views and saves the current series
 @table @kbd
 
 @item X p
-@kindex X p (Summary)
+@kindex X p @r{(Summary)}
 @findex gnus-uu-decode-postscript
 Unpack the current PostScript series (@code{gnus-uu-decode-postscript}).
 
 @item X P
-@kindex X P (Summary)
+@kindex X P @r{(Summary)}
 @findex gnus-uu-decode-postscript-and-save
 Unpack and save the current PostScript series
 (@code{gnus-uu-decode-postscript-and-save}).
 
 @item X v p
-@kindex X v p (Summary)
+@kindex X v p @r{(Summary)}
 @findex gnus-uu-decode-postscript-view
 View the current PostScript series
 (@code{gnus-uu-decode-postscript-view}).
 
 @item X v P
-@kindex X v P (Summary)
+@kindex X v P @r{(Summary)}
 @findex gnus-uu-decode-postscript-and-save-view
 View and save the current PostScript series
 (@code{gnus-uu-decode-postscript-and-save-view}).
@@ -8268,19 +8262,19 @@ View and save the current PostScript series
 
 @table @kbd
 @item X o
-@kindex X o (Summary)
+@kindex X o @r{(Summary)}
 @findex gnus-uu-decode-save
 Save the current series
 (@code{gnus-uu-decode-save}).
 
 @item X b
-@kindex X b (Summary)
+@kindex X b @r{(Summary)}
 @findex gnus-uu-decode-binhex
 Unbinhex the current series (@code{gnus-uu-decode-binhex}).  This
 doesn't really work yet.
 
 @item X Y
-@kindex X Y (Summary)
+@kindex X Y @r{(Summary)}
 @findex gnus-uu-decode-yenc
 yEnc-decode the current series and save it (@code{gnus-uu-decode-yenc}).
 @end table
@@ -8554,7 +8548,7 @@ you want it to look like technicolor fruit salad.
 @table @kbd
 
 @item W H a
-@kindex W H a (Summary)
+@kindex W H a @r{(Summary)}
 @findex gnus-article-highlight
 @findex gnus-article-maybe-highlight
 Do much highlighting of the current article
@@ -8562,7 +8556,7 @@ Do much highlighting of the current article
 text, the signature, and adds buttons to the body and the head.
 
 @item W H h
-@kindex W H h (Summary)
+@kindex W H h @r{(Summary)}
 @findex gnus-article-highlight-headers
 @vindex gnus-header-face-alist
 Highlight the headers (@code{gnus-article-highlight-headers}).  The
@@ -8576,7 +8570,7 @@ the header value.  The first match made will be used.  Note that
 @var{regexp} shouldn't have @samp{^} prepended---Gnus will add one.
 
 @item W H c
-@kindex W H c (Summary)
+@kindex W H c @r{(Summary)}
 @findex gnus-article-highlight-citation
 Highlight cited text (@code{gnus-article-highlight-citation}).
 
@@ -8637,7 +8631,7 @@ is @code{t}.
 
 
 @item W H s
-@kindex W H s (Summary)
+@kindex W H s @r{(Summary)}
 @vindex gnus-signature-separator
 @vindex gnus-signature-face
 @findex gnus-article-highlight-signature
@@ -8658,7 +8652,7 @@ default.
 @cindex article emphasis
 
 @findex gnus-article-emphasize
-@kindex W e (Summary)
+@kindex W e @r{(Summary)}
 People commonly add emphasis to words in news articles by writing things
 like @samp{_this_} or @samp{*this*} or @samp{/this/}.  Gnus can make
 this look nicer by running the article through the @kbd{W e}
@@ -8729,32 +8723,32 @@ too much cruft in most articles.
 @table @kbd
 
 @item W W a
-@kindex W W a (Summary)
+@kindex W W a @r{(Summary)}
 @findex gnus-article-hide
 Do quite a lot of hiding on the article buffer
 (@kbd{gnus-article-hide}).  In particular, this function will hide
 headers, @acronym{PGP}, cited text and the signature.
 
 @item W W h
-@kindex W W h (Summary)
+@kindex W W h @r{(Summary)}
 @findex gnus-article-hide-headers
 Hide headers (@code{gnus-article-hide-headers}).  @xref{Hiding
 Headers}.
 
 @item W W b
-@kindex W W b (Summary)
+@kindex W W b @r{(Summary)}
 @findex gnus-article-hide-boring-headers
 Hide headers that aren't particularly interesting
 (@code{gnus-article-hide-boring-headers}).  @xref{Hiding Headers}.
 
 @item W W s
-@kindex W W s (Summary)
+@kindex W W s @r{(Summary)}
 @findex gnus-article-hide-signature
 Hide signature (@code{gnus-article-hide-signature}).  @xref{Article
 Signature}.
 
 @item W W l
-@kindex W W l (Summary)
+@kindex W W l @r{(Summary)}
 @findex gnus-article-hide-list-identifiers
 @vindex gnus-list-identifiers
 Strip list identifiers specified in @code{gnus-list-identifiers}.  These
@@ -8773,13 +8767,13 @@ subject.  This can also be a list of regular expressions.
 @end table
 
 @item W W P
-@kindex W W P (Summary)
+@kindex W W P @r{(Summary)}
 @findex gnus-article-hide-pem
 Hide @acronym{PEM} (privacy enhanced messages) cruft
 (@code{gnus-article-hide-pem}).
 
 @item W W B
-@kindex W W B (Summary)
+@kindex W W B @r{(Summary)}
 @findex gnus-article-strip-banner
 @vindex gnus-article-banner-alist
 @vindex gnus-article-address-banner-alist
@@ -8833,7 +8827,7 @@ sends, you can use the following element to remove them:
 @end table
 
 @item W W c
-@kindex W W c (Summary)
+@kindex W W c @r{(Summary)}
 @findex gnus-article-hide-citation
 Hide citation (@code{gnus-article-hide-citation}).  Some variables for
 customizing the hiding:
@@ -8869,7 +8863,7 @@ and bottom of the text, respectively, to remain visible.
 @end table
 
 @item W W C-c
-@kindex W W C-c (Summary)
+@kindex W W C-c @r{(Summary)}
 @findex gnus-article-hide-citation-maybe
 
 Hide citation (@code{gnus-article-hide-citation-maybe}) depending on the
@@ -8888,7 +8882,7 @@ is hidden.
 @end table
 
 @item W W C
-@kindex W W C (Summary)
+@kindex W W C @r{(Summary)}
 @findex gnus-article-hide-citation-in-followups
 Hide cited text in articles that aren't roots
 (@code{gnus-article-hide-citation-in-followups}).  This isn't very
@@ -8938,14 +8932,14 @@ interactive Washing functions but with all default treatments
 (@pxref{Customizing Articles}).
 
 @item W l
-@kindex W l (Summary)
+@kindex W l @r{(Summary)}
 @findex gnus-summary-stop-page-breaking
 Remove page breaks from the current article
 (@code{gnus-summary-stop-page-breaking}).  @xref{Misc Article}, for page
 delimiters.
 
 @item W r
-@kindex W r (Summary)
+@kindex W r @r{(Summary)}
 @findex gnus-summary-caesar-message
 @c @icon{gnus-summary-caesar-message}
 Do a Caesar rotate (rot13) on the article buffer
@@ -8959,12 +8953,12 @@ positions in the alphabet, e.g., @samp{B} (letter #2) -> @samp{O} (letter
 is rumored to have employed this form of, uh, somewhat weak encryption.
 
 @item W m
-@kindex W m (Summary)
+@kindex W m @r{(Summary)}
 @findex gnus-summary-morse-message
 Morse decode the article buffer (@code{gnus-summary-morse-message}).
 
 @item W i
-@kindex W i (Summary)
+@kindex W i @r{(Summary)}
 @findex gnus-summary-idna-message
 Decode IDNA encoded domain names in the current articles.  IDNA
 encoded domain names looks like @samp{xn--bar}.  If a string remain
@@ -8975,25 +8969,25 @@ to work.
 
 @item W t
 @item t
-@kindex W t (Summary)
-@kindex t (Summary)
+@kindex W t @r{(Summary)}
+@kindex t @r{(Summary)}
 @findex gnus-summary-toggle-header
 Toggle whether to display all headers in the article buffer
 (@code{gnus-summary-toggle-header}).
 
 @item W v
-@kindex W v (Summary)
+@kindex W v @r{(Summary)}
 @findex gnus-summary-verbose-headers
 Toggle whether to display all headers in the article buffer permanently
 (@code{gnus-summary-verbose-headers}).
 
 @item W o
-@kindex W o (Summary)
+@kindex W o @r{(Summary)}
 @findex gnus-article-treat-overstrike
 Treat overstrike (@code{gnus-article-treat-overstrike}).
 
 @item W d
-@kindex W d (Summary)
+@kindex W d @r{(Summary)}
 @findex gnus-article-treat-dumbquotes
 @vindex gnus-article-dumbquotes-map
 @cindex Smartquotes
@@ -9011,7 +9005,7 @@ like @code{\222} or @code{\264} where you're expecting some kind of
 apostrophe or quotation mark, then try this wash.
 
 @item W U
-@kindex W U (Summary)
+@kindex W U @r{(Summary)}
 @findex gnus-article-treat-non-ascii
 @cindex Unicode
 @cindex Non-@acronym{ASCII}
@@ -9022,7 +9016,7 @@ and doesn't show accented characters, ``advanced'' punctuation, and the
 like.  For instance, @samp{»} is translated into @samp{>>}, and so on.
 
 @item W Y f
-@kindex W Y f (Summary)
+@kindex W Y f @r{(Summary)}
 @findex gnus-article-outlook-deuglify-article
 @cindex Outlook Express
 Full deuglify of broken Outlook (Express) articles: Treat dumbquotes,
@@ -9030,7 +9024,7 @@ unwrap lines, repair attribution and rearrange citation.
 (@code{gnus-article-outlook-deuglify-article}).
 
 @item W Y u
-@kindex W Y u (Summary)
+@kindex W Y u @r{(Summary)}
 @findex gnus-article-outlook-unwrap-lines
 @vindex gnus-outlook-deuglify-unwrap-min
 @vindex gnus-outlook-deuglify-unwrap-max
@@ -9042,19 +9036,19 @@ maximum length of an unwrapped citation line.
 (@code{gnus-article-outlook-unwrap-lines}).
 
 @item W Y a
-@kindex W Y a (Summary)
+@kindex W Y a @r{(Summary)}
 @findex gnus-article-outlook-repair-attribution
 Repair a broken attribution line.@*
 (@code{gnus-article-outlook-repair-attribution}).
 
 @item W Y c
-@kindex W Y c (Summary)
+@kindex W Y c @r{(Summary)}
 @findex gnus-article-outlook-rearrange-citation
 Repair broken citations by rearranging the text.
 (@code{gnus-article-outlook-rearrange-citation}).
 
 @item W w
-@kindex W w (Summary)
+@kindex W w @r{(Summary)}
 @findex gnus-article-fill-cited-article
 Do word wrap (@code{gnus-article-fill-cited-article}).
 
@@ -9062,18 +9056,18 @@ You can give the command a numerical prefix to specify the width to use
 when filling.
 
 @item W Q
-@kindex W Q (Summary)
+@kindex W Q @r{(Summary)}
 @findex gnus-article-fill-long-lines
 Fill long lines (@code{gnus-article-fill-long-lines}).
 
 @item W C
-@kindex W C (Summary)
+@kindex W C @r{(Summary)}
 @findex gnus-article-capitalize-sentences
 Capitalize the first word in each sentence
 (@code{gnus-article-capitalize-sentences}).
 
 @item W c
-@kindex W c (Summary)
+@kindex W c @r{(Summary)}
 @findex gnus-article-remove-cr
 Translate CRLF pairs (i.e., @samp{^M}s on the end of the lines) into LF
 (this takes care of DOS line endings), and then translate any remaining
@@ -9081,7 +9075,7 @@ CRs into LF (this takes care of Mac line endings)
 (@code{gnus-article-remove-cr}).
 
 @item W q
-@kindex W q (Summary)
+@kindex W q @r{(Summary)}
 @findex gnus-article-de-quoted-unreadable
 Treat quoted-printable (@code{gnus-article-de-quoted-unreadable}).
 Quoted-Printable is one common @acronym{MIME} encoding employed when
@@ -9093,7 +9087,7 @@ done automatically by Gnus if the message in question has a
 has been done.  If a prefix is given, a charset will be asked for.
 
 @item W 6
-@kindex W 6 (Summary)
+@kindex W 6 @r{(Summary)}
 @findex gnus-article-de-base64-unreadable
 Treat base64 (@code{gnus-article-de-base64-unreadable}).  Base64 is
 one common @acronym{MIME} encoding employed when sending
@@ -9103,14 +9097,14 @@ usually done automatically by Gnus if the message in question has a
 has been done.  If a prefix is given, a charset will be asked for.
 
 @item W Z
-@kindex W Z (Summary)
+@kindex W Z @r{(Summary)}
 @findex gnus-article-decode-HZ
 Treat HZ or HZP (@code{gnus-article-decode-HZ}).  HZ (or HZP) is one
 common encoding employed when sending Chinese articles.  It typically
 makes strings look like @samp{~@{<:Ky2;S@{#,NpJ)l6HK!#~@}}.
 
 @item W A
-@kindex W A (Summary)
+@kindex W A @r{(Summary)}
 @findex gnus-article-treat-ansi-sequences
 @cindex @acronym{ANSI} control sequences
 Translate @acronym{ANSI} SGR control sequences into overlays or
@@ -9118,7 +9112,7 @@ extents (@code{gnus-article-treat-ansi-sequences}).  @acronym{ANSI}
 sequences are used in some Chinese hierarchies for highlighting.
 
 @item W u
-@kindex W u (Summary)
+@kindex W u @r{(Summary)}
 @findex gnus-article-unsplit-urls
 Remove newlines from within URLs.  Some mailers insert newlines into
 outgoing email messages to keep lines short.  This reformatting can
@@ -9126,7 +9120,7 @@ split long URLs onto multiple lines.  Repair those URLs by removing
 the newlines (@code{gnus-article-unsplit-urls}).
 
 @item W h
-@kindex W h (Summary)
+@kindex W h @r{(Summary)}
 @findex gnus-article-wash-html
 Treat @acronym{HTML} (@code{gnus-article-wash-html}).  Note that this is
 usually done automatically by Gnus if the message in question has a
@@ -9166,19 +9160,19 @@ Use html2text---a simple @acronym{HTML} converter included with Gnus.
 @end table
 
 @item W b
-@kindex W b (Summary)
+@kindex W b @r{(Summary)}
 @findex gnus-article-add-buttons
 Add clickable buttons to the article (@code{gnus-article-add-buttons}).
 @xref{Article Buttons}.
 
 @item W B
-@kindex W B (Summary)
+@kindex W B @r{(Summary)}
 @findex gnus-article-add-buttons-to-head
 Add clickable buttons to the article headers
 (@code{gnus-article-add-buttons-to-head}).
 
 @item W p
-@kindex W p (Summary)
+@kindex W p @r{(Summary)}
 @findex gnus-article-verify-x-pgp-sig
 Verify a signed control message
 (@code{gnus-article-verify-x-pgp-sig}).  Control messages such as
@@ -9189,57 +9183,57 @@ message.@footnote{@acronym{PGP} keys for many hierarchies are
 available at @uref{https://ftp.isc.org/pub/pgpcontrol/README.html}}
 
 @item W s
-@kindex W s (Summary)
+@kindex W s @r{(Summary)}
 @findex gnus-summary-force-verify-and-decrypt
 Verify a signed (@acronym{PGP}, @acronym{PGP/MIME} or
 @acronym{S/MIME}) message
 (@code{gnus-summary-force-verify-and-decrypt}). @xref{Security}.
 
 @item W a
-@kindex W a (Summary)
+@kindex W a @r{(Summary)}
 @findex gnus-article-strip-headers-in-body
 Strip headers like the @code{X-No-Archive} header from the beginning of
 article bodies (@code{gnus-article-strip-headers-in-body}).
 
 @item W E l
-@kindex W E l (Summary)
+@kindex W E l @r{(Summary)}
 @findex gnus-article-strip-leading-blank-lines
 Remove all blank lines from the beginning of the article
 (@code{gnus-article-strip-leading-blank-lines}).
 
 @item W E m
-@kindex W E m (Summary)
+@kindex W E m @r{(Summary)}
 @findex gnus-article-strip-multiple-blank-lines
 Replace all blank lines with empty lines and then all multiple empty
 lines with a single empty line.
 (@code{gnus-article-strip-multiple-blank-lines}).
 
 @item W E t
-@kindex W E t (Summary)
+@kindex W E t @r{(Summary)}
 @findex gnus-article-remove-trailing-blank-lines
 Remove all blank lines at the end of the article
 (@code{gnus-article-remove-trailing-blank-lines}).
 
 @item W E a
-@kindex W E a (Summary)
+@kindex W E a @r{(Summary)}
 @findex gnus-article-strip-blank-lines
 Do all the three commands above
 (@code{gnus-article-strip-blank-lines}).
 
 @item W E A
-@kindex W E A (Summary)
+@kindex W E A @r{(Summary)}
 @findex gnus-article-strip-all-blank-lines
 Remove all blank lines
 (@code{gnus-article-strip-all-blank-lines}).
 
 @item W E s
-@kindex W E s (Summary)
+@kindex W E s @r{(Summary)}
 @findex gnus-article-strip-leading-space
 Remove all white space from the beginning of all lines of the article
 body (@code{gnus-article-strip-leading-space}).
 
 @item W E e
-@kindex W E e (Summary)
+@kindex W E e @r{(Summary)}
 @findex gnus-article-strip-trailing-space
 Remove all white space from the end of all lines of the article
 body (@code{gnus-article-strip-trailing-space}).
@@ -9257,24 +9251,24 @@ These commands perform various transformations of article header.
 @table @kbd
 
 @item W G u
-@kindex W G u (Summary)
+@kindex W G u @r{(Summary)}
 @findex gnus-article-treat-unfold-headers
 Unfold folded header lines (@code{gnus-article-treat-unfold-headers}).
 
 @item W G n
-@kindex W G n (Summary)
+@kindex W G n @r{(Summary)}
 @findex gnus-article-treat-fold-newsgroups
 Fold the @code{Newsgroups} and @code{Followup-To} headers
 (@code{gnus-article-treat-fold-newsgroups}).
 
 @item W G f
-@kindex W G f (Summary)
+@kindex W G f @r{(Summary)}
 @findex gnus-article-treat-fold-headers
 Fold all the message headers
 (@code{gnus-article-treat-fold-headers}).
 
 @item W E w
-@kindex W E w (Summary)
+@kindex W E w @r{(Summary)}
 @findex gnus-article-remove-leading-whitespace
 Remove excessive whitespace from all headers
 (@code{gnus-article-remove-leading-whitespace}).
@@ -9288,7 +9282,7 @@ Remove excessive whitespace from all headers
 
 People often include references to other stuff in articles, and it would
 be nice if Gnus could just fetch whatever it is that people talk about
-with the minimum of fuzz when you hit @kbd{RET} or use the middle mouse
+with the minimum of fuzz when you hit @kbd{@key{RET}} or use the middle mouse
 button on these references.
 
 @vindex gnus-button-man-handler
@@ -9494,31 +9488,31 @@ when the article was sent.
 @table @kbd
 
 @item W T u
-@kindex W T u (Summary)
+@kindex W T u @r{(Summary)}
 @findex gnus-article-date-ut
 Display the date in UT (aka. GMT, aka ZULU)
 (@code{gnus-article-date-ut}).
 
 @item W T i
-@kindex W T i (Summary)
+@kindex W T i @r{(Summary)}
 @findex gnus-article-date-iso8601
 @cindex ISO 8601
 Display the date in international format, aka. ISO 8601
 (@code{gnus-article-date-iso8601}).
 
 @item W T l
-@kindex W T l (Summary)
+@kindex W T l @r{(Summary)}
 @findex gnus-article-date-local
 Display the date in the local timezone (@code{gnus-article-date-local}).
 
 @item W T p
-@kindex W T p (Summary)
+@kindex W T p @r{(Summary)}
 @findex gnus-article-date-english
 Display the date in a format that's easily pronounceable in English
 (@code{gnus-article-date-english}).
 
 @item W T s
-@kindex W T s (Summary)
+@kindex W T s @r{(Summary)}
 @vindex gnus-article-time-format
 @findex gnus-article-date-user
 @findex format-time-string
@@ -9529,7 +9523,7 @@ to @code{format-time-string}.  See the documentation of that variable
 for a list of possible format specs.
 
 @item W T e
-@kindex W T e (Summary)
+@kindex W T e @r{(Summary)}
 @findex gnus-article-date-lapsed
 @findex gnus-start-date-timer
 @findex gnus-stop-date-timer
@@ -9545,7 +9539,7 @@ To make this line updated continually, set the
 seconds (the default is @code{nil}).
 
 @item W T o
-@kindex W T o (Summary)
+@kindex W T o @r{(Summary)}
 @findex gnus-article-date-original
 Display the original date (@code{gnus-article-date-original}).  This can
 be useful if you normally use some other conversion function and are
@@ -9589,58 +9583,58 @@ they'll be removed.
 
 @table @kbd
 @item W D x
-@kindex W D x (Summary)
+@kindex W D x @r{(Summary)}
 @findex gnus-article-display-x-face
 Display an @code{X-Face} in the @code{From} header.
 (@code{gnus-article-display-x-face}).
 
 @item W D d
-@kindex W D d (Summary)
+@kindex W D d @r{(Summary)}
 @findex gnus-article-display-face
 Display a @code{Face} in the @code{From} header.
 (@code{gnus-article-display-face}).
 
 @item W D s
-@kindex W D s (Summary)
+@kindex W D s @r{(Summary)}
 @findex gnus-treat-smiley
 Display smileys (@code{gnus-treat-smiley}).
 
 @item W D f
-@kindex W D f (Summary)
+@kindex W D f @r{(Summary)}
 @findex gnus-treat-from-picon
 Piconify the @code{From} header (@code{gnus-treat-from-picon}).
 
 @item W D m
-@kindex W D m (Summary)
+@kindex W D m @r{(Summary)}
 @findex gnus-treat-mail-picon
 Piconify all mail headers (i.e., @code{Cc}, @code{To})
 (@code{gnus-treat-mail-picon}).
 
 @item W D n
-@kindex W D n (Summary)
+@kindex W D n @r{(Summary)}
 @findex gnus-treat-newsgroups-picon
 Piconify all news headers (i.e., @code{Newsgroups} and
 @code{Followup-To}) (@code{gnus-treat-newsgroups-picon}).
 
 @item W D g
-@kindex W D g (Summary)
+@kindex W D g @r{(Summary)}
 @findex gnus-treat-from-gravatar
 Gravatarify the @code{From} header (@code{gnus-treat-from-gravatar}).
 
 @item W D h
-@kindex W D h (Summary)
+@kindex W D h @r{(Summary)}
 @findex gnus-treat-mail-gravatar
 Gravatarify all mail headers (i.e., @code{Cc}, @code{To})
 (@code{gnus-treat-from-gravatar}).
 
 @item W D D
-@kindex W D D (Summary)
+@kindex W D D @r{(Summary)}
 @findex gnus-article-remove-images
 Remove all images from the article buffer
 (@code{gnus-article-remove-images}).
 
 @item W D W
-@kindex W D W (Summary)
+@kindex W D W @r{(Summary)}
 @findex gnus-html-show-images
 If you're reading an @acronym{HTML} article rendered with
 @code{gnus-article-html}, then you can insert any blocked images in
@@ -9718,7 +9712,7 @@ signature after all.
 
 @table @kbd
 @item A t
-@kindex A t (Summary)
+@kindex A t @r{(Summary)}
 @findex gnus-article-babel
 Translate the article from one language to another
 (@code{gnus-article-babel}).
@@ -9738,43 +9732,43 @@ instance, @kbd{3 K v} means ``view the third @acronym{MIME} part''.
 @table @kbd
 @item b
 @itemx K v
-@kindex b (Summary)
-@kindex K v (Summary)
+@kindex b @r{(Summary)}
+@kindex K v @r{(Summary)}
 View the @acronym{MIME} part.
 
 @item K o
-@kindex K o (Summary)
+@kindex K o @r{(Summary)}
 Save the @acronym{MIME} part.
 
 @item K O
-@kindex K O (Summary)
+@kindex K O @r{(Summary)}
 Prompt for a file name, then save the @acronym{MIME} part and strip it
 from the article.  The stripped @acronym{MIME} object will be referred
 via the message/external-body @acronym{MIME} type.
 
 @item K r
-@kindex K r (Summary)
+@kindex K r @r{(Summary)}
 Replace the @acronym{MIME} part with an external body.
 
 @item K d
-@kindex K d (Summary)
+@kindex K d @r{(Summary)}
 Delete the @acronym{MIME} part and add some information about the
 removed part.
 
 @item K c
-@kindex K c (Summary)
+@kindex K c @r{(Summary)}
 Copy the @acronym{MIME} part.
 
 @item K e
-@kindex K e (Summary)
+@kindex K e @r{(Summary)}
 View the @acronym{MIME} part externally.
 
 @item K i
-@kindex K i (Summary)
+@kindex K i @r{(Summary)}
 View the @acronym{MIME} part internally.
 
 @item K |
-@kindex K | (Summary)
+@kindex K | @r{(Summary)}
 Pipe the @acronym{MIME} part to an external command.
 @end table
 
@@ -9783,7 +9777,7 @@ the same manner:
 
 @table @kbd
 @item K H
-@kindex K H (Summary)
+@kindex K H @r{(Summary)}
 @findex gnus-article-browse-html-article
 View @samp{text/html} parts of the current article with a WWW browser.
 Inline images embedded in a message using the @code{cid} scheme, as they
@@ -9805,13 +9799,13 @@ including images if any to the browser, and deletes them when exiting
 the group (if you want).
 
 @item K b
-@kindex K b (Summary)
+@kindex K b @r{(Summary)}
 Make all the @acronym{MIME} parts have buttons in front of them.  This is
 mostly useful if you wish to save (or perform other actions) on inlined
 parts.
 
 @item W M h
-@kindex W M h (Summary)
+@kindex W M h @r{(Summary)}
 @findex gnus-mime-buttonize-attachments-in-header
 @vindex gnus-mime-display-attachment-buttons-in-header
 Display @acronym{MIME} part buttons in the end of the header of an
@@ -9824,7 +9818,7 @@ The default is @code{t}.  To change the appearance of buttons, customize
 @code{gnus-header-face-alist}.
 
 @item K m
-@kindex K m (Summary)
+@kindex K m @r{(Summary)}
 @findex gnus-summary-repair-multipart
 Some multipart messages are transmitted with missing or faulty headers.
 This command will attempt to ``repair'' these messages so that they can
@@ -9832,26 +9826,26 @@ be viewed in a more pleasant manner
 (@code{gnus-summary-repair-multipart}).
 
 @item X m
-@kindex X m (Summary)
+@kindex X m @r{(Summary)}
 @findex gnus-summary-save-parts
 Save all parts matching a @acronym{MIME} type to a directory
 (@code{gnus-summary-save-parts}).  Understands the process/prefix
 convention (@pxref{Process/Prefix}).
 
 @item M-t
-@kindex M-t (Summary)
+@kindex M-t @r{(Summary)}
 @findex gnus-summary-toggle-display-buttonized
 Toggle the buttonized display of the article buffer
 (@code{gnus-summary-toggle-display-buttonized}).
 
 @item W M w
-@kindex W M w (Summary)
+@kindex W M w @r{(Summary)}
 @findex gnus-article-decode-mime-words
 Decode RFC 2047-encoded words in the article headers
 (@code{gnus-article-decode-mime-words}).
 
 @item W M c
-@kindex W M c (Summary)
+@kindex W M c @r{(Summary)}
 @findex gnus-article-decode-charset
 Decode encoded article bodies as well as charsets
 (@code{gnus-article-decode-charset}).
@@ -9864,7 +9858,7 @@ include @acronym{MIME} headers), you can set the @code{charset} group/topic
 parameter to the required charset (@pxref{Group Parameters}).
 
 @item W M v
-@kindex W M v (Summary)
+@kindex W M v @r{(Summary)}
 @findex gnus-mime-view-all-parts
 View all the @acronym{MIME} parts in the current article
 (@code{gnus-mime-view-all-parts}).
@@ -10123,7 +10117,7 @@ something like
 @item A P
 @cindex PostScript
 @cindex printing
-@kindex A P (Summary)
+@kindex A P @r{(Summary)}
 @vindex gnus-ps-print-hook
 @findex gnus-summary-print-article
 Generate and print a PostScript image of the article buffer
@@ -10154,68 +10148,68 @@ can't really see why you'd want that.
 @table @kbd
 
 @item C-c C-s C-n
-@kindex C-c C-s C-n (Summary)
+@kindex C-c C-s C-n @r{(Summary)}
 @findex gnus-summary-sort-by-number
 Sort by article number (@code{gnus-summary-sort-by-number}).
 
 @item C-c C-s C-m C-n
-@kindex C-c C-s C-n (Summary)
+@kindex C-c C-s C-n @r{(Summary)}
 @findex gnus-summary-sort-by-most-recent-number
 Sort by most recent article number
 (@code{gnus-summary-sort-by-most-recent-number}).
 
 @item C-c C-s C-a
-@kindex C-c C-s C-a (Summary)
+@kindex C-c C-s C-a @r{(Summary)}
 @findex gnus-summary-sort-by-author
 Sort by author (@code{gnus-summary-sort-by-author}).
 
 @item C-c C-s C-t
-@kindex C-c C-s C-t (Summary)
+@kindex C-c C-s C-t @r{(Summary)}
 @findex gnus-summary-sort-by-recipient
 Sort by recipient (@code{gnus-summary-sort-by-recipient}).
 
 @item C-c C-s C-s
-@kindex C-c C-s C-s (Summary)
+@kindex C-c C-s C-s @r{(Summary)}
 @findex gnus-summary-sort-by-subject
 Sort by subject (@code{gnus-summary-sort-by-subject}).
 
 @item C-c C-s C-d
-@kindex C-c C-s C-d (Summary)
+@kindex C-c C-s C-d @r{(Summary)}
 @findex gnus-summary-sort-by-date
 Sort by date (@code{gnus-summary-sort-by-date}).
 
 @item C-c C-s C-m C-d
-@kindex C-c C-s C-m C-d (Summary)
+@kindex C-c C-s C-m C-d @r{(Summary)}
 @findex gnus-summary-sort-by-most-recent-date
 Sort by most recent date (@code{gnus-summary-sort-by-most-recent-date}).
 
 @item C-c C-s C-l
-@kindex C-c C-s C-l (Summary)
+@kindex C-c C-s C-l @r{(Summary)}
 @findex gnus-summary-sort-by-lines
 Sort by lines (@code{gnus-summary-sort-by-lines}).
 
 @item C-c C-s C-c
-@kindex C-c C-s C-c (Summary)
+@kindex C-c C-s C-c @r{(Summary)}
 @findex gnus-summary-sort-by-chars
 Sort by article length (@code{gnus-summary-sort-by-chars}).
 
 @item C-c C-s C-m C-m
-@kindex C-c C-s C-m C-m (Summary)
+@kindex C-c C-s C-m C-m @r{(Summary)}
 @findex gnus-summary-sort-by-marks
 Sort by article ``readedness'' marks (@code{gnus-summary-sort-by-marks}).
 
 @item C-c C-s C-i
-@kindex C-c C-s C-i (Summary)
+@kindex C-c C-s C-i @r{(Summary)}
 @findex gnus-summary-sort-by-score
 Sort by score (@code{gnus-summary-sort-by-score}).
 
 @item C-c C-s C-r
-@kindex C-c C-s C-r (Summary)
+@kindex C-c C-s C-r @r{(Summary)}
 @findex gnus-summary-sort-by-random
 Randomize (@code{gnus-summary-sort-by-random}).
 
 @item C-c C-s C-o
-@kindex C-c C-s C-o (Summary)
+@kindex C-c C-s C-o @r{(Summary)}
 @findex gnus-summary-sort-by-original
 Sort using the default sorting method
 (@code{gnus-summary-sort-by-original}).
@@ -10238,7 +10232,7 @@ If a prefix argument if given, the sort order is reversed.
 
 @table @kbd
 @item ^
-@kindex ^ (Summary)
+@kindex ^ @r{(Summary)}
 @findex gnus-summary-refer-parent-article
 If you'd like to read the parent of the current article, and it is not
 displayed in the summary buffer, you might still be able to.  That is,
@@ -10258,13 +10252,13 @@ article.
 
 @item A R (Summary)
 @findex gnus-summary-refer-references
-@kindex A R (Summary)
+@kindex A R @r{(Summary)}
 Fetch all articles mentioned in the @code{References} header of the
 article (@code{gnus-summary-refer-references}).
 
 @item A T (Summary)
 @findex gnus-summary-refer-thread
-@kindex A T (Summary)
+@kindex A T @r{(Summary)}
 Display the full thread where the current article appears
 (@code{gnus-summary-refer-thread}).  This command has to fetch all the
 headers in the current group to work, so it usually takes a while.  If
@@ -10282,7 +10276,7 @@ by giving the @kbd{A T} command a numerical prefix.
 
 @item M-^ (Summary)
 @findex gnus-summary-refer-article
-@kindex M-^ (Summary)
+@kindex M-^ @r{(Summary)}
 @cindex Message-ID
 @cindex fetching by Message-ID
 You can also ask Gnus for an arbitrary article, no matter what group it
@@ -10352,7 +10346,6 @@ buffer the articles she wants to read.  Then she starts reading the
 articles with just an article buffer displayed.
 
 @findex gnus-pick-mode
-@kindex M-x gnus-pick-mode
 Gnus provides a summary buffer minor mode that allows
 this---@code{gnus-pick-mode}.  This basically means that a few process
 mark commands become one-keystroke commands to allow easy marking, and
@@ -10362,7 +10355,7 @@ Here are the available keystrokes when using pick mode:
 
 @table @kbd
 @item .
-@kindex . (Pick)
+@kindex . @r{(Pick)}
 @findex gnus-pick-article-or-thread
 Pick the article or thread on the current line
 (@code{gnus-pick-article-or-thread}).  If the variable
@@ -10372,14 +10365,14 @@ it selects just the article.  If given a numerical prefix, go to that
 thread or article and pick it.  (The line number is normally displayed
 at the beginning of the summary pick lines.)
 
-@item SPACE
-@kindex SPACE (Pick)
+@item @key{SPC}
+@kindex @key{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.
 
 @item u
-@kindex u (Pick)
+@kindex u @r{(Pick)}
 @findex gnus-pick-unmark-article-or-thread.
 Unpick the thread or article
 (@code{gnus-pick-unmark-article-or-thread}).  If the variable
@@ -10388,8 +10381,8 @@ thread if used at the first article of the thread.  Otherwise it unpicks
 just the article.  You can give this key a numerical prefix to unpick
 the thread or article at that line.
 
-@item RET
-@kindex RET (Pick)
+@item @key{RET}
+@kindex @key{RET} @r{(Pick)}
 @findex gnus-pick-start-reading
 @vindex gnus-pick-display-summary
 Start reading the picked articles (@code{gnus-pick-start-reading}).  If
@@ -10431,14 +10424,13 @@ Variables}).  It accepts the same format specs that
 @cindex binary groups
 
 @findex gnus-binary-mode
-@kindex M-x gnus-binary-mode
 If you spend much time in binary groups, you may grow tired of hitting
-@kbd{X u}, @kbd{n}, @kbd{RET} all the time.  @kbd{M-x gnus-binary-mode}
+@kbd{X u}, @kbd{n}, @kbd{@key{RET}} all the time.  @kbd{M-x gnus-binary-mode}
 is a minor mode for summary buffers that makes all ordinary Gnus article
 selection functions uudecode series of articles and display the result
 instead of just displaying the articles the normal way.
 
-@kindex g (Binary)
+@kindex g @r{(Binary)}
 @findex gnus-binary-show-article
 The only way, in fact, to see the actual articles is the @kbd{g}
 command, when you have turned on this mode
@@ -10614,7 +10606,7 @@ process/prefix convention (@pxref{Process/Prefix}).
 @table @kbd
 
 @item B e
-@kindex B e (Summary)
+@kindex B e @r{(Summary)}
 @findex gnus-summary-expire-articles
 @cindex expiring mail
 Run all expirable articles in the current group through the expiry
@@ -10623,7 +10615,7 @@ expirable articles in the group that have been around for a while.
 (@pxref{Expiring Mail}).
 
 @item B C-M-e
-@kindex B C-M-e (Summary)
+@kindex B C-M-e @r{(Summary)}
 @findex gnus-summary-expire-articles-now
 @cindex expiring mail
 Delete all the expirable articles in the group
@@ -10631,8 +10623,8 @@ Delete all the expirable articles in the group
 articles eligible for expiry in the current group will
 disappear forever into that big @file{/dev/null} in the sky.
 
-@item B DEL
-@kindex B DEL (Summary)
+@item B @key{DEL}
+@kindex B @key{DEL} @r{(Summary)}
 @cindex deleting mail
 @findex gnus-summary-delete-article
 @c @icon{gnus-summary-mail-delete}
@@ -10641,7 +10633,7 @@ disk forever and ever, never to return again.'' Use with caution.
 (@code{gnus-summary-delete-article}).
 
 @item B m
-@kindex B m (Summary)
+@kindex B m @r{(Summary)}
 @cindex move mail
 @findex gnus-summary-move-article
 @vindex gnus-preserve-marks
@@ -10650,7 +10642,7 @@ Move the article from one mail group to another
 @code{gnus-preserve-marks} is non-@code{nil} (which is the default).
 
 @item B c
-@kindex B c (Summary)
+@kindex B c @r{(Summary)}
 @cindex copy mail
 @findex gnus-summary-copy-article
 @c @icon{gnus-summary-mail-copy}
@@ -10659,7 +10651,7 @@ Copy the article from one group (mail group or not) to a mail group
 @code{gnus-preserve-marks} is non-@code{nil} (which is the default).
 
 @item B B
-@kindex B B (Summary)
+@kindex B B @r{(Summary)}
 @cindex crosspost mail
 @findex gnus-summary-crosspost-article
 Crosspost the current article to some other group
@@ -10668,21 +10660,21 @@ the article in the other group, and the Xref headers of the article will
 be properly updated.
 
 @item B i
-@kindex B i (Summary)
+@kindex B i @r{(Summary)}
 @findex gnus-summary-import-article
 Import an arbitrary file into the current mail newsgroup
 (@code{gnus-summary-import-article}).  You will be prompted for a file
 name, a @code{From} header and a @code{Subject} header.
 
 @item B I
-@kindex B I (Summary)
+@kindex B I @r{(Summary)}
 @findex gnus-summary-create-article
 Create an empty article in the current mail newsgroups
 (@code{gnus-summary-create-article}).  You will be prompted for a
 @code{From} header and a @code{Subject} header.
 
 @item B r
-@kindex B r (Summary)
+@kindex B r @r{(Summary)}
 @findex gnus-summary-respool-article
 @vindex gnus-summary-respool-default-method
 Respool the mail article (@code{gnus-summary-respool-article}).
@@ -10694,10 +10686,10 @@ Marks will be preserved if @code{gnus-preserve-marks} is non-@code{nil}
 
 @item B w
 @itemx e
-@kindex B w (Summary)
-@kindex e (Summary)
+@kindex B w @r{(Summary)}
+@kindex e @r{(Summary)}
 @findex gnus-summary-edit-article
-@kindex C-c C-c (Article)
+@kindex C-c C-c @r{(Article)}
 @findex gnus-summary-edit-article-done
 Edit the current article (@code{gnus-summary-edit-article}).  To finish
 editing and make the changes permanent, type @kbd{C-c C-c}
@@ -10705,20 +10697,20 @@ editing and make the changes permanent, type @kbd{C-c C-c}
 @kbd{C-c C-c} command, Gnus won't re-highlight the article.
 
 @item B q
-@kindex B q (Summary)
+@kindex B q @r{(Summary)}
 @findex gnus-summary-respool-query
 If you want to re-spool an article, you might be curious as to what group
 the article will end up in before you do the re-spooling.  This command
 will tell you (@code{gnus-summary-respool-query}).
 
 @item B t
-@kindex B t (Summary)
+@kindex B t @r{(Summary)}
 @findex gnus-summary-respool-trace
 Similarly, this command will display all fancy splitting patterns used
 when respooling, if any (@code{gnus-summary-respool-trace}).
 
 @item B p
-@kindex B p (Summary)
+@kindex B p @r{(Summary)}
 @findex gnus-summary-article-posted-p
 Some people have a tendency to send you ``courtesy'' copies when they
 follow up to articles you have posted.  These usually have a
@@ -10732,7 +10724,7 @@ propagation is much faster than news propagation, and the news copy may
 just not have arrived yet.
 
 @item K E
-@kindex K E (Summary)
+@kindex K E @r{(Summary)}
 @findex gnus-article-encrypt-body
 @vindex gnus-article-encrypt-protocol
 Encrypt the body of an article (@code{gnus-article-encrypt-body}).
@@ -10867,20 +10859,20 @@ Also @pxref{Group Parameters}.
 @table @kbd
 
 @item H d
-@kindex H d (Summary)
+@kindex H d @r{(Summary)}
 @findex gnus-summary-describe-group
 Give a brief description of the current group
 (@code{gnus-summary-describe-group}).  If given a prefix, force
 rereading the description from the server.
 
 @item H h
-@kindex H h (Summary)
+@kindex H h @r{(Summary)}
 @findex gnus-summary-describe-briefly
 Give an extremely brief description of the most important summary
 keystrokes (@code{gnus-summary-describe-briefly}).
 
 @item H i
-@kindex H i (Summary)
+@kindex H i @r{(Summary)}
 @findex gnus-info-find-node
 Go to the Gnus info node (@code{gnus-info-find-node}).
 @end table
@@ -10892,31 +10884,31 @@ Go to the Gnus info node (@code{gnus-info-find-node}).
 @table @kbd
 
 @item M-s
-@kindex M-s (Summary)
+@kindex M-s @r{(Summary)}
 @findex gnus-summary-search-article-forward
 Search through all subsequent (raw) articles for a regexp
 (@code{gnus-summary-search-article-forward}).
 
 @item M-r
-@kindex M-r (Summary)
+@kindex M-r @r{(Summary)}
 @findex gnus-summary-search-article-backward
 Search through all previous (raw) articles for a regexp
 (@code{gnus-summary-search-article-backward}).
 
 @item M-S
-@kindex M-S (Summary)
+@kindex M-S @r{(Summary)}
 @findex gnus-summary-repeat-search-article-forward
 Repeat the previous search forwards
 (@code{gnus-summary-repeat-search-article-forward}).
 
 @item M-R
-@kindex M-R (Summary)
+@kindex M-R @r{(Summary)}
 @findex gnus-summary-repeat-search-article-backward
 Repeat the previous search backwards
 (@code{gnus-summary-repeat-search-article-backward}).
 
 @item &
-@kindex & (Summary)
+@kindex & @r{(Summary)}
 @findex gnus-summary-execute-command
 This command will prompt you for a header, a regular expression to match
 on this field, and a command to be executed if the match is made
@@ -10924,11 +10916,12 @@ on this field, and a command to be executed if the match is made
 string, the match is done on the entire article.  If given a prefix,
 search backward instead.
 
-For instance, @kbd{& RET some.*string RET #} will put the process mark on
-all articles that have heads or bodies that match @samp{some.*string}.
+For instance, @kbd{& @key{RET} some.*string @key{RET} #} will put the
+process mark on all articles that have heads or bodies that match
+@samp{some.*string}.
 
 @item M-&
-@kindex M-& (Summary)
+@kindex M-& @r{(Summary)}
 @findex gnus-summary-universal-argument
 Perform any operation on all articles that have been marked with
 the process mark (@code{gnus-summary-universal-argument}).
@@ -10940,24 +10933,24 @@ the process mark (@code{gnus-summary-universal-argument}).
 @table @kbd
 
 @item Y g
-@kindex Y g (Summary)
+@kindex Y g @r{(Summary)}
 @findex gnus-summary-prepare
 Regenerate the current summary buffer (@code{gnus-summary-prepare}).
 
 @item Y c
-@kindex Y c (Summary)
+@kindex Y c @r{(Summary)}
 @findex gnus-summary-insert-cached-articles
 Pull all cached articles (for the current group) into the summary buffer
 (@code{gnus-summary-insert-cached-articles}).
 
 @item Y d
-@kindex Y d (Summary)
+@kindex Y d @r{(Summary)}
 @findex gnus-summary-insert-dormant-articles
 Pull all dormant articles (for the current group) into the summary buffer
 (@code{gnus-summary-insert-dormant-articles}).
 
 @item Y t
-@kindex Y t (Summary)
+@kindex Y t @r{(Summary)}
 @findex gnus-summary-insert-ticked-articles
 Pull all ticked articles (for the current group) into the summary buffer
 (@code{gnus-summary-insert-ticked-articles}).
@@ -10972,8 +10965,8 @@ Pull all ticked articles (for the current group) into the summary buffer
 
 @item A D
 @itemx C-d
-@kindex C-d (Summary)
-@kindex A D (Summary)
+@kindex C-d @r{(Summary)}
+@kindex A D @r{(Summary)}
 @findex gnus-summary-enter-digest-group
 If the current article is a collection of other articles (for instance,
 a digest), you might use this command to enter a group based on that
@@ -11007,7 +11000,7 @@ If it has any other value or there is no next (unread) article, the
 article selected before entering to the digest group will appear.
 
 @item C-M-d
-@kindex C-M-d (Summary)
+@kindex C-M-d @r{(Summary)}
 @findex gnus-summary-read-document
 This command is very similar to the one above, but lets you gather
 several documents into one biiig group
@@ -11018,7 +11011,7 @@ command understands the process/prefix convention
 (@pxref{Process/Prefix}).
 
 @item C-t
-@kindex C-t (Summary)
+@kindex C-t @r{(Summary)}
 @findex gnus-summary-toggle-truncation
 Toggle truncation of summary lines
 (@code{gnus-summary-toggle-truncation}).  This will probably confuse the
@@ -11026,19 +11019,19 @@ line centering function in the summary buffer, so it's not a good idea
 to have truncation switched off while reading articles.
 
 @item =
-@kindex = (Summary)
+@kindex = @r{(Summary)}
 @findex gnus-summary-expand-window
 Expand the summary buffer window (@code{gnus-summary-expand-window}).
 If given a prefix, force an @code{article} window configuration.
 
 @item C-M-e
-@kindex C-M-e (Summary)
+@kindex C-M-e @r{(Summary)}
 @findex gnus-summary-edit-parameters
 Edit the group parameters (@pxref{Group Parameters}) of the current
 group (@code{gnus-summary-edit-parameters}).
 
 @item C-M-a
-@kindex C-M-a (Summary)
+@kindex C-M-a @r{(Summary)}
 @findex gnus-summary-customize-parameters
 Customize the group parameters (@pxref{Group Parameters}) of the current
 group (@code{gnus-summary-customize-parameters}).
@@ -11059,9 +11052,9 @@ group and return you to the group buffer.
 @item Z Z
 @itemx Z Q
 @itemx q
-@kindex Z Z (Summary)
-@kindex Z Q (Summary)
-@kindex q (Summary)
+@kindex Z Z @r{(Summary)}
+@kindex Z Q @r{(Summary)}
+@kindex q @r{(Summary)}
 @findex gnus-summary-exit
 @vindex gnus-summary-exit-hook
 @vindex gnus-summary-prepare-exit-hook
@@ -11077,43 +11070,43 @@ group mode having no more (unread) groups.
 
 @item Z E
 @itemx Q
-@kindex Z E (Summary)
-@kindex Q (Summary)
+@kindex Z E @r{(Summary)}
+@kindex Q @r{(Summary)}
 @findex gnus-summary-exit-no-update
 Exit the current group without updating any information on the group
 (@code{gnus-summary-exit-no-update}).
 
 @item Z c
 @itemx c
-@kindex Z c (Summary)
-@kindex c (Summary)
+@kindex Z c @r{(Summary)}
+@kindex c @r{(Summary)}
 @findex gnus-summary-catchup-and-exit
 @c @icon{gnus-summary-catchup-and-exit}
 Mark all unticked articles in the group as read and then exit
 (@code{gnus-summary-catchup-and-exit}).
 
 @item Z C
-@kindex Z C (Summary)
+@kindex Z C @r{(Summary)}
 @findex gnus-summary-catchup-all-and-exit
 Mark all articles, even the ticked ones, as read and then exit
 (@code{gnus-summary-catchup-all-and-exit}).
 
 @item Z n
-@kindex Z n (Summary)
+@kindex Z n @r{(Summary)}
 @findex gnus-summary-catchup-and-goto-next-group
 Mark all articles as read and go to the next group
 (@code{gnus-summary-catchup-and-goto-next-group}).
 
 @item Z p
-@kindex Z p (Summary)
+@kindex Z p @r{(Summary)}
 @findex gnus-summary-catchup-and-goto-prev-group
 Mark all articles as read and go to the previous group
 (@code{gnus-summary-catchup-and-goto-prev-group}).
 
 @item Z R
 @itemx C-x C-s
-@kindex Z R (Summary)
-@kindex C-x C-s (Summary)
+@kindex Z R @r{(Summary)}
+@kindex C-x C-s @r{(Summary)}
 @findex gnus-summary-reselect-current-group
 Exit this group, and then enter it again
 (@code{gnus-summary-reselect-current-group}).  If given a prefix, select
@@ -11121,8 +11114,8 @@ all articles, both read and unread.
 
 @item Z G
 @itemx M-g
-@kindex Z G (Summary)
-@kindex M-g (Summary)
+@kindex Z G @r{(Summary)}
+@kindex M-g @r{(Summary)}
 @findex gnus-summary-rescan-group
 @c @icon{gnus-summary-mail-get}
 Exit the group, check for new articles in the group, and select the
@@ -11130,19 +11123,19 @@ group (@code{gnus-summary-rescan-group}).  If given a prefix, select all
 articles, both read and unread.
 
 @item Z N
-@kindex Z N (Summary)
+@kindex Z N @r{(Summary)}
 @findex gnus-summary-next-group
 Exit the group and go to the next group
 (@code{gnus-summary-next-group}).
 
 @item Z P
-@kindex Z P (Summary)
+@kindex Z P @r{(Summary)}
 @findex gnus-summary-prev-group
 Exit the group and go to the previous group
 (@code{gnus-summary-prev-group}).
 
 @item Z s
-@kindex Z s (Summary)
+@kindex Z s @r{(Summary)}
 @findex gnus-summary-save-newsrc
 Save the current number of read/marked articles in the dribble buffer
 and then save the dribble buffer (@code{gnus-summary-save-newsrc}).  If
@@ -11413,7 +11406,7 @@ encrypted messages up can be found in the message manual
 @cindex mailing list
 @cindex RFC 2396
 
-@kindex A M (summary)
+@kindex A M @r{(Summary)}
 @findex gnus-mailing-list-insinuate
 Gnus understands some mailing list fields of RFC 2369.  To enable it,
 add a @code{to-list} group parameter (@pxref{Group Parameters}),
@@ -11425,33 +11418,33 @@ That enables the following commands to the summary buffer:
 @table @kbd
 
 @item C-c C-n h
-@kindex C-c C-n h (Summary)
+@kindex C-c C-n h @r{(Summary)}
 @findex gnus-mailing-list-help
 Send a message to fetch mailing list help, if List-Help field exists.
 
 @item C-c C-n s
-@kindex C-c C-n s (Summary)
+@kindex C-c C-n s @r{(Summary)}
 @findex gnus-mailing-list-subscribe
 Send a message to subscribe the mailing list, if List-Subscribe field exists.
 
 @item C-c C-n u
-@kindex C-c C-n u (Summary)
+@kindex C-c C-n u @r{(Summary)}
 @findex gnus-mailing-list-unsubscribe
 Send a message to unsubscribe the mailing list, if List-Unsubscribe
 field exists.
 
 @item C-c C-n p
-@kindex C-c C-n p (Summary)
+@kindex C-c C-n p @r{(Summary)}
 @findex gnus-mailing-list-post
 Post to the mailing list, if List-Post field exists.
 
 @item C-c C-n o
-@kindex C-c C-n o (Summary)
+@kindex C-c C-n o @r{(Summary)}
 @findex gnus-mailing-list-owner
 Send a message to the mailing list owner, if List-Owner field exists.
 
 @item C-c C-n a
-@kindex C-c C-n a (Summary)
+@kindex C-c C-n a @r{(Summary)}
 @findex gnus-mailing-list-archive
 Browse the mailing list archive, if List-Archive field exists.
 
@@ -11629,9 +11622,9 @@ The following commands are available when you have placed point over a
 
 @table @kbd
 @findex gnus-article-press-button
-@item RET (Article)
-@kindex RET (Article)
-@itemx BUTTON-2 (Article)
+@item @key{RET} (Article)
+@kindex @key{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
 the object, Gnus resorts to external viewers in the @file{mailcap}
@@ -11639,33 +11632,33 @@ files.  If a viewer has the @samp{copiousoutput} specification, the
 object is displayed inline.
 
 @findex gnus-mime-view-part
-@item M-RET (Article)
-@kindex M-RET (Article)
+@item M-@key{RET} (Article)
+@kindex M-@key{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}).
 
 @findex gnus-mime-view-part-as-type
 @item t (Article)
-@kindex t (Article)
+@kindex t @r{(Article)}
 View the @acronym{MIME} object as if it were a different @acronym{MIME} media type
 (@code{gnus-mime-view-part-as-type}).
 
 @findex gnus-mime-view-part-as-charset
 @item C (Article)
-@kindex C (Article)
+@kindex C @r{(Article)}
 Prompt for a charset, and then view the @acronym{MIME} object using this
 charset (@code{gnus-mime-view-part-as-charset}).
 
 @findex gnus-mime-save-part
 @item o (Article)
-@kindex o (Article)
+@kindex o @r{(Article)}
 Prompt for a file name, and then save the @acronym{MIME} object
 (@code{gnus-mime-save-part}).
 
 @findex gnus-mime-save-part-and-strip
 @item C-o (Article)
-@kindex C-o (Article)
+@kindex C-o @r{(Article)}
 Prompt for a file name, then save the @acronym{MIME} object and strip it from
 the article.  Then proceed to article editing, where a reasonable
 suggestion is being made on how the altered article should look
@@ -11675,14 +11668,14 @@ message/external-body @acronym{MIME} type.
 
 @findex gnus-mime-replace-part
 @item r (Article)
-@kindex r (Article)
+@kindex r @r{(Article)}
 Prompt for a file name, replace the @acronym{MIME} object with an
 external body referring to the file via the message/external-body
 @acronym{MIME} type.  (@code{gnus-mime-replace-part}).
 
 @findex gnus-mime-delete-part
 @item d (Article)
-@kindex d (Article)
+@kindex d @r{(Article)}
 Delete the @acronym{MIME} object from the article and replace it with some
 information about the removed @acronym{MIME} object
 (@code{gnus-mime-delete-part}).
@@ -11691,7 +11684,7 @@ information about the removed @acronym{MIME} object
 
 @findex gnus-mime-copy-part
 @item c (Article)
-@kindex c (Article)
+@kindex c @r{(Article)}
 Copy the @acronym{MIME} object to a fresh buffer and display this buffer
 (@code{gnus-mime-copy-part}).  If given a prefix, copy the raw contents
 without decoding.  If given a numerical prefix, you can do semi-manual
@@ -11703,14 +11696,14 @@ Accessing Compressed Files, emacs, The Emacs Editor}).
 
 @findex gnus-mime-print-part
 @item p (Article)
-@kindex p (Article)
+@kindex p @r{(Article)}
 Print the @acronym{MIME} object (@code{gnus-mime-print-part}).  This
 command respects the @samp{print=} specifications in the
 @file{.mailcap} file.
 
 @findex gnus-mime-inline-part
 @item i (Article)
-@kindex i (Article)
+@kindex i @r{(Article)}
 Insert the contents of the @acronym{MIME} object into the buffer
 (@code{gnus-mime-inline-part}) as @samp{text/plain}.  If given a prefix, insert
 the raw contents without decoding.  If given a numerical prefix, you can
@@ -11723,25 +11716,25 @@ Compressed Files, emacs, The Emacs Editor}).
 
 @findex gnus-mime-view-part-internally
 @item E (Article)
-@kindex E (Article)
+@kindex E @r{(Article)}
 View the @acronym{MIME} object with an internal viewer.  If no internal
 viewer is available, use an external viewer
 (@code{gnus-mime-view-part-internally}).
 
 @findex gnus-mime-view-part-externally
 @item e (Article)
-@kindex e (Article)
+@kindex e @r{(Article)}
 View the @acronym{MIME} object with an external viewer.
 (@code{gnus-mime-view-part-externally}).
 
 @findex gnus-mime-pipe-part
 @item | (Article)
-@kindex | (Article)
+@kindex | @r{(Article)}
 Output the @acronym{MIME} object to a process (@code{gnus-mime-pipe-part}).
 
 @findex gnus-mime-action-on-part
 @item . (Article)
-@kindex . (Article)
+@kindex . @r{(Article)}
 Interactively run an action on the @acronym{MIME} object
 (@code{gnus-mime-action-on-part}).
 
@@ -11925,7 +11918,7 @@ controlling variable is a predicate list, as described above.
 
 @ifinfo
 @c Avoid sort of redundant entries in the same section for the printed
-@c manual, but add them in info to allow 'i gnus-treat-foo-bar RET' or
+@c manual, but add them in info to allow 'i gnus-treat-foo-bar @key{RET}' or
 @c 'i foo-bar'.
 @vindex gnus-treat-buttonize
 @vindex gnus-treat-buttonize-head
@@ -12130,7 +12123,7 @@ buffer, which means that you don't actually have to have a summary
 buffer displayed while reading.  You can do it all from the article
 buffer.
 
-@kindex v (Article)
+@kindex v @r{(Article)}
 @cindex keys, reserved for users (Article)
 The key @kbd{v} is reserved for users.  You can bind it to some
 command or better use it as a prefix key.
@@ -12139,70 +12132,70 @@ A few additional keystrokes are available:
 
 @table @kbd
 
-@item SPACE
-@kindex SPACE (Article)
+@item @key{SPC}
+@kindex @key{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 SPACE h}.
+This is exactly the same as @kbd{h @key{SPC} h}.
 
-@item DEL
-@kindex DEL (Article)
+@item @key{DEL}
+@kindex @key{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 DEL h}.
+This is exactly the same as @kbd{h @key{DEL} h}.
 
 @item C-c ^
-@kindex C-c ^ (Article)
+@kindex C-c ^ @r{(Article)}
 @findex gnus-article-refer-article
 If point is in the neighborhood of a @code{Message-ID} and you press
 @kbd{C-c ^}, Gnus will try to get that article from the server
 (@code{gnus-article-refer-article}).
 
 @item C-c C-m
-@kindex C-c C-m (Article)
+@kindex C-c C-m @r{(Article)}
 @findex gnus-article-mail
 Send a reply to the address near point (@code{gnus-article-mail}).  If
 given a prefix, include the mail.
 
 @item s
-@kindex s (Article)
+@kindex s @r{(Article)}
 @findex gnus-article-show-summary
 Reconfigure the buffers so that the summary buffer becomes visible
 (@code{gnus-article-show-summary}).
 
 @item ?
-@kindex ? (Article)
+@kindex ? @r{(Article)}
 @findex gnus-article-describe-briefly
 Give a very brief description of the available keystrokes
 (@code{gnus-article-describe-briefly}).
 
-@item TAB
-@kindex TAB (Article)
+@item @key{TAB}
+@kindex @key{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-TAB
-@kindex M-TAB (Article)
+@item M-@key{TAB}
+@kindex M-@key{TAB} @r{(Article)}
 @findex gnus-article-prev-button
 Go to the previous button, if any (@code{gnus-article-prev-button}).
 
 @item R
-@kindex R (Article)
+@kindex R @r{(Article)}
 @findex gnus-article-reply-with-original
 Send a reply to the current article and yank the current article
 (@code{gnus-article-reply-with-original}).  If the region is active,
 only yank the text in the region.
 
 @item S W
-@kindex S W (Article)
+@kindex S W @r{(Article)}
 @findex gnus-article-wide-reply-with-original
 Send a wide reply to the current article and yank the current article
 (@code{gnus-article-wide-reply-with-original}).  If the region is
 active, only yank the text in the region.
 
 @item F
-@kindex F (Article)
+@kindex F @r{(Article)}
 @findex gnus-article-followup-with-original
 Send a followup to the current article and yank the current article
 (@code{gnus-article-followup-with-original}).  If the region is active,
@@ -12348,7 +12341,7 @@ when @code{mm-text-html-renderer} (@pxref{Display Customization,
 @cindex using s/mime
 @cindex using smime
 
-@kindex C-c C-c (Post)
+@kindex C-c C-c @r{(Post)}
 All commands for posting and mailing will put you in a message buffer
 where you can edit the article all you like, before you send the
 article by pressing @kbd{C-c C-c}.  @xref{Top, , Overview, message,
@@ -12946,10 +12939,10 @@ correct parameters.  The content of the group is not lost.
 
 @c @findex gnus-dissociate-buffer-from-draft
 @c @kindex C-c M-d (Mail)
-@c @kindex C-c M-d (Post)
+@c @kindex C-c M-d @r{(Post)}
 @c @findex gnus-associate-buffer-with-draft
 @c @kindex C-c C-d (Mail)
-@c @kindex C-c C-d (Post)
+@c @kindex C-c C-d @r{(Post)}
 @c If you're writing some super-secret message that you later want to
 @c encode with PGP before sending, you may wish to turn the auto-saving
 @c (and association with the draft group) off.  You never know who might be
@@ -12964,7 +12957,7 @@ correct parameters.  The content of the group is not lost.
 @c @code{gnus-use-draft} to @code{nil}.  It is @code{t} by default.
 
 @findex gnus-draft-edit-message
-@kindex D e (Draft)
+@kindex D e @r{(Draft)}
 When you want to continue editing the article, you simply enter the
 draft group and push @kbd{D e} (@code{gnus-draft-edit-message}) to do
 that.  You will be placed in a buffer where you left off.
@@ -12973,9 +12966,9 @@ Rejected articles will also be put in this draft group (@pxref{Rejected
 Articles}).
 
 @findex gnus-draft-send-all-messages
-@kindex D s (Draft)
+@kindex D s @r{(Draft)}
 @findex gnus-draft-send-message
-@kindex D S (Draft)
+@kindex D S @r{(Draft)}
 If you have lots of rejected messages you want to post (or mail) without
 doing further editing, you can use the @kbd{D s} command
 (@code{gnus-draft-send-message}).  This command understands the
@@ -12984,12 +12977,12 @@ command (@code{gnus-draft-send-all-messages}) will ship off all messages
 in the buffer.
 
 @findex gnus-draft-toggle-sending
-@kindex D t (Draft)
+@kindex D t @r{(Draft)}
 If you have some messages that you wish not to send, you can use the
 @kbd{D t} (@code{gnus-draft-toggle-sending}) command to mark the message
 as unsendable.  This is a toggling command.
 
-Finally, if you want to delete a draft, use the normal @kbd{B DEL}
+Finally, if you want to delete a draft, use the normal @kbd{B @key{DEL}}
 command (@pxref{Mail Group Commands}).
 
 
@@ -13041,43 +13034,43 @@ signing and the @kbd{C-c C-m c} key map for encryption, as follows.
 @table @kbd
 
 @item C-c C-m s s
-@kindex C-c C-m s s (Message)
+@kindex C-c C-m s s @r{(Message)}
 @findex mml-secure-message-sign-smime
 
 Digitally sign current message using @acronym{S/MIME}.
 
 @item C-c C-m s o
-@kindex C-c C-m s o (Message)
+@kindex C-c C-m s o @r{(Message)}
 @findex mml-secure-message-sign-pgp
 
 Digitally sign current message using @acronym{PGP}.
 
 @item C-c C-m s p
-@kindex C-c C-m s p (Message)
+@kindex C-c C-m s p @r{(Message)}
 @findex mml-secure-message-sign-pgp
 
 Digitally sign current message using @acronym{PGP/MIME}.
 
 @item C-c C-m c s
-@kindex C-c C-m c s (Message)
+@kindex C-c C-m c s @r{(Message)}
 @findex mml-secure-message-encrypt-smime
 
 Digitally encrypt current message using @acronym{S/MIME}.
 
 @item C-c C-m c o
-@kindex C-c C-m c o (Message)
+@kindex C-c C-m c o @r{(Message)}
 @findex mml-secure-message-encrypt-pgp
 
 Digitally encrypt current message using @acronym{PGP}.
 
 @item C-c C-m c p
-@kindex C-c C-m c p (Message)
+@kindex C-c C-m c p @r{(Message)}
 @findex mml-secure-message-encrypt-pgpmime
 
 Digitally encrypt current message using @acronym{PGP/MIME}.
 
 @item C-c C-m C-n
-@kindex C-c C-m C-n (Message)
+@kindex C-c C-m C-n @r{(Message)}
 @findex mml-unsecure-message
 Remove security related @acronym{MML} tags from message.
 
@@ -13219,72 +13212,72 @@ Also @pxref{Formatting Variables}.
 @table @kbd
 
 @item v
-@kindex v (Server)
+@kindex v @r{(Server)}
 @cindex keys, reserved for users (Server)
 The key @kbd{v} is reserved for users.  You can bind it to some
 command or better use it as a prefix key.
 
 @item a
-@kindex a (Server)
+@kindex a @r{(Server)}
 @findex gnus-server-add-server
 Add a new server (@code{gnus-server-add-server}).
 
 @item e
-@kindex e (Server)
+@kindex e @r{(Server)}
 @findex gnus-server-edit-server
 Edit a server (@code{gnus-server-edit-server}).
 
 @item S
-@kindex S (Server)
+@kindex S @r{(Server)}
 @findex gnus-server-show-server
 Show the definition of a server (@code{gnus-server-show-server}).
 
-@item SPACE
-@kindex SPACE (Server)
+@item @key{SPC}
+@kindex @key{SPC} @r{(Server)}
 @findex gnus-server-read-server
 Browse the current server (@code{gnus-server-read-server}).
 
 @item q
-@kindex q (Server)
+@kindex q @r{(Server)}
 @findex gnus-server-exit
 Return to the group buffer (@code{gnus-server-exit}).
 
 @item k
-@kindex k (Server)
+@kindex k @r{(Server)}
 @findex gnus-server-kill-server
 Kill the current server (@code{gnus-server-kill-server}).
 
 @item y
-@kindex y (Server)
+@kindex y @r{(Server)}
 @findex gnus-server-yank-server
 Yank the previously killed server (@code{gnus-server-yank-server}).
 
 @item c
-@kindex c (Server)
+@kindex c @r{(Server)}
 @findex gnus-server-copy-server
 Copy the current server (@code{gnus-server-copy-server}).
 
 @item l
-@kindex l (Server)
+@kindex l @r{(Server)}
 @findex gnus-server-list-servers
 List all servers (@code{gnus-server-list-servers}).
 
 @item s
-@kindex s (Server)
+@kindex s @r{(Server)}
 @findex gnus-server-scan-server
 Request that the server scan its sources for new articles
 (@code{gnus-server-scan-server}).  This is mainly sensible with mail
 servers.
 
 @item g
-@kindex g (Server)
+@kindex g @r{(Server)}
 @findex gnus-server-regenerate-server
 Request that the server regenerate all its data structures
 (@code{gnus-server-regenerate-server}).  This can be useful if you have
 a mail back end that has gotten out of sync.
 
 @item z
-@kindex z (Server)
+@kindex z @r{(Server)}
 @findex gnus-server-compact-server
 
 Compact all groups in the server under point
@@ -13416,7 +13409,7 @@ First you need to add a new server.  The @kbd{a} command does that.  It
 would probably be best to use @code{nnml} to read the cache.  You
 could also use @code{nnspool} or @code{nnmh}, though.
 
-Type @kbd{a nnml RET cache RET}.
+Type @kbd{a nnml @key{RET} cache @key{RET}}.
 
 You should now have a brand new @code{nnml} virtual server called
 @samp{cache}.  You now need to edit it to have the right definitions.
@@ -13436,7 +13429,7 @@ Change that to:
 @end lisp
 
 Type @kbd{C-c C-c} to return to the server buffer.  If you now press
-@kbd{RET} over this virtual server, you should be entered into a browse
+@kbd{@key{RET}} over this virtual server, you should be entered into a browse
 buffer, and you should be able to enter any of the groups displayed.
 
 
@@ -13507,44 +13500,44 @@ with the following commands:
 @table @kbd
 
 @item O
-@kindex O (Server)
+@kindex O @r{(Server)}
 @findex gnus-server-open-server
 Try to establish connection to the server on the current line
 (@code{gnus-server-open-server}).
 
 @item C
-@kindex C (Server)
+@kindex C @r{(Server)}
 @findex gnus-server-close-server
 Close the connection (if any) to the server
 (@code{gnus-server-close-server}).
 
 @item D
-@kindex D (Server)
+@kindex D @r{(Server)}
 @findex gnus-server-deny-server
 Mark the current server as unreachable
 (@code{gnus-server-deny-server}).  This will effectively disable the
 server.
 
 @item M-o
-@kindex M-o (Server)
+@kindex M-o @r{(Server)}
 @findex gnus-server-open-all-servers
 Open the connections to all servers in the buffer
 (@code{gnus-server-open-all-servers}).
 
 @item M-c
-@kindex M-c (Server)
+@kindex M-c @r{(Server)}
 @findex gnus-server-close-all-servers
 Close the connections to all servers in the buffer
 (@code{gnus-server-close-all-servers}).
 
 @item R
-@kindex R (Server)
+@kindex R @r{(Server)}
 @findex gnus-server-remove-denials
 Remove all marks to whether Gnus was denied connection from any servers
 (@code{gnus-server-remove-denials}).
 
 @item c
-@kindex c (Server)
+@kindex c @r{(Server)}
 @findex gnus-server-copy-server
 Copy a server and give it a new name
 (@code{gnus-server-copy-server}).  This can be useful if you have a
@@ -13552,7 +13545,7 @@ complex method definition, and want to use the same definition towards
 a different (physical) server.
 
 @item L
-@kindex L (Server)
+@kindex L @r{(Server)}
 @findex gnus-server-offline-server
 Set server status to offline (@code{gnus-server-offline-server}).
 
@@ -14560,7 +14553,7 @@ see @ref{Fancy Mail Splitting}.
 Note that the mail back ends are free to maul the poor, innocent,
 incoming headers all they want to.  They all add @code{Lines} headers;
 some add @code{X-Gnus-Group} headers; most rename the Unix mbox
-@code{From<SPACE>} line to something else.
+@code{From@key{SPC}} line to something else.
 
 @vindex nnmail-crosspost
 The mail back ends all support cross-posting.  If several regexps match,
@@ -14577,7 +14570,6 @@ links.  If that's the case for you, set
 @code{nnmail-crosspost-link-function} to @code{copy-file}.  (This
 variable is @code{add-name-to-file} by default.)
 
-@kindex M-x nnmail-split-history
 @findex nnmail-split-history
 If you wish to see where the previous mail split put the messages, you
 can use the @kbd{M-x nnmail-split-history} command.  If you wish to see
@@ -15716,7 +15708,7 @@ Type @kbd{G f} and give the file name to the mbox file when prompted to create a
 @code{nndoc} group from the mbox file (@pxref{Foreign Groups}).
 
 @item
-Type @kbd{SPACE} to enter the newly created group.
+Type @kbd{@key{SPC}} to enter the newly created group.
 
 @item
 Type @kbd{M P b} to process-mark all articles in this group's buffer
@@ -16031,7 +16023,7 @@ This can also be done non-destructively with
 
 @item nnmail-remove-tabs
 @findex nnmail-remove-tabs
-Translate all @samp{TAB} characters into @samp{SPACE} characters.
+Translate all @samp{@key{TAB}} characters into @samp{@key{SPC}} characters.
 
 @item nnmail-ignore-broken-references
 @findex nnmail-ignore-broken-references
@@ -16708,7 +16700,6 @@ The directory where the @acronym{NOV} files should be stored.  If
 
 
 @findex nnfolder-generate-active-file
-@kindex M-x nnfolder-generate-active-file
 If you have lots of @code{nnfolder}-like files you'd like to read with
 @code{nnfolder}, you can use the @kbd{M-x nnfolder-generate-active-file}
 command to make @code{nnfolder} aware of all likely files in
@@ -17057,14 +17048,14 @@ system because @acronym{RSS} uses UTF-8 for encoding non-@acronym{ASCII}
 text by default.  It is also used by default for non-@acronym{ASCII}
 group names.
 
-@kindex G R (Group)
+@kindex G R @r{(Group)}
 Use @kbd{G R} from the group buffer to subscribe to a feed---you will be
 prompted for the location, the title and the description of the feed.
 The title, which allows any characters, will be used for the group name
 and the name of the group data file.  The description can be omitted.
 
 An easy way to get started with @code{nnrss} is to say something like
-the following in the group buffer: @kbd{B nnrss RET RET y}, then
+the following in the group buffer: @kbd{B nnrss @key{RET} @key{RET} y}, then
 subscribe to groups.
 
 The @code{nnrss} back end saves the group data file in
@@ -18665,51 +18656,51 @@ The following commands are available in this buffer:
 
 @table @kbd
 @item q
-@kindex q (Category)
+@kindex q @r{(Category)}
 @findex gnus-category-exit
 Return to the group buffer (@code{gnus-category-exit}).
 
 @item e
-@kindex e (Category)
+@kindex e @r{(Category)}
 @findex gnus-category-customize-category
 Use a customization buffer to set all of the selected category's
 parameters at one time (@code{gnus-category-customize-category}).
 
 @item k
-@kindex k (Category)
+@kindex k @r{(Category)}
 @findex gnus-category-kill
 Kill the current category (@code{gnus-category-kill}).
 
 @item c
-@kindex c (Category)
+@kindex c @r{(Category)}
 @findex gnus-category-copy
 Copy the current category (@code{gnus-category-copy}).
 
 @item a
-@kindex a (Category)
+@kindex a @r{(Category)}
 @findex gnus-category-add
 Add a new category (@code{gnus-category-add}).
 
 @item p
-@kindex p (Category)
+@kindex p @r{(Category)}
 @findex gnus-category-edit-predicate
 Edit the predicate of the current category
 (@code{gnus-category-edit-predicate}).
 
 @item g
-@kindex g (Category)
+@kindex g @r{(Category)}
 @findex gnus-category-edit-groups
 Edit the list of groups belonging to the current category
 (@code{gnus-category-edit-groups}).
 
 @item s
-@kindex s (Category)
+@kindex s @r{(Category)}
 @findex gnus-category-edit-score
 Edit the download score rule of the current category
 (@code{gnus-category-edit-score}).
 
 @item l
-@kindex l (Category)
+@kindex l @r{(Category)}
 @findex gnus-category-list
 List all the categories (@code{gnus-category-list}).
 @end table
@@ -18783,7 +18774,7 @@ have to enable expiration in selected groups.
 @node Agent Commands
 @subsection Agent Commands
 @findex gnus-agent-toggle-plugged
-@kindex J j (Agent)
+@kindex J j @r{(Agent)}
 
 All the Gnus Agent commands are on the @kbd{J} submap.  The @kbd{J j}
 (@code{gnus-agent-toggle-plugged}) command works in all modes, and
@@ -18804,44 +18795,44 @@ toggles the plugged/unplugged state of the Gnus Agent.
 
 @table @kbd
 @item J u
-@kindex J u (Agent Group)
+@kindex J u @r{(Agent Group)}
 @findex gnus-agent-fetch-groups
 Fetch all eligible articles in the current group
 (@code{gnus-agent-fetch-groups}).
 
 @item J c
-@kindex J c (Agent Group)
+@kindex J c @r{(Agent Group)}
 @findex gnus-enter-category-buffer
 Enter the Agent category buffer (@code{gnus-enter-category-buffer}).
 
 @item J s
-@kindex J s (Agent Group)
+@kindex J s @r{(Agent Group)}
 @findex gnus-agent-fetch-session
 Fetch all eligible articles in all groups
 (@code{gnus-agent-fetch-session}).
 
 @item J S
-@kindex J S (Agent Group)
+@kindex J S @r{(Agent Group)}
 @findex gnus-group-send-queue
 Send all sendable messages in the queue group
 (@code{gnus-group-send-queue}).  @xref{Drafts}.
 
 @item J a
-@kindex J a (Agent Group)
+@kindex J a @r{(Agent Group)}
 @findex gnus-agent-add-group
 Add the current group to an Agent category
 (@code{gnus-agent-add-group}).  This command understands the
 process/prefix convention (@pxref{Process/Prefix}).
 
 @item J r
-@kindex J r (Agent Group)
+@kindex J r @r{(Agent Group)}
 @findex gnus-agent-remove-group
 Remove the current group from its category, if any
 (@code{gnus-agent-remove-group}).  This command understands the
 process/prefix convention (@pxref{Process/Prefix}).
 
 @item J Y
-@kindex J Y (Agent Group)
+@kindex J Y @r{(Agent Group)}
 @findex gnus-agent-synchronize-flags
 Synchronize flags changed while unplugged with remote server, if any.
 
@@ -18854,43 +18845,43 @@ Synchronize flags changed while unplugged with remote server, if any.
 
 @table @kbd
 @item J #
-@kindex J # (Agent Summary)
+@kindex J # @r{(Agent Summary)}
 @findex gnus-agent-mark-article
 Mark the article for downloading (@code{gnus-agent-mark-article}).
 
 @item J M-#
-@kindex J M-# (Agent Summary)
+@kindex J M-# @r{(Agent Summary)}
 @findex gnus-agent-unmark-article
 Remove the downloading mark from the article
 (@code{gnus-agent-unmark-article}).
 
 @cindex %
 @item @@
-@kindex @@ (Agent Summary)
+@kindex @@ @r{(Agent Summary)}
 @findex gnus-agent-toggle-mark
 Toggle whether to download the article
 (@code{gnus-agent-toggle-mark}).  The download mark is @samp{%} by
 default.
 
 @item J c
-@kindex J c (Agent Summary)
+@kindex J c @r{(Agent Summary)}
 @findex gnus-agent-catchup
 Mark all articles as read (@code{gnus-agent-catchup}) that are neither cached, downloaded, nor downloadable.
 
 @item J S
-@kindex J S (Agent Summary)
+@kindex J S @r{(Agent Summary)}
 @findex gnus-agent-fetch-group
 Download all eligible (@pxref{Agent Categories}) articles in this group.
 (@code{gnus-agent-fetch-group}).
 
 @item J s
-@kindex J s (Agent Summary)
+@kindex J s @r{(Agent Summary)}
 @findex gnus-agent-summary-fetch-series
 Download all processable articles in this group.
 (@code{gnus-agent-summary-fetch-series}).
 
 @item J u
-@kindex J u (Agent Summary)
+@kindex J u @r{(Agent Summary)}
 @findex gnus-agent-summary-fetch-group
 Download all downloadable articles in the current group
 (@code{gnus-agent-summary-fetch-group}).
@@ -18903,13 +18894,13 @@ Download all downloadable articles in the current group
 
 @table @kbd
 @item J a
-@kindex J a (Agent Server)
+@kindex J a @r{(Agent Server)}
 @findex gnus-agent-add-server
 Add the current server to the list of servers covered by the Gnus Agent
 (@code{gnus-agent-add-server}).
 
 @item J r
-@kindex J r (Agent Server)
+@kindex J r @r{(Agent Server)}
 @findex gnus-agent-remove-server
 Remove the current server from the list of servers covered by the Gnus
 Agent (@code{gnus-agent-remove-server}).
@@ -19010,8 +19001,6 @@ sense if you are using a nntp or nnimap back end.
 
 @vindex gnus-agent-expire-days
 @findex gnus-agent-expire
-@kindex M-x gnus-agent-expire
-@kindex M-x gnus-agent-expire-group
 @findex gnus-agent-expire-group
 @cindex agent expiry
 @cindex Gnus agent expiry
@@ -19065,14 +19054,12 @@ failure.  Running @code{gnus-agent-regenerate} or
 such that you don't need to download these articles a second time.
 
 @findex gnus-agent-regenerate
-@kindex M-x gnus-agent-regenerate
 The command @code{gnus-agent-regenerate} will perform
 @code{gnus-agent-regenerate-group} on every agentized group.  While
 you can run @code{gnus-agent-regenerate} in any buffer, it is strongly
 recommended that you first close all summary buffers.
 
 @findex gnus-agent-regenerate-group
-@kindex M-x gnus-agent-regenerate-group
 The command @code{gnus-agent-regenerate-group} uses the local copies
 of individual articles to repair the local @acronym{NOV}(header) database.  It
 then updates the internal data structures that document which articles
@@ -19458,18 +19445,18 @@ General score commands that don't actually change the score file:
 @table @kbd
 
 @item V s
-@kindex V s (Summary)
+@kindex V s @r{(Summary)}
 @findex gnus-summary-set-score
 Set the score of the current article (@code{gnus-summary-set-score}).
 
 @item V S
-@kindex V S (Summary)
+@kindex V S @r{(Summary)}
 @findex gnus-summary-current-score
 Display the score of the current article
 (@code{gnus-summary-current-score}).
 
 @item V t
-@kindex V t (Summary)
+@kindex V t @r{(Summary)}
 @findex gnus-score-find-trace
 Display all score rules that have been used on the current article
 (@code{gnus-score-find-trace}).  In the @file{*Score Trace*} buffer, you
@@ -19478,12 +19465,12 @@ current line and @kbd{f} to format (@code{gnus-score-pretty-print}) the
 score file and edit it.
 
 @item V w
-@kindex V w (Summary)
+@kindex V w @r{(Summary)}
 @findex gnus-score-find-favourite-words
 List words used in scoring (@code{gnus-score-find-favourite-words}).
 
 @item V R
-@kindex V R (Summary)
+@kindex V R @r{(Summary)}
 @findex gnus-summary-rescore
 Run the current summary through the scoring process
 (@code{gnus-summary-rescore}).  This might be useful if you're playing
@@ -19491,32 +19478,32 @@ around with your score files behind Gnus' back and want to see the
 effect you're having.
 
 @item V c
-@kindex V c (Summary)
+@kindex V c @r{(Summary)}
 @findex gnus-score-change-score-file
 Make a different score file the current
 (@code{gnus-score-change-score-file}).
 
 @item V e
-@kindex V e (Summary)
+@kindex V e @r{(Summary)}
 @findex gnus-score-edit-current-scores
 Edit the current score file (@code{gnus-score-edit-current-scores}).
 You will be popped into a @code{gnus-score-mode} buffer (@pxref{Score
 File Editing}).
 
 @item V f
-@kindex V f (Summary)
+@kindex V f @r{(Summary)}
 @findex gnus-score-edit-file
 Edit a score file and make this score file the current one
 (@code{gnus-score-edit-file}).
 
 @item V F
-@kindex V F (Summary)
+@kindex V F @r{(Summary)}
 @findex gnus-score-flush-cache
 Flush the score cache (@code{gnus-score-flush-cache}).  This is useful
 after editing score files.
 
 @item V C
-@kindex V C (Summary)
+@kindex V C @r{(Summary)}
 @findex gnus-score-customize
 Customize a score file in a visually pleasing manner
 (@code{gnus-score-customize}).
@@ -19528,13 +19515,13 @@ The rest of these commands modify the local score file.
 @table @kbd
 
 @item V m
-@kindex V m (Summary)
+@kindex V m @r{(Summary)}
 @findex gnus-score-set-mark-below
 Prompt for a score, and mark all articles with a score below this as
 read (@code{gnus-score-set-mark-below}).
 
 @item V x
-@kindex V x (Summary)
+@kindex V x @r{(Summary)}
 @findex gnus-score-set-expunge-below
 Prompt for a score, and add a score rule to the current score file to
 expunge all articles below this score
@@ -19669,7 +19656,7 @@ Immediately scoring.
 @item
 If you are scoring on @samp{e} (extra) headers, you will then be prompted for
 the header name on which you wish to score.  This must be a header named
-in gnus-extra-headers, and @samp{TAB} completion is available.
+in gnus-extra-headers, and @samp{@key{TAB}} completion is available.
 
 @end enumerate
 
@@ -19704,13 +19691,13 @@ There aren't many of these as yet, I'm afraid.
 @table @kbd
 
 @item W e
-@kindex W e (Group)
+@kindex W e @r{(Group)}
 @findex gnus-score-edit-all-score
 Edit the apply-to-all-groups all.SCORE file.  You will be popped into
 a @code{gnus-score-mode} buffer (@pxref{Score File Editing}).
 
 @item W f
-@kindex W f (Group)
+@kindex W f @r{(Group)}
 @findex gnus-score-flush-cache
 Gnus maintains a cache of score alists to avoid having to reload them
 all the time.  This command will flush the cache
@@ -20194,20 +20181,20 @@ additional commands:
 @table @kbd
 
 @item C-c C-c
-@kindex C-c C-c (Score)
+@kindex C-c C-c @r{(Score)}
 @findex gnus-score-edit-exit
 Save the changes you have made and return to the summary buffer
 (@code{gnus-score-edit-exit}).
 
 @item C-c C-d
-@kindex C-c C-d (Score)
+@kindex C-c C-d @r{(Score)}
 @findex gnus-score-edit-insert-date
 Insert the current date in numerical format
 (@code{gnus-score-edit-insert-date}).  This is really the day number, if
 you were wondering.
 
 @item C-c C-p
-@kindex C-c C-p (Score)
+@kindex C-c C-p @r{(Score)}
 @findex gnus-score-pretty-print
 The adaptive score files are saved in an unformatted fashion.  If you
 intend to read one of these files, you want to @dfn{pretty print} it
@@ -20573,7 +20560,7 @@ Restart Gnus and rebuild your @code{nnml} overview files with the
 time if you have much mail.
 
 Now you can score on @samp{To} and @samp{Cc} as ``extra headers'' like
-so: @kbd{I e s p To RET <your name> RET}.
+so: @kbd{I e s p To @key{RET} <your name> @key{RET}}.
 
 See?  Simple.
 
@@ -20760,12 +20747,12 @@ Two summary functions for editing a @sc{gnus} kill file:
 @table @kbd
 
 @item M-k
-@kindex M-k (Summary)
+@kindex M-k @r{(Summary)}
 @findex gnus-summary-edit-local-kill
 Edit this group's kill file (@code{gnus-summary-edit-local-kill}).
 
 @item M-K
-@kindex M-K (Summary)
+@kindex M-K @r{(Summary)}
 @findex gnus-summary-edit-global-kill
 Edit the general kill file (@code{gnus-summary-edit-global-kill}).
 @end table
@@ -20775,12 +20762,12 @@ Two group mode functions for editing the kill files:
 @table @kbd
 
 @item M-k
-@kindex M-k (Group)
+@kindex M-k @r{(Group)}
 @findex gnus-group-edit-local-kill
 Edit this group's kill file (@code{gnus-group-edit-local-kill}).
 
 @item M-K
-@kindex M-K (Group)
+@kindex M-K @r{(Group)}
 @findex gnus-group-edit-global-kill
 Edit the general kill file (@code{gnus-group-edit-global-kill}).
 @end table
@@ -21720,7 +21707,7 @@ want.
 @item
 The name of the @strong{back end server} where mairix should store its
 searches.  This must be a full server name, like @code{nnml:mymail}.
-Just hit @kbd{TAB} to see the available servers.  Currently, servers
+Just hit @kbd{@key{TAB}} to see the available servers.  Currently, servers
 which are accessed through @code{nnmaildir}, @code{nnimap} and
 @code{nnml} are supported.  As explained above, for locally stored
 mails, this can be an existing server where you store your mails.
@@ -21765,34 +21752,34 @@ In group mode:
 @table @kbd
 
 @item G b c
-@kindex G b c (Group)
+@kindex G b c @r{(Group)}
 @findex nnmairix-create-server-and-default-group
 Creates @code{nnmairix} server and default search group for this server
 (@code{nnmairix-create-server-and-default-group}).  You should have done
 this by now (@pxref{Configuring nnmairix}).
 
 @item G b s
-@kindex G b s (Group)
+@kindex G b s @r{(Group)}
 @findex nnmairix-search
 Prompts for query which is then sent to the mairix binary.  Search
 results are put into the default search group which is automatically
 displayed (@code{nnmairix-search}).
 
 @item G b m
-@kindex G b m (Group)
+@kindex G b m @r{(Group)}
 @findex nnmairix-widget-search
 Allows you to create a mairix search or a permanent group more
 comfortably using graphical widgets, similar to a customization
 group.  Just try it to see how it works (@code{nnmairix-widget-search}).
 
 @item G b i
-@kindex G b i (Group)
+@kindex G b i @r{(Group)}
 @findex nnmairix-search-interactive
 Another command for creating a mairix query more comfortably, but uses
 only the minibuffer (@code{nnmairix-search-interactive}).
 
 @item G b g
-@kindex G b g (Group)
+@kindex G b g @r{(Group)}
 @findex nnmairix-create-search-group
 Creates a permanent group which is associated with a search query
 (@code{nnmairix-create-search-group}).  The @code{nnmairix} back end
@@ -21800,20 +21787,20 @@ automatically calls mairix when you update this group with @kbd{g} or
 @kbd{M-g}.
 
 @item G b q
-@kindex G b q (Group)
+@kindex G b q @r{(Group)}
 @findex nnmairix-group-change-query-this-group
 Changes the search query for the @code{nnmairix} group under cursor
 (@code{nnmairix-group-change-query-this-group}).
 
 @item G b t
-@kindex G b t (Group)
+@kindex G b t @r{(Group)}
 @findex nnmairix-group-toggle-threads-this-group
 Toggles the 'threads' parameter for the @code{nnmairix} group under cursor,
 i.e., if you want see the whole threads of the found messages
 (@code{nnmairix-group-toggle-threads-this-group}).
 
 @item G b u
-@kindex G b u (Group)
+@kindex G b u @r{(Group)}
 @findex nnmairix-update-database
 @vindex nnmairix-mairix-update-options
 Calls mairix binary for updating the database
@@ -21823,20 +21810,20 @@ and @code{-Q} for making this as fast as possible (see variable
 options).
 
 @item G b r
-@kindex G b r (Group)
+@kindex G b r @r{(Group)}
 @findex nnmairix-group-toggle-readmarks-this-group
 Keep articles in this @code{nnmairix} group always read or unread, or leave the
 marks unchanged (@code{nnmairix-group-toggle-readmarks-this-group}).
 
 @item G b d
-@kindex G b d (Group)
+@kindex G b d @r{(Group)}
 @findex nnmairix-group-delete-recreate-this-group
 Recreate @code{nnmairix} group on the ``real'' mail back end
 (@code{nnmairix-group-delete-recreate-this-group}).  You can do this if
 you always get wrong article counts with a @code{nnmairix} group.
 
 @item G b a
-@kindex G b a (Group)
+@kindex G b a @r{(Group)}
 @findex nnmairix-group-toggle-allowfast-this-group
 Toggles the @code{allow-fast} parameters for group under cursor
 (@code{nnmairix-group-toggle-allowfast-this-group}).  The default
@@ -21848,14 +21835,14 @@ lead to dangling symlinks if something changed between updating and
 entering the group which is not yet in the mairix database.
 
 @item G b p
-@kindex G b p (Group)
+@kindex G b p @r{(Group)}
 @findex nnmairix-group-toggle-propmarks-this-group
 Toggle marks propagation for this group
 (@code{nnmairix-group-toggle-propmarks-this-group}).  (@pxref{Propagating
 marks}).
 
 @item G b o
-@kindex G b o (Group)
+@kindex G b o @r{(Group)}
 @findex nnmairix-propagate-marks
 Manually propagate marks (@code{nnmairix-propagate-marks}); needed only when
 @code{nnmairix-propagate-marks-upon-close} is set to @code{nil}.
@@ -21867,21 +21854,21 @@ In summary mode:
 @table @kbd
 
 @item G G m
-@kindex G G m (Summary)
+@kindex G G m @r{(Summary)}
 @findex nnmairix-widget-search-from-this-article
 Allows you to create a mairix query or group based on the current
 message using graphical widgets (same as @code{nnmairix-widget-search})
 (@code{nnmairix-widget-search-from-this-article}).
 
 @item G G g
-@kindex G G g (Summary)
+@kindex G G g @r{(Summary)}
 @findex nnmairix-create-search-group-from-message
 Interactively creates a new search group with query based on the current
 message, but uses the minibuffer instead of graphical widgets
 (@code{nnmairix-create-search-group-from-message}).
 
 @item G G t
-@kindex G G t (Summary)
+@kindex G G t @r{(Summary)}
 @findex nnmairix-search-thread-this-article
 Searches thread for the current article
 (@code{nnmairix-search-thread-this-article}).  This is effectively a
@@ -21889,14 +21876,14 @@ shortcut for calling @code{nnmairix-search} with @samp{m:msgid} of the
 current article and enabled threads.
 
 @item G G f
-@kindex G G f (Summary)
+@kindex G G f @r{(Summary)}
 @findex nnmairix-search-from-this-article
 Searches all messages from sender of the current article
 (@code{nnmairix-search-from-this-article}).  This is a shortcut for
 calling @code{nnmairix-search} with @samp{f:From}.
 
 @item G G o
-@kindex G G o (Summary)
+@kindex G G o @r{(Summary)}
 @findex nnmairix-goto-original-article
 (Only in @code{nnmairix} groups!) Tries determine the group this article
 originally came from and displays the article in this group, so that,
@@ -21906,7 +21893,7 @@ function will use the registry if available, but can also parse the
 article file name as a fallback method.
 
 @item G G u
-@kindex G G u (Summary)
+@kindex G G u @r{(Summary)}
 @findex nnmairix-remove-tick-mark-original-article
 Remove possibly existing tick mark from original article
 (@code{nnmairix-remove-tick-mark-original-article}).  (@pxref{nnmairix
@@ -22329,7 +22316,7 @@ for instance.  But what if you want to save without making a backup
 file, and you want Emacs to flash lights and play a nice tune at the
 same time?  You can't, and you're probably perfectly happy that way.
 
-@kindex M-i (Summary)
+@kindex M-i @r{(Summary)}
 @findex gnus-symbolic-argument
 I'm not, so I've added a second prefix---the @dfn{symbolic prefix}.  The
 prefix key is @kbd{M-i} (@code{gnus-symbolic-argument}), and the next
@@ -22385,7 +22372,6 @@ Currently Gnus uses the following formatting variables:
 All these format variables can also be arbitrary elisp forms.  In that
 case, they will be @code{eval}ed to insert the required lines.
 
-@kindex M-x gnus-update-format
 @findex gnus-update-format
 Gnus includes a command to help you while creating your own format
 specs.  @kbd{M-x gnus-update-format} will @code{eval} the current form,
@@ -24287,10 +24273,10 @@ group:
 @itemx M-d
 @itemx M s x
 @itemx S x
-@kindex $ (Summary)
-@kindex M-d (Summary)
-@kindex S x (Summary)
-@kindex M s x (Summary)
+@kindex $ @r{(Summary)}
+@kindex M-d @r{(Summary)}
+@kindex S x @r{(Summary)}
+@kindex M s x @r{(Summary)}
 @findex gnus-summary-mark-as-spam
 @findex gnus-summary-mark-as-spam
 Mark current article as spam, showing it with the @samp{$} mark
@@ -24562,7 +24548,7 @@ determined by either the @code{ham-process-destination} group
 parameter or a match in the @code{gnus-ham-process-destinations}
 variable, which is a list of regular expressions matched with group
 names (it's easiest to customize this variable with @kbd{M-x
-customize-variable @key{RET} gnus-ham-process-destinations}).  Each
+customize-variable @key{@key{RET}} gnus-ham-process-destinations}).  Each
 group name list is a standard Lisp list, if you prefer to customize
 the variable manually.  If the @code{ham-process-destination}
 parameter is not set, ham articles are left in place.  If the
@@ -24598,7 +24584,7 @@ When you leave a @emph{ham} or @emph{unclassified} group, all
 the @code{spam-process-destination} group parameter or a match in the
 @code{gnus-spam-process-destinations} variable, which is a list of
 regular expressions matched with group names (it's easiest to
-customize this variable with @kbd{M-x customize-variable @key{RET}
+customize this variable with @kbd{M-x customize-variable @key{@key{RET}}
 gnus-spam-process-destinations}).  Each group name list is a standard
 Lisp list, if you prefer to customize the variable manually.  If the
 @code{spam-process-destination} parameter is not set, the spam
@@ -26230,7 +26216,7 @@ you to optionally upload your first CloudSynchronizationDataPack(TM).
 After setting up, you can use these shortcuts from the Group buffer:
 
 @table @kbd
-@item ~ RET
+@item ~ @key{RET}
 @item ~ d
 @findex gnus-cloud-download-all-data
 @cindex cloud, download
@@ -26665,7 +26651,6 @@ to stop doing it the old way.
 
 Gnus understands all @sc{gnus} startup files.
 
-@kindex M-x gnus-bug
 @findex gnus-bug
 @cindex reporting bugs
 @cindex bugs
@@ -27744,7 +27729,7 @@ control over simplification.
 limit.
 
 @item
-@kbd{M-RET} is a new Message command for breaking cited text.
+@kbd{M-@key{RET}} is a new Message command for breaking cited text.
 
 @item
 @samp{\\1}-expressions are now valid in @code{nnmail-split-methods}.
@@ -28299,10 +28284,10 @@ Easy inclusion of X-Faces headers.  @xref{X-Face}.
 @item
 Group Carbon Copy (GCC) quoting
 
-To support groups that contains SPC and other weird characters, groups
+To support groups that contains @key{SPC} and other weird characters, groups
 are quoted before they are placed in the Gcc: header.  This means
 variables such as @code{gnus-message-archive-group} should no longer
-contain quote characters to make groups containing SPC work.  Also, if
+contain quote characters to make groups containing @key{SPC} work.  Also, if
 you are using the string @samp{nnml:foo, nnml:bar} (indicating Gcc
 into two groups) you must change it to return the list
 @code{("nnml:foo" "nnml:bar")}, otherwise the Gcc: line will be quoted
@@ -28391,7 +28376,7 @@ Gnus supports @acronym{PGP} (RFC 1991/2440), @acronym{PGP/MIME} (RFC
 
 It needs an external @acronym{S/MIME} and OpenPGP implementation, but no
 additional Lisp libraries.  This add several menu items to the
-Attachments menu, and @kbd{C-c RET} key bindings, when composing
+Attachments menu, and @kbd{C-c @key{RET}} key bindings, when composing
 messages.  This also obsoletes @code{gnus-article-hide-pgp-hook}.
 
 @item
@@ -28487,7 +28472,7 @@ message, Message Manual}).
 @item
 The tool bars have been updated to use GNOME icons in Group, Summary and
 Message mode.  You can also customize the tool bars: @kbd{M-x
-customize-apropos RET -tool-bar$} should get you started.  This is a new
+customize-apropos @key{RET} -tool-bar$} should get you started.  This is a new
 feature in Gnus 5.10.10.  (Only for Emacs, not in XEmacs.)
 
 @item The tool bar icons are now (de)activated correctly
@@ -28718,7 +28703,7 @@ commonly fetched via the protocol @acronym{NNTP}, whereas mail
 messages could be read from a file on the local disk.  The internal
 architecture of Gnus thus comprises a ``front end'' and a number of
 ``back ends''.  Internally, when you enter a group (by hitting
-@key{RET}, say), you thereby invoke a function in the front end in
+@key{@key{RET}}, say), you thereby invoke a function in the front end in
 Gnus.  The front end then ``talks'' to a back end and says things like
 ``Give me the list of articles in the foo group'' or ``Show me article
 number 4711''.
@@ -29120,12 +29105,12 @@ If all else fails, report the problem as a bug.
 @cindex bugs
 @cindex reporting bugs
 
-@kindex M-x gnus-bug
 @findex gnus-bug
-If you find a bug in Gnus, you can report it with the @kbd{M-x gnus-bug}
-command.  @kbd{M-x set-variable RET debug-on-error RET t RET}, and send
-me the backtrace.  I will fix bugs, but I can only fix them if you send
-me a precise description as to how to reproduce the bug.
+If you find a bug in Gnus, you can report it with the @kbd{M-x
+gnus-bug} command.  @kbd{M-x set-variable @key{RET} debug-on-error
+@key{RET} t @key{RET}}, and send me the backtrace.  I will fix bugs,
+but I can only fix them if you send me a precise description as to how
+to reproduce the bug.
 
 You really can never be too detailed in a bug report.  Always use the
 @kbd{M-x gnus-bug} command when you make bug reports, even if it creates
@@ -29158,9 +29143,9 @@ Lisp Reference Manual}).  To get you started with edebug, consider if
 you discover some weird behavior when pressing @kbd{c}, the first
 step is to do @kbd{C-h k c} and click on the hyperlink (Emacs only) in
 the documentation buffer that leads you to the function definition,
-then press @kbd{M-x edebug-defun RET} with point inside that function,
+then press @kbd{M-x edebug-defun @key{RET}} with point inside that function,
 return to Gnus and press @kbd{c} to invoke the code.  You will be
-placed in the lisp buffer and can single step using @kbd{SPC} and
+placed in the lisp buffer and can single step using @kbd{@key{SPC}} and
 evaluate expressions using @kbd{M-:} or inspect variables using
 @kbd{C-h v}, abort execution with @kbd{q}, and resume execution with
 @kbd{c} or @kbd{g}.
@@ -29178,8 +29163,8 @@ A fancier approach is to use the elisp profiler, ELP@.  The profiler is
 (or should be) fully documented elsewhere, but to get you started
 there are a few steps that need to be followed.  First, instrument the
 part of Gnus you are interested in for profiling, e.g., @kbd{M-x
-elp-instrument-package RET gnus} or @kbd{M-x elp-instrument-package
-RET message}.  Then perform the operation that is slow and press
+elp-instrument-package @key{RET} gnus} or @kbd{M-x elp-instrument-package
+@key{RET} message}.  Then perform the operation that is slow and press
 @kbd{M-x elp-results}.  You will then see which operations that takes
 time, and can debug them further.  If the entire operation takes much
 longer than the time spent in the slowest function in the profiler
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 964a6c69120..c617468f57e 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 SPC @r{(Info mode)}
-@kindex DEL @r{(Info mode)}
-@kindex BACKSPACE @r{(Info mode)}
+@kindex @key{SPC} @r{(Info mode)}
+@kindex @key{DEL} @r{(Info mode)}
+@kindex @key{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 PAGEUP @r{(Info mode)}
-@kindex PAGEDOWN @r{(Info mode)}
+@kindex @key{PAGEUP} @r{(Info mode)}
+@kindex @key{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/mairix-el.texi b/doc/misc/mairix-el.texi
index 906448c1028..401ba1d7b5e 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -213,7 +213,6 @@ Here's a description of the available interactive functions:
 @table @code
 
 @item mairix-search
-@kindex M-x mairix-search
 @findex mairix-search
 @vindex mairix-search-file
 @vindex mairix-file-path
@@ -229,7 +228,6 @@ is specified by the variable @code{mairix-command}, together with the options
 for making searching faster.
 
 @item mairix-widget-search
-@kindex M-x mairix-widget-search
 @findex mairix-widget-search
 @vindex mairix-widget-fields-list
 Creates a mairix query using graphical widgets.  Very handy if you're
@@ -241,28 +239,24 @@ might want to include some other fields.  This can be easily done by
 modifying @code{mairix-widget-fields-list}.
 
 @item mairix-widget-search-based-on-article
-@kindex M-x mairix-widget-search-based-on-article
 @findex mairix-widget-search-based-on-article
 Create a mairix query using graphical widgets, but based on the
 currently displayed article, i.e., the available fields will be filled
 with the current header values.
 
 @item mairix-search-from-this-article
-@kindex M-x mairix-search-from-this-article
 @findex mairix-search-from-this-article
 Search messages from sender of the current article.  This is effectively
 a shortcut for calling @code{mairix-search} with @code{f:current_from}.
 If used with a prefix, include whole threads of the found messages.
 
 @item mairix-search-thread-this-article
-@kindex M-x mairix-search-thread-this-article
 @findex mairix-search-thread-this-article
 Search thread for the current article.  This is effectively a shortcut
 for calling @code{mairix-search} with @code{m:msgid} of the current article and
 enabled threads.
 
 @item mairix-save-search
-@kindex M-x mairix-save-search
 @findex mairix-save-search
 Save the last search for future use.  You will have to specify a name
 for the search and will then be asked if you want to save your saved
@@ -272,13 +266,11 @@ your @file{.emacs}.  You can also do this later by using
 @code{mairix-edit-saved-searches}.
 
 @item mairix-use-saved-search
-@kindex M-x mairix-use-saved-search
 @findex mairix-use-saved-search
 Call mairix with a previously saved search.  You will be asked for the
 name of the saved search (use @kbd{TAB} for completion).
 
 @item mairix-edit-saved-searches
-@kindex M-x mairix-edit-saved-searches
 @findex mairix-edit-saved-searches
 Edit your current mairix searches.  This is a simple major mode for
 editing the contents of the variable @code{mairix-saved-searches}.  You
@@ -290,14 +282,12 @@ to open different searches at the same time, or if you want to regularly
 access certain searches without the need to call mairix.
 
 @item mairix-edit-saved-searches-customize
-@kindex M-x mairix-edit-saved-searches-customize
 @findex mairix-edit-saved-searches-customize
 Edit the variable @code{mairix-saved-searches} in a normal customization
 buffer.  This function exists more or less for historic reasons, but
 maybe you like it.
 
 @item mairix-update-database
-@kindex M-x mairix-update-database
 @findex mairix-update-database
 @vindex mairix-update-options
 @vindex mairix-synchronous-update
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 71298751c63..f49c91ef7bc 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -707,14 +707,12 @@ This means that if the recipient supports RFC 2298 she might send you a
 notification that she received the message.
 
 @item M-x message-insert-importance-high
-@kindex M-x message-insert-importance-high
 @findex message-insert-importance-high
 @cindex Importance
 Insert an @samp{Importance} header with a value of @samp{high},
 deleting headers if necessary.
 
 @item M-x message-insert-importance-low
-@kindex M-x message-insert-importance-low
 @findex message-insert-importance-low
 @cindex Importance
 Insert an @samp{Importance} header with a value of @samp{low}, deleting
@@ -1379,8 +1377,8 @@ end of the message (@code{message-kill-to-signature}).
 Delete all text in the body of the message that is outside the region
 (@code{message-delete-not-region}).
 
-@item M-RET
-@kindex M-RET
+@item M-@key{RET}
+@kindex M-@key{RET}
 @findex message-newline-and-reformat
 Insert four newlines, and then reformat if inside quoted text.
 
@@ -1390,7 +1388,7 @@ Here's an example:
 > This is some quoted text.  And here's more quoted text.
 @end example
 
-If point is before @samp{And} and you press @kbd{M-RET}, you'll get:
+If point is before @samp{And} and you press @kbd{M-@key{RET}}, you'll get:
 
 @example
 > This is some quoted text.
@@ -1408,12 +1406,12 @@ If point is before @samp{And} and you press @kbd{M-RET}, you'll get:
 Rename the buffer (@code{message-rename-buffer}).  If given a prefix,
 prompt for a new buffer name.
 
-@item TAB
-@kindex TAB
+@item @key{TAB}
+@kindex @key{TAB}
 @findex message-tab
 @vindex message-tab-body-function
 If @code{message-tab-body-function} is non-@code{nil}, execute the
-function it specifies.  Otherwise use the function bound to @kbd{TAB} in
+function it specifies.  Otherwise use the function bound to @key{TAB} in
 @code{text-mode-map} or @code{global-map}.
 
 @end table
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index a9c8bbbfb3e..efb44e4b643 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -461,8 +461,8 @@ filling paragraphs. A mark can be set with @kbd{C-@@} (or
 @cindex file completion
 @cindex folder completion
 @cindex minibuffer
-@kindex SPC
-@kindex TAB
+@kindex @key{SPC}
+@kindex @key{TAB}
 
 The @dfn{minibuffer} is the bottom line of the Emacs window, where all
 prompting and multiple-character input is directed. You can use
@@ -692,7 +692,6 @@ get the big picture, and then you can read the manual as you wish.
 @cindex modes, MH-Letter
 @cindex sending mail
 @findex mh-smail
-@kindex M-x mh-smail
 
 Let's start our tour by sending ourselves a message which we can later
 read and process. Enter @kbd{M-x mh-smail} to invoke the MH-E program
@@ -762,7 +761,6 @@ message. Type @kbd{C-c C-c} now. That's all there is to it!
 @cindex modes, MH-Folder
 @cindex reading mail
 @findex mh-rmail
-@kindex M-x mh-rmail
 
 To read the mail you've just sent yourself, enter @kbd{M-x mh-rmail}.
 This incorporates the new mail and puts the output from
@@ -777,7 +775,6 @@ major mode is MH-Folder.
 
 @findex mh-rmail
 @kindex F r
-@kindex M-x mh-rmail
 
 @sp 1
 @center @strong{NOTE}
@@ -935,7 +932,6 @@ command.
 
 @findex mh-smail
 @kindex m
-@kindex M-x mh-smail
 
 If you want to send another message you can use @kbd{m} instead of
 @kbd{M-x mh-smail}. So go ahead, send some mail to your friends!
@@ -970,7 +966,6 @@ perform any refiles and deletes that you did there.
 @findex mh-rmail
 @kindex C-x b
 @kindex C-x k
-@kindex M-x mh-rmail
 @kindex q
 
 If you don't want to leave Emacs, you can type @kbd{q} to bury (hide)
@@ -1228,7 +1223,7 @@ Many commands that operate on individual messages, such as
 @code{mh-forward} or @code{mh-refile-msg} take a @code{RANGE}
 argument. This argument can be used in several ways.
 
-@kindex C-u, with ranges
+@kindex C-u@r{, with ranges}
 
 If you provide the prefix argument @kbd{C-u} to these commands, then
 you will be prompted for the message range. This can be any valid MH
@@ -1552,7 +1547,6 @@ the message numbers from outside of MH-E.
 @findex mh-rmail
 @kindex F r
 @kindex F v
-@kindex M-x mh-rmail
 
 The MH-E entry point for reading mail is @kbd{M-x mh-rmail}. This
 command incorporates your mail and creates a buffer called
@@ -1599,20 +1593,20 @@ Display message (@code{mh-show}).
 @c -------------------------
 @cindex @samp{Message > Show Message with Header} menu item
 @cindex menu item, @samp{Message > Show Message with Header}
-@kindex , (comma)
+@kindex , @r{(comma)}
 @findex mh-header-display
 @item , (comma)
 Display message with all header fields (@code{mh-header-display}).
 @c -------------------------
 @cindex @samp{Message > Show Message with Preferred Alternative} menu item
 @cindex menu item, @samp{Message > Show Message with Preferred Alternative}
-@kindex : (colon)
+@kindex : @r{(colon)}
 @findex mh-show-preferred-alternative
 @item : (colon)
 Display message with the default preferred alternative
 (@code{mh-show-preferred-alternative}).
 @c -------------------------
-@kindex ; (semicolon)
+@kindex ; @r{(semicolon)}
 @findex mh-toggle-mh-decode-mime-flag
 @item ; (semicolon)
 Toggle the value of @code{mh-decode-mime-flag}
@@ -2017,8 +2011,8 @@ detail in the following sections.
 @findex mh-previous-page
 @findex mh-show
 @findex mh-show-mouse
-@kindex , (comma)
-@kindex . (period)
+@kindex , @r{(comma)}
+@kindex . @r{(period)}
 @kindex @key{BS}
 @kindex @key{RET}
 @kindex @key{SPC}
@@ -2309,7 +2303,7 @@ leave out the @samp{xterm -e} if you use @command{mhlist} or
 @cindex Emacs, packages, @samp{mm-decode}
 @cindex @samp{mm-decode} package
 @findex mh-toggle-mh-decode-mime-flag
-@kindex ; (semicolon)
+@kindex ; @r{(semicolon)}
 @vindex mh-decode-mime-flag
 
 MH-E can handle attachments as well if the Gnus @samp{mm-decode}
@@ -2490,7 +2484,7 @@ the option @code{mm-discouraged-alternatives}, and add
 @samp{text/html}. The next best alternative, if any, will be shown.
 
 @findex mh-show-preferred-alternative
-@kindex : (colon)
+@kindex : @r{(colon)}
 
 Occasionally, though, you might want to see the preferred alternative.
 The command @kbd{:} (@code{mh-show-preferred-alternative}) displays
@@ -3859,7 +3853,6 @@ moving my cursor to @samp{out} and using the command @kbd{R}
 
 @cindex sending mail
 @findex mh-smail
-@kindex M-x mh-smail
 
 You can send a mail message in several ways. You can call @kbd{M-x
 mh-smail} directly, or from the command line like this:
@@ -4027,8 +4020,6 @@ more detail in the following sections.
 @cindex sending mail
 @findex mh-smail
 @findex mh-smail-other-window
-@kindex M-x mh-smail
-@kindex M-x mh-smail-other-window
 
 Outside of an MH-Folder buffer, you must call either @kbd{M-x
 mh-smail} or @kbd{M-x mh-smail-other-window} to compose a new message.
@@ -4401,7 +4392,7 @@ Perform completion or insert space (@code{mh-letter-complete-or-space}).
 Perform completion on header field or word preceding point
 (@code{mh-letter-complete}).
 @c -------------------------
-@kindex , (comma)
+@kindex , @r{(comma)}
 @findex mh-letter-confirm-address
 @item , (comma)
 Flash alias expansion (@code{mh-letter-confirm-address}).
@@ -4842,7 +4833,7 @@ take point to the last field from anywhere in the body.
 @findex mh-letter-complete
 @findex mh-letter-complete-or-space
 @findex mh-letter-confirm-address
-@kindex , (comma)
+@kindex , @r{(comma)}
 @kindex @key{SPC}
 @kindex M-@key{TAB}
 @vindex mh-alias-flash-on-comma
@@ -5934,7 +5925,6 @@ executed to generate the password file. For example, use @samp{ypcat
 passwd} to obtain the NIS password file.
 
 @findex mh-alias-reload
-@kindex M-x mh-alias-reload
 @vindex mh-alias-reloaded-hook
 
 Since aliases are updated frequently, MH-E reloads aliases
@@ -5950,7 +5940,6 @@ listed in your @samp{Aliasfile:} profile component. MH-E provides
 other methods for maintaining your alias file(s).
 
 @findex mh-alias-add-alias
-@kindex M-x mh-alias-add-alias
 
 You can use the @kbd{M-x mh-alias-add-alias} command which will prompt
 you for the alias and address that you would like to add. If the alias
@@ -5985,9 +5974,6 @@ Using prefixes instead of postfixes helps you explore aliases during
 completion. If you forget the name of an old dive buddy, you can enter
 @samp{div} and then @key{SPC} to get a listing of all your dive buddies.
 
-@kindex M-x mh-alias-add-address-under-point
-@kindex M-x mh-alias-grab-from-field
-
 An alias for the sender of the current message is added automatically
 by clicking on the @samp{Grab From alias} tool bar button or by running
 the @kbd{M-x mh-alias-grab-from-field} command. Aliases for other
@@ -6021,7 +6007,6 @@ more appropriate.
 
 @cindex regular expressions, @code{mh-alias-apropos}
 @findex mh-alias-apropos
-@kindex M-x mh-alias-apropos
 
 If you can't quite remember an alias, you can use @kbd{M-x
 mh-alias-apropos} to show all aliases or addresses that match a
@@ -6281,7 +6266,6 @@ containing the value for the field is given.
 @cindex speedbar
 @findex mh-visit-folder
 @kindex F v
-@kindex M-x speedbar
 @kindex mouse-2
 
 You can also use the speedbar
@@ -7514,7 +7498,6 @@ Mail}).
 @cindex sequence, @samp{cur}
 @cindex sequence, @samp{tick}
 @findex mh-update-sequences
-@kindex M-x mh-update-sequences
 @kindex q
 @kindex x
 @vindex mh-tick-seq
@@ -8001,7 +7984,6 @@ system.
 @cindex MH-E version
 @cindex @file{*MH-E Info*}
 @cindex version
-@kindex M-x mh-version
 
 One command worth noting is @kbd{M-x mh-version}. You can compare the
 version this command prints to the latest release (@pxref{Getting
@@ -8716,7 +8698,6 @@ I also point out some additional sources of information.
 
 @cindex bugs
 @cindex SourceForge
-@kindex M-x mh-version
 
 Bug reports should be filed at
 @uref{https://sourceforge.net/p/mh-e/bugs/, SourceForge}. You need to
@@ -8792,7 +8773,6 @@ instead.
 @cindex news
 @cindex @samp{MH-E-NEWS}
 @cindex @samp{README}
-@kindex M-x mh-version
 
 After you download and extract the MH-E tarball, read the
 @file{README} file and @file{MH-E-NEWS}. These correspond to the
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 43d248bc7dc..b94a96d8aa4 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -239,17 +239,17 @@ The position of groups and feeds within the tree can be changed with these
 commands:
 
 @table @kbd
-@item M-up
-@itemx M-down
-@kindex M-up
-@kindex M-down
+@item M-@key{UP}
+@itemx M-@key{DOWN}
+@kindex M-@key{UP}
+@kindex M-@key{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-up
-@itemx M-S-down
-@kindex M-S-up
-@kindex M-S-down
+@item M-S-@key{UP}
+@itemx M-S-@key{DOWN}
+@kindex M-S-@key{UP}
+@kindex M-S-@key{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 19c83f65a68..ac82254dc8b 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -1136,7 +1136,7 @@ accessing a functionality.  Org mode often uses the same key for different
 functions, depending on context.  The command that is bound to such keys has
 a generic name, like @code{org-metaright}.  In the manual we will, wherever
 possible, give the function that is internally called by the generic command.
-For example, in the chapter on document structure, @kbd{M-@key{right}} will
+For example, in the chapter on document structure, @kbd{M-@key{RIGHT}} will
 be listed to call @code{org-do-demote}, while in the chapter on tables, it
 will be listed to call @code{org-table-move-column-right}.  If you prefer,
 you can compile the manual without the command names by unsetting the flag
@@ -1392,7 +1392,7 @@ you can use the following keys to find your destination:
 @vindex org-goto-auto-isearch
 @example
 @key{TAB}         @r{Cycle visibility.}
-@key{down} / @key{up}   @r{Next/previous visible headline.}
+@key{DOWN} / @key{UP}   @r{Next/previous visible headline.}
 @key{RET}         @r{Select this location.}
 @kbd{/}           @r{Do a Sparse-tree search}
 @r{The following keys work if you turn off @code{org-goto-auto-isearch}}
@@ -1453,18 +1453,18 @@ In a new entry with no text yet, the first @key{TAB} demotes the entry to
 become a child of the previous one.  The next @key{TAB} makes it a parent,
 and so on, all the way to top level.  Yet another @key{TAB}, and you are back
 to the initial level.
-@orgcmd{M-@key{left},org-do-promote}
+@orgcmd{M-@key{LEFT},org-do-promote}
 Promote current heading by one level.
-@orgcmd{M-@key{right},org-do-demote}
+@orgcmd{M-@key{RIGHT},org-do-demote}
 Demote current heading by one level.
-@orgcmd{M-S-@key{left},org-promote-subtree}
+@orgcmd{M-S-@key{LEFT},org-promote-subtree}
 Promote the current subtree by one level.
-@orgcmd{M-S-@key{right},org-demote-subtree}
+@orgcmd{M-S-@key{RIGHT},org-demote-subtree}
 Demote the current subtree by one level.
-@orgcmd{M-@key{up},org-move-subtree-up}
+@orgcmd{M-@key{UP},org-move-subtree-up}
 Move subtree up (swap with previous subtree of same
 level).
-@orgcmd{M-@key{down},org-move-subtree-down}
+@orgcmd{M-@key{DOWN},org-move-subtree-down}
 Move subtree down (swap with next subtree of same level).
 @orgcmd{M-h,org-mark-element}
 Mark the element at point.  Hitting repeatedly will mark subsequent elements
@@ -1733,7 +1733,7 @@ one.
 @kindex M-S-@key{RET}
 @item M-S-@key{RET}
 Insert a new item with a checkbox (@pxref{Checkboxes}).
-@kindex S-@key{down}
+@kindex S-@key{DOWN}
 @item S-up
 @itemx S-down
 @cindex shift-selection-mode
@@ -1743,25 +1743,25 @@ Jump to the previous/next item in the current list@footnote{If you want to
 cycle around items that way, you may customize
 @code{org-list-use-circular-motion}.}, but only if
 @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
+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-@key{UP}
+@kindex M-@key{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-@key{LEFT}
+@kindex M-@key{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}
-@item M-S-@key{left}
-@itemx M-S-@key{right}
+@kindex M-S-@key{LEFT}
+@kindex M-S-@key{RIGHT}
+@item M-S-@key{LEFT}
+@itemx M-S-@key{RIGHT}
 Decrease/increase the indentation of the item, including subitems.
 Initially, the item tree is selected based on current indentation.  When
 these commands are executed several times in direct succession, the initially
@@ -1799,9 +1799,9 @@ 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}
-@item S-left/right
+@kindex S-@key{LEFT}
+@kindex S-@key{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
 anywhere in an item line, details depending on
@@ -2155,22 +2155,22 @@ Move to beginning of the current table field, or on to the previous field.
 Move to end of the current table field, or on to the next field.
 
 @tsubheading{Column and row editing}
-@orgcmdkkcc{M-@key{left},M-@key{right},org-table-move-column-left,org-table-move-column-right}
+@orgcmdkkcc{M-@key{LEFT},M-@key{RIGHT},org-table-move-column-left,org-table-move-column-right}
 Move the current column left/right.
 @c
-@orgcmd{M-S-@key{left},org-table-delete-column}
+@orgcmd{M-S-@key{LEFT},org-table-delete-column}
 Kill the current column.
 @c
-@orgcmd{M-S-@key{right},org-table-insert-column}
+@orgcmd{M-S-@key{RIGHT},org-table-insert-column}
 Insert a new column to the left of the cursor position.
 @c
-@orgcmdkkcc{M-@key{up},M-@key{down},org-table-move-row-up,org-table-move-row-down}
+@orgcmdkkcc{M-@key{UP},M-@key{DOWN},org-table-move-row-up,org-table-move-row-down}
 Move the current row up/down.
 @c
-@orgcmd{M-S-@key{up},org-table-kill-row}
+@orgcmd{M-S-@key{UP},org-table-kill-row}
 Kill the current row or horizontal line.
 @c
-@orgcmd{M-S-@key{down},org-table-insert-row}
+@orgcmd{M-S-@key{DOWN},org-table-insert-row}
 Insert a new row above the current row.  With a prefix argument, the line is
 created below the current one.
 @c
@@ -3014,22 +3014,22 @@ 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-@key{UP}
+@kindex S-@key{DOWN}
+@kindex S-@key{LEFT}
+@kindex S-@key{RIGHT}
 @findex org-table-fedit-ref-up
 @findex org-table-fedit-ref-down
 @findex org-table-fedit-ref-left
 @findex org-table-fedit-ref-right
-@item S-@key{up}/@key{down}/@key{left}/@key{right}
+@item S-@key{UP}/@key{DOWN}/@key{LEFT}/@key{RIGHT}
 Shift the reference at point.  For example, if the reference is
-@code{B3} and you press @kbd{S-@key{right}}, it will become @code{C3}.
+@code{B3} and you press @kbd{S-@key{RIGHT}}, it will become @code{C3}.
 This also works for relative references and for hline references.
-@orgcmdkkcc{M-S-@key{up},M-S-@key{down},org-table-fedit-line-up,org-table-fedit-line-down}
+@orgcmdkkcc{M-S-@key{UP},M-S-@key{DOWN},org-table-fedit-line-up,org-table-fedit-line-down}
 Move the test line for column formulas in the Org buffer up and
 down.
-@orgcmdkkcc{M-@key{up},M-@key{down},org-table-fedit-scroll-down,org-table-fedit-scroll-up}
+@orgcmdkkcc{M-@key{UP},M-@key{DOWN},org-table-fedit-scroll-down,org-table-fedit-scroll-up}
 Scroll the window displaying the table.
 @kindex C-c @}
 @findex org-table-toggle-coordinate-overlays
@@ -3710,7 +3710,7 @@ becomes the default description.
 @b{Inserting stored links}@*
 All links stored during the
 current session are part of the history for this prompt, so you can access
-them with @key{up} and @key{down} (or @kbd{M-p/n}).
+them with @key{UP} and @key{DOWN} (or @kbd{M-p/n}).
 
 @b{Completion support}@* Completion with @key{TAB} will help you to insert
 valid link prefixes like @samp{https:}, including the prefixes
@@ -4043,9 +4043,9 @@ 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}
-@item S-@key{right} @ @r{/} @ S-@key{left}
+@kindex S-@key{RIGHT}
+@kindex S-@key{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
 mostly if more than two TODO states are possible (@pxref{TODO
@@ -4126,7 +4126,7 @@ With this setup, the command @kbd{C-c C-t} will cycle an entry from TODO
 to FEEDBACK, then to VERIFY, and finally to DONE and DELEGATED@.  You may
 also use a numeric prefix argument to quickly select a specific state.  For
 example @kbd{C-3 C-c C-t} will change the state immediately to VERIFY@.
-Or you can use @kbd{S-@key{left}} to go backward through the sequence.  If you
+Or you can use @kbd{S-@key{LEFT}} to go backward through the sequence.  If you
 define many keywords, you can use in-buffer completion
 (@pxref{Completion}) or even a special one-key selection scheme
 (@pxref{Fast access to TODO states}) to insert these words into the
@@ -4192,23 +4192,23 @@ 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-@key{RIGHT}
+@kindex C-S-@key{LEFT}
 @kindex C-u C-u C-c C-t
 @item C-u C-u C-c C-t
-@itemx C-S-@key{right}
-@itemx C-S-@key{left}
+@itemx C-S-@key{RIGHT}
+@itemx C-S-@key{LEFT}
 These keys jump from one TODO subset to the next.  In the above example,
-@kbd{C-u C-u C-c C-t} or @kbd{C-S-@key{right}} would jump from @code{TODO} or
+@kbd{C-u C-u C-c C-t} or @kbd{C-S-@key{RIGHT}} would jump from @code{TODO} or
 @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}
-@item S-@key{right}
-@itemx S-@key{left}
-@kbd{S-@key{left}} and @kbd{S-@key{right}} and walk through @emph{all}
-keywords from all sets, so for example @kbd{S-@key{right}} would switch
+@kindex S-@key{RIGHT}
+@kindex S-@key{LEFT}
+@item S-@key{RIGHT}
+@itemx S-@key{LEFT}
+@kbd{S-@key{LEFT}} and @kbd{S-@key{RIGHT}} and walk through @emph{all}
+keywords from all sets, so for example @kbd{S-@key{RIGHT}} would switch
 from @code{DONE} to @code{REPORT} in the example above.  See also
 @ref{Conflicts}, for a discussion of the interaction with
 @code{shift-selection-mode}.
@@ -4644,7 +4644,7 @@ items.
 
 @table @kbd
 @item @kbd{C-c ,}
-@kindex @kbd{C-c ,}
+@kindex C-c ,
 @findex org-priority
 Set the priority of the current headline (@command{org-priority}).  The
 command prompts for a priority character @samp{A}, @samp{B} or @samp{C}.
@@ -4652,7 +4652,7 @@ When you press @key{SPC} instead, the priority cookie is removed from the
 headline.  The priorities can also be changed ``remotely'' from the agenda
 buffer with the @kbd{,} command (@pxref{Agenda commands}).
 @c
-@orgcmdkkcc{S-@key{up},S-@key{down},org-priority-up,org-priority-down}
+@orgcmdkkcc{S-@key{UP},S-@key{DOWN},org-priority-up,org-priority-down}
 @vindex org-priority-start-cycle-with-default
 Increase/decrease priority of current headline@footnote{See also the option
 @code{org-priority-start-cycle-with-default}.}.  Note that these keys are
@@ -5395,7 +5395,7 @@ With the cursor in a property drawer, this executes property commands.
 @orgcmd{C-c C-c s,org-set-property}
 Set a property in the current entry.  Both the property and the value
 can be inserted using completion.
-@orgcmdkkcc{S-@key{right},S-@key{left},org-property-next-allowed-value,org-property-previous-allowed-value}
+@orgcmdkkcc{S-@key{RIGHT},S-@key{LEFT},org-property-next-allowed-value,org-property-previous-allowed-value}
 Switch property at point to the next/previous allowed value.
 @orgcmd{C-c C-c d,org-delete-property}
 Remove a property from the current entry.
@@ -5725,17 +5725,17 @@ Same as @kbd{r}.
 @orgcmd{q,org-columns-quit}
 Exit column view.
 @tsubheading{Editing values}
-@item @key{left} @key{right} @key{up} @key{down}
+@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}
-@item  S-@key{left}/@key{right}
+@kindex S-@key{LEFT}
+@kindex S-@key{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.
 @item 1..9,0
 Directly select the Nth allowed value, @kbd{0} selects the 10th value.
 @orgcmdkkcc{n,p,org-columns-next-allowed-value,org-columns-previous-allowed-value}
-Same as @kbd{S-@key{left}/@key{right}}
+Same as @kbd{S-@key{LEFT}/@key{RIGHT}}
 @orgcmd{e,org-columns-edit-value}
 Edit the property at point.  For the special properties, this will
 invoke the same interface that you normally use to change that
@@ -5754,9 +5754,9 @@ current column view.
 @tsubheading{Modifying the table structure}
 @orgcmdkkcc{<,>,org-columns-narrow,org-columns-widen}
 Make the column narrower/wider by one character.
-@orgcmd{S-M-@key{right},org-columns-new}
+@orgcmd{S-M-@key{RIGHT},org-columns-new}
 Insert a new column, to the left of the current column.
-@orgcmd{S-M-@key{left},org-columns-delete}
+@orgcmd{S-M-@key{LEFT},org-columns-delete}
 Delete the current column.
 @end table
 
@@ -6010,11 +6010,11 @@ instead.
 Access the agenda for the date given by the timestamp or -range at
 point (@pxref{Weekly/daily agenda}).
 @c
-@orgcmdkkcc{S-@key{left},S-@key{right},org-timestamp-down-day,org-timestamp-up-day}
+@orgcmdkkcc{S-@key{LEFT},S-@key{RIGHT},org-timestamp-down-day,org-timestamp-up-day}
 Change date at cursor by one day.  These key bindings conflict with
 shift-selection and related modes (@pxref{Conflicts}).
 @c
-@orgcmdkkcc{S-@key{up},S-@key{down},org-timestamp-up,org-timestamp-down-down}
+@orgcmdkkcc{S-@key{UP},S-@key{DOWN},org-timestamp-up,org-timestamp-down-down}
 Change the item under the cursor in a timestamp.  The cursor can be on a
 year, month, day, hour or minute.  When the timestamp contains a time range
 like @samp{15:30-16:30}, modifying the first time will also shift the second,
@@ -6138,25 +6138,25 @@ 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 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 M-S-@key{DOWN}
+@kindex M-S-@key{UP}
 
 @example
 @key{RET}              @r{Choose date at cursor in calendar.}
 mouse-1            @r{Select date by clicking on it.}
-S-@key{right}/@key{left}   @r{One day forward/backward.}
-S-@key{down}/@key{up}      @r{One week forward/backward.}
-M-S-@key{right}/@key{left} @r{One month forward/backward.}
+S-@key{RIGHT}/@key{LEFT}   @r{One day forward/backward.}
+S-@key{DOWN}/@key{UP}      @r{One week forward/backward.}
+M-S-@key{RIGHT}/@key{LEFT} @r{One month forward/backward.}
 > / <              @r{Scroll calendar forward/backward by one month.}
 M-v / C-v          @r{Scroll calendar forward/backward by 3 months.}
-M-S-@key{down}/@key{up}    @r{Scroll calendar forward/backward by one year.}
+M-S-@key{DOWN}/@key{UP}    @r{Scroll calendar forward/backward by one year.}
 @end example
 
 @vindex org-read-date-display-live
@@ -6196,10 +6196,10 @@ following consequences:
 You cannot place the cursor onto a timestamp anymore, only before or
 after.
 @item
-The @kbd{S-@key{up}/@key{down}} keys can no longer be used to adjust
+The @kbd{S-@key{UP}/@key{DOWN}} keys can no longer be used to adjust
 each component of a timestamp.  If the cursor is at the beginning of
-the stamp, @kbd{S-@key{up}/@key{down}} will change the stamp by one day,
-just like @kbd{S-@key{left}/@key{right}}.  At the end of the stamp, the
+the stamp, @kbd{S-@key{UP}/@key{DOWN}} will change the stamp by one day,
+just like @kbd{S-@key{LEFT}/@key{RIGHT}}.  At the end of the stamp, the
 time will be changed by one minute.
 @item
 If the timestamp contains a range of clock times or a repeater, these
@@ -6555,7 +6555,7 @@ clock duration keeps the same.
 @orgcmd{S-M-@key{up/down},org-timestamp-up/down}
 On @code{CLOCK} log lines, increase/decrease the timestamp at point and
 the one of the previous (or the next clock) timestamp by the same duration.
-For example, if you hit @kbd{S-M-@key{up}} to increase a clocked-out timestamp
+For example, if you hit @kbd{S-M-@key{UP}} to increase a clocked-out timestamp
 by five minutes, then the clocked-in timestamp of the next clock will be
 increased by five minutes.
 @orgcmd{C-c C-t,org-todo}
@@ -6606,7 +6606,7 @@ Update dynamic block at point.
 @orgkey{C-u C-c C-x C-u}
 Update all dynamic blocks (@pxref{Dynamic blocks}).  This is useful if
 you have several clock table blocks in a buffer.
-@orgcmdkxkc{S-@key{left},S-@key{right},org-clocktable-try-shift}
+@orgcmdkxkc{S-@key{LEFT},S-@key{RIGHT},org-clocktable-try-shift}
 Shift the current @code{:block} interval and update the table.  The cursor
 needs to be in the @code{#+BEGIN: clocktable} line for this command.  If
 @code{:block} is @code{today}, it will be shifted to @code{today-1} etc.
@@ -6656,7 +6656,7 @@ be selected:
              thismonth, lastmonth, thismonth-@var{N}  @r{a relative month}
              thisyear, lastyear, thisyear-@var{N}     @r{a relative year}
              untilnow
-             @r{Use @kbd{S-@key{left}/@key{right}} keys to shift the time interval.}
+             @r{Use @kbd{S-@key{LEFT}/@key{RIGHT}} keys to shift the time interval.}
 :tstart      @r{A time string specifying when to start considering times.}
              @r{Relative times like @code{"<-2w>"} can also be used.  See}
              @r{@ref{Matching tags and properties} for relative time syntax.}
@@ -6862,7 +6862,7 @@ In particular if you want to use this setup also in the agenda, a global
 setup may be advised.
 
 The way to assign estimates to individual items is then to switch to column
-mode, and to use @kbd{S-@key{right}} and @kbd{S-@key{left}} to change the
+mode, and to use @kbd{S-@key{RIGHT}} and @kbd{S-@key{LEFT}} to change the
 value.  The values you enter will immediately be summed up in the hierarchy.
 In the column next to it, any clocked time will be displayed.
 
@@ -8022,7 +8022,6 @@ Remove current file from the list of agenda files.
 @orgcmd{C-',org-cycle-agenda-files}
 @itemx C-,
 Cycle through agenda file list, visiting one file after the other.
-@kindex M-x org-iswitchb
 @item M-x org-iswitchb RET
 Command to use an @code{iswitchb}-like interface to switch to and between Org
 buffers.
@@ -8950,9 +8949,9 @@ the other commands, the cursor needs to be in the desired line.
 @tsubheading{Motion}
 @cindex motion commands in agenda
 @orgcmd{n,org-agenda-next-line}
-Next line (same as @key{down} and @kbd{C-n}).
+Next line (same as @key{DOWN} and @kbd{C-n}).
 @orgcmd{p,org-agenda-previous-line}
-Previous line (same as @key{up} and @kbd{C-p}).
+Previous line (same as @key{UP} and @kbd{C-p}).
 @orgcmd{N,org-agenda-next-item}
 Next item: same as next line, but only consider items.
 @orgcmd{P,org-agenda-previous-item}
@@ -9103,8 +9102,8 @@ Toggle the time grid on and off.  See also the variables
 @c
 @orgcmd{r,org-agenda-redo}
 Recreate the agenda buffer, for example to reflect the changes after
-modification of the timestamps of items with @kbd{S-@key{left}} and
-@kbd{S-@key{right}}.  When the buffer is the global TODO list, a prefix
+modification of the timestamps of items with @kbd{S-@key{LEFT}} and
+@kbd{S-@key{RIGHT}}.  When the buffer is the global TODO list, a prefix
 argument is interpreted to create a selective list for a specific TODO
 keyword.
 @orgcmd{g,org-agenda-redo}
@@ -9168,8 +9167,8 @@ both in the agenda buffer and in the remote buffer.
 Change the TODO state of the item, both in the agenda and in the
 original org file.
 @c
-@orgcmd{C-S-@key{right},org-agenda-todo-nextset}
-@orgcmd{C-S-@key{left},org-agenda-todo-previousset}
+@orgcmd{C-S-@key{RIGHT},org-agenda-todo-nextset}
+@orgcmd{C-S-@key{LEFT},org-agenda-todo-previousset}
 Switch to the next/previous set of TODO keywords.
 @c
 @orgcmd{C-k,org-agenda-kill}
@@ -9219,12 +9218,12 @@ the priority cookie is removed from the entry.
 @orgcmd{P,org-agenda-show-priority}
 Display weighted priority of current item.
 @c
-@orgcmdkkc{+,S-@key{up},org-agenda-priority-up}
+@orgcmdkkc{+,S-@key{UP},org-agenda-priority-up}
 Increase the priority of the current item.  The priority is changed in
 the original buffer, but the agenda is not resorted.  Use the @kbd{r}
 key for this.
 @c
-@orgcmdkkc{-,S-@key{down},org-agenda-priority-down}
+@orgcmdkkc{-,S-@key{DOWN},org-agenda-priority-down}
 Decrease the priority of the current item.
 @c
 @orgcmdkkc{z,C-c C-z,org-agenda-add-note}
@@ -9242,19 +9241,19 @@ Schedule this item.  With prefix arg remove the scheduling timestamp
 @orgcmd{C-c C-d,org-agenda-deadline}
 Set a deadline for this item.  With prefix arg remove the deadline.
 @c
-@orgcmd{S-@key{right},org-agenda-do-date-later}
+@orgcmd{S-@key{RIGHT},org-agenda-do-date-later}
 Change the timestamp associated with the current line by one day into the
 future.  If the date is in the past, the first call to this command will move
 it to today.@*
 With a numeric prefix argument, change it by that many days.  For example,
-@kbd{3 6 5 S-@key{right}} will change it by a year.  With a @kbd{C-u} prefix,
+@kbd{3 6 5 S-@key{RIGHT}} will change it by a year.  With a @kbd{C-u} prefix,
 change the time by one hour.  If you immediately repeat the command, it will
 continue to change hours even without the prefix arg.  With a double @kbd{C-u
 C-u} prefix, do the same for changing minutes.@*
 The stamp is changed in the original Org file, but the change is not directly
 reflected in the agenda buffer.  Use @kbd{r} or @kbd{g} to update the buffer.
 @c
-@orgcmd{S-@key{left},org-agenda-do-date-earlier}
+@orgcmd{S-@key{LEFT},org-agenda-do-date-earlier}
 Change the timestamp associated with the current line by one day
 into the past.
 @c
@@ -17128,10 +17127,10 @@ 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-up
-@item @kbd{M-@key{up}}    @tab @code{org-babel-load-in-session}
-@kindex M-down
-@item @kbd{M-@key{down}}  @tab @code{org-babel-switch-to-session}
+@kindex M-@key{UP}
+@item @kbd{M-@key{UP}}    @tab @code{org-babel-load-in-session}
+@kindex M-@key{DOWN}
+@item @kbd{M-@key{DOWN}}  @tab @code{org-babel-switch-to-session}
 @end multitable
 
 Active key bindings in Org mode buffer:
@@ -17930,23 +17929,23 @@ normal @kbd{S-@key{cursor}} for editing timestamp might be better with
 @multitable @columnfractions 0.15 0.2 0.1 0.2
 @item @b{Default} @tab @b{Alternative 1} @tab @b{Speed key} @tab @b{Alternative 2}
 @item @kbd{S-@key{TAB}}     @tab @kbd{C-u @key{TAB}}       @tab @kbd{C} @tab
-@item @kbd{M-@key{left}}    @tab @kbd{C-c C-x l}           @tab @kbd{l} @tab @kbd{@key{Esc} @key{left}}
-@item @kbd{M-S-@key{left}}  @tab @kbd{C-c C-x L}           @tab @kbd{L} @tab
-@item @kbd{M-@key{right}}   @tab @kbd{C-c C-x r}           @tab @kbd{r} @tab @kbd{@key{Esc} @key{right}}
-@item @kbd{M-S-@key{right}} @tab @kbd{C-c C-x R}           @tab @kbd{R} @tab
-@item @kbd{M-@key{up}}      @tab @kbd{C-c C-x u}           @tab @kbd{ } @tab @kbd{@key{Esc} @key{up}}
-@item @kbd{M-S-@key{up}}    @tab @kbd{C-c C-x U}           @tab @kbd{U} @tab
-@item @kbd{M-@key{down}}    @tab @kbd{C-c C-x d}           @tab @kbd{ } @tab @kbd{@key{Esc} @key{down}}
-@item @kbd{M-S-@key{down}}  @tab @kbd{C-c C-x D}           @tab @kbd{D} @tab
+@item @kbd{M-@key{LEFT}}    @tab @kbd{C-c C-x l}           @tab @kbd{l} @tab @kbd{@key{Esc} @key{LEFT}}
+@item @kbd{M-S-@key{LEFT}}  @tab @kbd{C-c C-x L}           @tab @kbd{L} @tab
+@item @kbd{M-@key{RIGHT}}   @tab @kbd{C-c C-x r}           @tab @kbd{r} @tab @kbd{@key{Esc} @key{RIGHT}}
+@item @kbd{M-S-@key{RIGHT}} @tab @kbd{C-c C-x R}           @tab @kbd{R} @tab
+@item @kbd{M-@key{UP}}      @tab @kbd{C-c C-x u}           @tab @kbd{ } @tab @kbd{@key{Esc} @key{UP}}
+@item @kbd{M-S-@key{UP}}    @tab @kbd{C-c C-x U}           @tab @kbd{U} @tab
+@item @kbd{M-@key{DOWN}}    @tab @kbd{C-c C-x d}           @tab @kbd{ } @tab @kbd{@key{Esc} @key{DOWN}}
+@item @kbd{M-S-@key{DOWN}}  @tab @kbd{C-c C-x D}           @tab @kbd{D} @tab
 @item @kbd{S-@key{RET}}     @tab @kbd{C-c C-x c}           @tab @kbd{ } @tab
 @item @kbd{M-@key{RET}}     @tab @kbd{C-c C-x m}           @tab @kbd{ } @tab @kbd{@key{Esc} @key{RET}}
 @item @kbd{M-S-@key{RET}}   @tab @kbd{C-c C-x M}           @tab @kbd{ } @tab
-@item @kbd{S-@key{left}}    @tab @kbd{C-c @key{left}}      @tab @kbd{ } @tab
-@item @kbd{S-@key{right}}   @tab @kbd{C-c @key{right}}     @tab @kbd{ } @tab
-@item @kbd{S-@key{up}}      @tab @kbd{C-c @key{up}}        @tab @kbd{ } @tab
-@item @kbd{S-@key{down}}    @tab @kbd{C-c @key{down}}      @tab @kbd{ } @tab
-@item @kbd{C-S-@key{left}}  @tab @kbd{C-c C-x @key{left}}  @tab @kbd{ } @tab
-@item @kbd{C-S-@key{right}} @tab @kbd{C-c C-x @key{right}} @tab @kbd{ } @tab
+@item @kbd{S-@key{LEFT}}    @tab @kbd{C-c @key{LEFT}}      @tab @kbd{ } @tab
+@item @kbd{S-@key{RIGHT}}   @tab @kbd{C-c @key{RIGHT}}     @tab @kbd{ } @tab
+@item @kbd{S-@key{UP}}      @tab @kbd{C-c @key{UP}}        @tab @kbd{ } @tab
+@item @kbd{S-@key{DOWN}}    @tab @kbd{C-c @key{DOWN}}      @tab @kbd{ } @tab
+@item @kbd{C-S-@key{LEFT}}  @tab @kbd{C-c C-x @key{LEFT}}  @tab @kbd{ } @tab
+@item @kbd{C-S-@key{RIGHT}} @tab @kbd{C-c C-x @key{RIGHT}} @tab @kbd{ } @tab
 @end multitable
 
 
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 1163530e7a2..32c6a524870 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 SPC@r{--Move down one file}
+@kindex @key{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 ESC DEL@r{--unmark all files}
-@kindex DEL@r{--unmark previous file}
+@kindex @key{ESC} @key{DEL}@r{--unmark all files}
+@kindex @key{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 2437e020eee..dc715e5d68a 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 TAB
+@kindex @key{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 RET
+@kindex @key{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 RET
+@kindex C-c @key{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-SPC
+@kindex C-c C-@key{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 TAB
+@kindex C-c @key{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/sc.texi b/doc/misc/sc.texi
index 03ca842cd07..9faa8fea747 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 RET
+@kindex @key{RET}
 @kindex C-j
 @kindex q
 @findex sc-eref-exit
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 37bb707f63a..2875b163ee9 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 RET
+@kindex C-c @key{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 RET
+@kindex @key{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 c061fb8e43e..5aad1c2ffe8 100644
--- a/doc/misc/vhdl-mode.texi
+++ b/doc/misc/vhdl-mode.texi
@@ -271,7 +271,7 @@ example again.
 @end group
 @end example
 
-@kindex TAB
+@kindex @key{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 ESC C-\
-@kindex ESC C-q
-@kindex ESC C-u
-@kindex RET
-@kindex LFD
+@kindex @key{ESC} C-\
+@kindex @key{ESC} C-q
+@kindex @key{ESC} C-u
+@kindex @key{RET}
+@kindex @key{LFD}
 @findex newline-and-indent
 @quotation
 
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index af4c05d8e48..aa55130e0e0 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -186,8 +186,8 @@ M-x vip-mode
 @node Modes in VIP
 @section Modes in VIP
 
-@kindex 032 @kbd{C-z} (@code{vip-change-mode-to-vi})
-@kindex 0301 @kbd{C-x C-z} (@code{suspend-emacs})
+@kindex 032 C-z @r{(}@code{vip-change-mode-to-vi}@r{)}
+@kindex 0301 C-x C-z @r{(}@code{suspend-emacs}@r{)}
 
 Loading VIP has the effect of globally binding @kbd{C-z} (@kbd{Control-z})
 to the function @code{vip-change-mode-to-vi}. The default binding of @kbd{C-z}
@@ -266,7 +266,7 @@ emacs mode             vi mode                 insert mode
 @node Emacs Mode
 @subsection Emacs Mode
 
-@kindex 032 @kbd{C-z} (@code{vip-change-mode-to-vi})
+@kindex 032 C-z @r{(}@code{vip-change-mode-to-vi}@r{)}
 
 You will be in this mode just after you loaded VIP@.  You can do all
 normal Emacs editing in this mode.  Note that the key @kbd{C-z} is globally
@@ -289,16 +289,16 @@ its content while you are in insert mode.
 
 @table @kbd
 @item @key{ESC}
-@kindex 033 @kbd{ESC} (@code{vip-change-mode-to-vi}) (insert mode)
+@kindex 033 @key{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 @kbd{C-h} (@code{vip-delete-backward-char}) (insert mode)
+@kindex 010 C-h @r{(}@code{vip-delete-backward-char}@r{) (insert mode)}
 Delete previous character.
 @item C-w
-@kindex 027 @kbd{C-w} (@code{vip-delete-backward-word}) (insert mode)
+@kindex 027 C-w @r{(}@code{vip-delete-backward-word}@r{) (insert mode)}
 Delete previous word.
 @item C-z
-@kindex 032 @kbd{C-z} (@code{vip-ESC}) (insert mode)
+@kindex 032 C-z @r{(}@code{vip-ESC}@r{) (insert mode)}
 Typing this key has the same effect as typing @key{ESC} in emacs mode.
 Thus typing @kbd{C-z x} in insert mode will have the same effect as typing
 @kbd{ESC x} in emacs mode.
@@ -332,8 +332,8 @@ The major differences from Vi are explained below.
 @node Undoing
 @subsection Undoing
 
-@kindex 165 @kbd{u} (@code{vip-undo})
-@kindex 056 @kbd{.} (@code{vip-repeat})
+@kindex 165 u @r{(}@code{vip-undo}@r{)}
+@kindex 056 . @r{(}@code{vip-repeat}@r{)}
 
 You can repeat undoing by the @kbd{.} key.  So, @kbd{u} will undo
 a single change, while @kbd{u .@: .@: .@:}, for instance, will undo 4 previous
@@ -350,14 +350,14 @@ then VIP will prompt you for a new word in the minibuffer by the prompt
 @samp{foo => }.  You can then enter @samp{bar} followed by @key{RET} or
 @key{ESC} to complete the command.  Before you enter @key{RET} or
 @key{ESC} you can abort the command by typing @kbd{C-g}.  In general,
-@kindex 007 @kbd{C-g} (@code{vip-keyboard-quit})
+@kindex 007 C-g @r{(}@code{vip-keyboard-quit})
 you can abort a partially formed command by typing @kbd{C-g}.
 
 @node Searching
 @subsection Searching
 
-@kindex 057 @kbd{/} (@code{vip-search-forward})
-@kindex 077 @kbd{?} (@code{vip-search-backward})
+@kindex 057 / @r{(}@code{vip-search-forward}@r{)}
+@kindex 077 ? @r{(}@code{vip-search-backward}@r{)}
 
 As in Vi, searching is done by @kbd{/} and @kbd{?}.  The string will be
 searched literally by default.  To invoke a regular expression search,
@@ -372,12 +372,12 @@ the buffer as in Vi.  You can change this by rebinding the variable
 @node z Command
 @subsection z Command
 
-@kindex 1723 @kbd{z H} (@code{vip-line-to-top})
-@kindex 1721 @kbd{z RET} (@code{vip-line-to-top})
-@kindex 1723 @kbd{z M} (@code{vip-line-to-middle})
-@kindex 1722 @kbd{z .} (@code{vip-line-to-middle})
-@kindex 1723 @kbd{z L} (@code{vip-line-to-bottom})
-@kindex 1722 @kbd{z -} (@code{vip-line-to-bottom})
+@kindex 1723 z H @r{(}@code{vip-line-to-top}@r{)}
+@kindex 1721 z @key{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{)}
+@kindex 1722 z - @r{(}@code{vip-line-to-bottom}@r{)}
 
 For those of you who cannot remember which of @kbd{z} followed by @key{RET},
 @kbd{.}@: and @kbd{-} do what.  You can also use @kbd{z} followed by @kbd{H},
@@ -392,21 +392,21 @@ Some Vi commands which do not accept a count now accept one
 @table @kbd
 @item p
 @itemx P
-@kindex 160 @kbd{p} (@code{vip-put-back})
-@kindex 120 @kbd{P} (@code{vip-Put-back})
+@kindex 160 p @r{(}@code{vip-put-back}@r{)}
+@kindex 120 P @r{(}@code{vip-Put-back}@r{)}
 Given counts, text will be yanked (in Vi's sense) that many times.  Thus
 @kbd{3 p} is the same as @kbd{p p p}.
 @item o
 @itemx O
-@kindex 157 @kbd{o} (@code{vip-open-line})
-@kindex 117 @kbd{O} (@code{vip-Open-line})
+@kindex 157 o @r{(}@code{vip-open-line}@r{)}
+@kindex 117 O @r{(}@code{vip-Open-line}@r{)}
 Given counts, that many copies of text will be inserted. Thus
 @kbd{o a b c @key{ESC}} will insert 3 lines of @samp{abc} below the current
 line.
 @item /
 @itemx ?
-@kindex 057 @kbd{/} (@code{vip-search-forward})
-@kindex 077 @kbd{?} (@code{vip-search-backward})
+@kindex 057 / @r{(}@code{vip-search-forward}@r{)}
+@kindex 077 ? @r{(}@code{vip-search-backward}@r{)}
 Given a count @var{n}, @var{n}-th occurrence will be searched.
 @end table
 
@@ -417,7 +417,7 @@ Typing an @kbd{m} followed by a lower-case character @var{ch} marks the
 point to the register named @var{ch} as in Vi.  In addition to these, we
 have following key bindings for marking.
 
-@kindex 155 @kbd{m} (@code{vip-mark-point})
+@kindex 155 m @r{(}@code{vip-mark-point}@r{)}
 
 @table @kbd
 @item m <
@@ -451,34 +451,34 @@ Note that the keys below (except for @kbd{R}) are not used in Vi.
 
 @table @kbd
 @item C-a
-@kindex 001 @kbd{C-a} (@code{vip-beginning-of-line})
+@kindex 001 C-a @r{(}@code{vip-beginning-of-line}@r{)}
 Move point to the beginning of line.
 @item C-n
-@kindex 016 @kbd{C-n} (@code{vip-next-window})
+@kindex 016 C-n @r{(}@code{vip-next-window}@r{)}
 If you have two or more windows in the screen, this key will move point to
 the next window.
 @item C-o
-@kindex 017 @kbd{C-o} (@code{vip-open-line-at-point})
+@kindex 017 C-o @r{(}@code{vip-open-line-at-point}@r{)}
 Insert a newline and leave point before it, and then enter insert mode.
 @item C-r
-@kindex 022 @kbd{C-r} (@code{isearch-backward})
+@kindex 022 C-r @r{(}@code{isearch-backward}@r{)}
 Backward incremental search.
 @item C-s
-@kindex 023 @kbd{C-s} (@code{isearch-forward})
+@kindex 023 C-s @r{(}@code{isearch-forward}@r{)}
 Forward incremental search.
 @item C-c
 @itemx C-x
 @itemx @key{ESC}
-@kindex 003 @kbd{C-c} (@code{vip-ctl-c})
-@kindex 0300 @kbd{C-x} (@code{vip-ctl-x})
-@kindex 033 @kbd{ESC} (@code{vip-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{)}
 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}
 followed by @kbd{2}, then the current window will be split into 2 and you
 will be in vi mode again.
 @item \
-@kindex 134 @kbd{\} (@code{vip-escape-to-emacs})
+@kindex 134 \ @r{(}@code{vip-escape-to-emacs}@r{)}
 Escape to emacs mode.  Hitting @kbd{\} will take you to emacs mode, and you
 can execute a single Emacs command.  After executing the Emacs command you
 will be in vi mode again.  You can give a count before typing @kbd{\}.
@@ -486,13 +486,13 @@ Thus @kbd{5 \ *}, as well as @kbd{\ C-u 5 *}, will insert @samp{*****}
 before point.  Similarly @kbd{1 0 \ C-p} will move the point 10 lines above
 the current line.
 @item K
-@kindex 113 @kbd{K} (@code{vip-kill-buffer})
+@kindex 113 K @r{(}@code{vip-kill-buffer}@r{)}
 Kill current buffer if it is not modified.  Useful when you selected a
 buffer which you did not want.
 @item Q
 @itemx R
-@kindex 121 @kbd{Q} (@code{vip-query-replace})
-@kindex 122 @kbd{R} (@code{vip-replace-string})
+@kindex 121 Q @r{(}@code{vip-query-replace}@r{)}
+@kindex 122 R @r{(}@code{vip-replace-string}@r{)}
 @kbd{Q} is for query replace and @kbd{R} is for replace.  By default,
 string to be replaced are treated literally.  If you wish to do a regular
 expression replace, first do replace with empty string as the string to be
@@ -500,39 +500,39 @@ replaced.  In this way, you can toggle between vanilla and regular
 expression replacement.
 @item v
 @itemx V
-@kindex 166 @kbd{v} (@code{vip-find-file})
-@kindex 126 @kbd{V} (@code{vip-find-file-other-window})
+@kindex 166 v @r{(}@code{vip-find-file}@r{)}
+@kindex 126 V @r{(}@code{vip-find-file-other-window}@r{)}
 These keys are used to Visit files.  @kbd{v} will switch to a buffer
 visiting file whose name can be entered in the minibuffer. @kbd{V} is
 similar, but will use window different from the current window.
 @item #
-@kindex 0430 @kbd{#} (@code{vip-command-argument})
+@kindex 0430 # @r{(}@code{vip-command-argument}@r{)}
 If followed by a certain character @var{ch}, it becomes an operator whose
 argument is the region determined by the motion command that follows.
 Currently, @var{ch} can be one of @kbd{c}, @kbd{C}, @kbd{g}, @kbd{q} and
 @kbd{s}.
 @item # c
-@kindex 0432 @kbd{# c} (@code{downcase-region})
+@kindex 0432 # c @r{(}@code{downcase-region}@r{)}
 Change upper-case characters in the region to lower case
 (@code{downcase-region}).
 @item # C
-@kindex 0431 @kbd{# C} (@code{upcase-region})
+@kindex 0431 # C @r{(}@code{upcase-region}@r{)}
 Change lower-case characters in the region to upper case. For instance,
 @kbd{# C 3 w} will capitalize 3 words from the current point
 (@code{upcase-region}).
 @item # g
-@kindex 0432 @kbd{# g} (@code{vip-global-execute})
+@kindex 0432 # g @r{(}@code{vip-global-execute}@r{)}
 Execute last keyboard macro for each line in the region
 (@code{vip-global-execute}).
 @item # q
-@kindex 0432 @kbd{# q} (@code{vip-quote-region})
+@kindex 0432 # q @r{(}@code{vip-quote-region}@r{)}
 Insert specified string at the beginning of each line in the region
 (@code{vip-quote-region}).
 @item # s
-@kindex 0432 @kbd{# s} (@code{spell-region})
+@kindex 0432 # s @r{(}@code{spell-region}@r{)}
 Check spelling of words in the region (@code{spell-region}).
 @item *
-@kindex 052 @kbd{*} (@code{vip-call-last-kbd-macro})
+@kindex 052 * @r{(}@code{vip-call-last-kbd-macro}@r{)}
 Call last keyboard macro.
 @end table
 
@@ -548,21 +548,21 @@ details.
 @table @kbd
 @item C-g
 @itemx g
-@kindex 007 @kbd{C-g} (@code{vip-keyboard-quit})
-@kindex 147 @kbd{g} (@code{vip-info-on-file})
+@kindex 007 C-g @r{(}@code{vip-keyboard-quit}@r{)}
+@kindex 147 g @r{(}@code{vip-info-on-file}@r{)}
 In Vi, @kbd{C-g} is used to get information about the file associated to
 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 @kbd{SPC} (@code{vip-scroll})
-@kindex 015 @kbd{RET} (@code{vip-scroll-back})
+@kindex 040 @key{SPC} @r{(}@code{vip-scroll}@r{)}
+@kindex 015 @key{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
 @itemx S
-@kindex 163 @kbd{s} (@code{vip-switch-to-buffer})
-@kindex 123 @kbd{S} (@code{vip-switch-to-buffer-other-window})
+@kindex 163 s @r{(}@code{vip-switch-to-buffer}@r{)}
+@kindex 123 S @r{(}@code{vip-switch-to-buffer-other-window}@r{)}
 They are used to switch to a specified buffer.  Useful for switching to
 already existing buffer since buffer name completion is provided.  Also
 a default buffer will be given as part of the prompt, to which you can
@@ -570,8 +570,8 @@ switch by just typing @key{RET} key.  @kbd{s} is used to select buffer
 in the current window, while @kbd{S} selects buffer in another window.
 @item C
 @itemx X
-@kindex 103 @kbd{C} (@code{vip-ctl-c-equivalent})
-@kindex 1300 @kbd{X} (@code{vip-ctl-x-equivalent})
+@kindex 103 C @r{(}@code{vip-ctl-c-equivalent}@r{)}
+@kindex 1300 X @r{(}@code{vip-ctl-x-equivalent}@r{)}
 These keys will exit from vi mode and return to emacs mode temporarily.
 If you type @kbd{C} (@kbd{X}), Emacs will be in emacs mode and will believe
 that you have typed @kbd{C-c} (@kbd{C-x}) in emacs mode. Moreover,
@@ -588,7 +588,7 @@ vi mode again.
 
 In addition to these, @code{ctl-x-map} is slightly modified:
 
-@kindex 1301 @kbd{X 3} (@code{vip-buffer-in-two-windows})
+@kindex 1301 X 3 @r{(}@code{vip-buffer-in-two-windows}@r{)}
 
 @table @kbd
 @item X 3
@@ -604,19 +604,19 @@ basic functions related to windows, buffers and files.
 
 @table @kbd
 @item C-n
-@kindex 016 @kbd{C-n} (@code{vip-next-window})
+@kindex 016 C-n @r{(}@code{vip-next-window}@r{)}
 Switch to next window.
 @item X 1
 @itemx C-x 1
-@kindex 1301 @kbd{X 1} (@code{delete-other-windows})
+@kindex 1301 X 1 @r{(}@code{delete-other-windows}@r{)}
 Delete other windows.
 @item X 2
 @itemx C-x 2
-@kindex 1301 @kbd{X 2} (@code{split-window-vertically})
+@kindex 1301 X 2 @r{(}@code{split-window-vertically}@r{)}
 Split current window into two windows.
 @item X 3
 @itemx C-x 3
-@kindex 1301 @kbd{X 3} (@code{vip-buffer-in-two-windows})
+@kindex 1301 X 3 @r{(}@code{vip-buffer-in-two-windows}@r{)}
 Show current buffer in two windows.
 @end table
 
@@ -625,19 +625,19 @@ Show current buffer in two windows.
 
 @table @kbd
 @item s
-@kindex 163 @kbd{s} (@code{vip-switch-to-buffer})
+@kindex 163 s @r{(}@code{vip-switch-to-buffer}@r{)}
 Switch to the specified buffer in the current window
 (@code{vip-switch-to-buffer}).
 @item S
-@kindex 123 @kbd{S} (@code{vip-switch-to-buffer-other-window})
+@kindex 123 S @r{(}@code{vip-switch-to-buffer-other-window}@r{)}
 Switch to the specified buffer in another window
 (@code{vip-switch-to-buffer-other-window}).
 @item K
-@kindex 113 @kbd{K} (@code{vip-kill-buffer})
+@kindex 113 K @r{(}@code{vip-kill-buffer}@r{)}
 Kill the current buffer if it is not modified.
 @item X S
 @itemx C-x C-s
-@kindex 1302 @kbd{X S} (@code{save-buffer})
+@kindex 1302 X S @r{(}@code{save-buffer}@r{)}
 Save the current buffer in the file associated to the buffer.
 @end table
 
@@ -646,18 +646,18 @@ Save the current buffer in the file associated to the buffer.
 
 @table @kbd
 @item v
-@kindex 166 @kbd{v} (@code{vip-find-file})
+@kindex 166 v @r{(}@code{vip-find-file}@r{)}
 Visit specified file in the current window.
 @item V
-@kindex 126 @kbd{V} (@code{vip-find-file-other-window})
+@kindex 126 V @r{(}@code{vip-find-file-other-window}@r{)}
 Visit specified file in another window.
 @item X W
 @itemx C-x C-w
-@kindex 1302 @kbd{X W} (@code{write-file})
+@kindex 1302 X W @r{(}@code{write-file}@r{)}
 Write current buffer into the specified file.
 @item X I
 @itemx C-x C-i
-@kindex 1302 @kbd{X I} (@code{insert-file})
+@kindex 1302 X I @r{(}@code{insert-file}@r{)}
 
 Insert specified file at point.
 @end table
@@ -668,18 +668,18 @@ Insert specified file at point.
 @table @kbd
 @item X (
 @itemx C-x (
-@kindex 1301 @kbd{X (} (@code{start-kbd-macro})
+@kindex 1301 X ( @r{(}@code{start-kbd-macro}@r{)}
 Start remembering keyboard macro.
 @item X )
 @itemx C-x )
-@kindex 1301 @kbd{X )} (@code{end-kbd-macro})
+@kindex 1301 X ) @r{(}@code{end-kbd-macro}@r{)}
 Finish remembering keyboard macro.
 @item *
-@kindex 052 @kbd{*} (@code{vip-call-last-kbd-macro})
+@kindex 052 * @r{(}@code{vip-call-last-kbd-macro}@r{)}
 Call last remembered keyboard macro.
 @item X Z
 @itemx C-x C-z
-@kindex 1302 @kbd{X Z} (@code{suspend-emacs})
+@kindex 1302 X Z @r{(}@code{suspend-emacs}@r{)}
 Suspend Emacs.
 @item Z Z
 Exit Emacs.
@@ -715,15 +715,15 @@ commands described in this chapter are to be used in vi mode.
 
 @cindex numeric arguments
 @cindex count
-@kindex 061 @kbd{1} (numeric argument)
-@kindex 062 @kbd{2} (numeric argument)
-@kindex 063 @kbd{3} (numeric argument)
-@kindex 064 @kbd{4} (numeric argument)
-@kindex 065 @kbd{5} (numeric argument)
-@kindex 066 @kbd{6} (numeric argument)
-@kindex 067 @kbd{7} (numeric argument)
-@kindex 068 @kbd{8} (numeric argument)
-@kindex 069 @kbd{9} (numeric argument)
+@kindex 061 1 @r{(numeric argument)}
+@kindex 062 2 @r{(numeric argument)}
+@kindex 063 3 @r{(numeric argument)}
+@kindex 064 4 @r{(numeric argument)}
+@kindex 065 5 @r{(numeric argument)}
+@kindex 066 6 @r{(numeric argument)}
+@kindex 067 7 @r{(numeric argument)}
+@kindex 068 8 @r{(numeric argument)}
+@kindex 069 9 @r{(numeric argument)}
 
 Most Vi commands accept a @dfn{numeric argument} which can be supplied as
 a prefix to the commands.  A numeric argument is also called a @dfn{count}.
@@ -739,10 +739,10 @@ functions are the same in any of emacs, vi and insert mode.
 
 @table @kbd
 @item C-g
-@kindex 007 @kbd{C-g} (@code{vip-keyboard-quit})
+@kindex 007 C-g (@code{vip-keyboard-quit}@r{)}
 Quit.  Cancel running or partially typed command (@code{keyboard-quit}).
 @item C-l
-@kindex 014 @kbd{C-l} (@code{recenter})
+@kindex 014 C-l @r{(}@code{recenter}@r{)}
 Clear the screen and reprint everything (@code{recenter}).
 @end table
 
@@ -754,9 +754,9 @@ accessed from vi mode as easily as from emacs mode.
 @item C-x
 @itemx C-c
 @itemx @key{ESC}
-@kindex 003 @kbd{C-c} (@code{vip-ctl-c})
-@kindex 0300 @kbd{C-x} (@code{vip-ctl-x})
-@kindex 033 @kbd{ESC} (@code{vip-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{)}
 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.
@@ -764,8 +764,8 @@ For instance, if you type @kbd{@key{ESC} <} (in vi mode) then the cursor will
 move to the beginning of the buffer and you will still be in vi mode.
 @item C
 @itemx X
-@kindex 103 @kbd{C} (@code{vip-ctl-c-equivalent})
-@kindex 1300 @kbd{X} (@code{vip-ctl-x-equivalent})
+@kindex 103 C @r{(}@code{vip-ctl-c-equivalent}@r{)}
+@kindex 1300 X @r{(}@code{vip-ctl-x-equivalent}@r{)}
 Typing one of these keys have the effect of typing the corresponding
 control character in emacs mode.  Moreover, if you type an upper-case
 character following it, that character will also be translated to the
@@ -773,7 +773,7 @@ corresponding control character.  Thus typing @kbd{X W} in vi mode is the
 same as typing @kbd{C-x C-w} in emacs mode.  You will be in vi mode again
 after the execution of a command.
 @item \
-@kindex 134 @kbd{\} (@code{vip-escape-to-emacs})
+@kindex 134 \ @r{(}@code{vip-escape-to-emacs}@r{)}
 Escape to emacs mode.  Hitting the @kbd{\} key will take you to emacs mode,
 and you can execute a single Emacs command.  After executing the
 Emacs command you will be in vi mode again.  You can give a count before
@@ -810,31 +810,31 @@ We have the following commands related to windows and buffers.
 
 @table @kbd
 @item C-n
-@kindex 016 @kbd{C-n} (@code{vip-next-window})
+@kindex 016 C-n @r{(}@code{vip-next-window}@r{)}
 Move cursor to the next-window (@code{vip-next-window}).
 @item X 1
-@kindex 1301 @kbd{X 1} (@code{delete-other-windows})
+@kindex 1301 X 1 @r{(}@code{delete-other-windows}@r{)}
 Delete other windows and make the selected window fill the screen
 @*(@code{delete-other-windows}).
 @item X 2
-@kindex 1301 @kbd{X 2} (@code{split-window-vertically})
+@kindex 1301 X 2 @r{(}@code{split-window-vertically}@r{)}
 Split current window into two windows (@code{split-window-vertically}).
 @item X 3
-@kindex 1301 @kbd{X 3} (@code{vip-buffer-in-two-windows})
+@kindex 1301 X 3 @r{(}@code{vip-buffer-in-two-windows}@r{)}
 Show current buffer in two windows.
 @item s @var{buffer} @key{RET}
-@kindex 163 @kbd{s} (@code{vip-switch-to-buffer})
+@kindex 163 s @r{(}@code{vip-switch-to-buffer}@r{)}
 Select or create a buffer named @var{buffer} (@code{vip-switch-to-buffer}).
 @item S @var{buffer} @key{RET}
-@kindex 123 @kbd{S} (@code{vip-switch-to-buffer-other-window})
+@kindex 123 S @r{(}@code{vip-switch-to-buffer-other-window}@r{)}
 Similar but select a buffer named @var{buffer} in another window
 @*(@code{vip-switch-to-buffer-other-window}).
 @item K
-@kindex 113 @kbd{K} (@code{vip-kill-buffer})
+@kindex 113 K @r{(}@code{vip-kill-buffer}@r{)}
 Kill the current buffer if it is not modified or if it is not associated
 with a file @*(@code{vip-kill-buffer}).
 @item X B
-@kindex 1302 @kbd{X B} (@code{list-buffers})
+@kindex 1302 X B @r{(}@code{list-buffers}@r{)}
 List the existing buffers (@code{list-buffers}).
 @end table
 
@@ -856,24 +856,24 @@ save and insert files.
 
 @table @kbd
 @item v @var{file} @key{RET}
-@kindex 166 @kbd{v} (@code{vip-find-file})
+@kindex 166 v @r{(}@code{vip-find-file}@r{)}
 Visit specified file in the current window (@code{vip-find-file}).
 @item V @var{file} @key{RET}
-@kindex 126 @kbd{V} (@code{vip-find-file-other-window})
+@kindex 126 V @r{(}@code{vip-find-file-other-window}@r{)}
 Visit specified file in another window (@code{vip-find-file-other-window}).
 @item X S
-@kindex 1302 @kbd{X S} (@code{save-buffer})
+@kindex 1302 X S @r{(}@code{save-buffer}@r{)}
 Save current buffer to the file associated with the buffer.  If no file is
 associated with the buffer, the name of the file to write out the content
 of the buffer will be asked in the minibuffer.
 @item X W @var{file} @key{RET}
-@kindex 1302 @kbd{X W} (@code{write-file})
+@kindex 1302 X W @r{(}@code{write-file}@r{)}
 Write current buffer into a specified file.
 @item X I @var{file} @key{RET}
-@kindex 1302 @kbd{X I} (@code{insert-file})
+@kindex 1302 X I @r{(}@code{insert-file}@r{)}
 Insert a specified file at point.
 @item g
-@kindex 147 @kbd{g} (@code{vip-info-on-file})
+@kindex 147 g @r{(}@code{vip-info-on-file}@r{)}
 Give information on the file associated with the current buffer.  Tell you
 the name of the file associated with the buffer, the line number of the
 current point and total line numbers in the buffer.  If no file is
@@ -940,29 +940,29 @@ buffer.
 @table @kbd
 @item @key{SPC}
 @itemx C-f
-@kindex 040 @kbd{SPC} (@code{vip-scroll})
-@kindex 006 @kbd{C-f} (@code{vip-scroll-back})
+@kindex 040 @key{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 @kbd{RET} (@code{vip-scroll-back})
-@kindex 002 @kbd{C-b} (@code{vip-scroll-back})
+@kindex 015 @key{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}).
 @item C-d
-@kindex 004 @kbd{C-d} (@code{vip-scroll-up})
+@kindex 004 C-d @r{(}@code{vip-scroll-up}@r{)}
 Scroll text of current window upward half screen.  You can go
 @i{down} in the buffer by this command (@code{vip-scroll-down}).
 @item C-u
-@kindex 025 @kbd{C-u} (@code{vip-scroll-down})
+@kindex 025 C-u @r{(}@code{vip-scroll-down}@r{)}
 Scroll text of current window downward half screen.  You can go
 @i{up} in the buffer by this command (@code{vip-scroll-up}).
 @item C-y
-@kindex 031 @kbd{C-y} (@code{vip-scroll-down-one})
+@kindex 031 C-y @r{(}@code{vip-scroll-down-one}@r{)}
 Scroll text of current window upward by one line (@code{vip-scroll-down-one}).
 @item C-e
-@kindex 005 @kbd{C-e} (@code{vip-scroll-up-one})
+@kindex 005 C-e @r{(}@code{vip-scroll-up-one}@r{)}
 Scroll text of current window downward by one line (@code{vip-scroll-up-one}).
 @end table
 @noindent
@@ -974,22 +974,22 @@ The following commands reposition point in the window.
 @table @kbd
 @item z H
 @itemx z @key{RET}
-@kindex 1723 @kbd{z H} (@code{vip-line-to-top})
-@kindex 1721 @kbd{z RET} (@code{vip-line-to-top})
+@kindex 1723 z H @r{(}@code{vip-line-to-top}@r{)}
+@kindex 1721 z @key{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}).
 @item z M
 @itemx z .
-@kindex 1723 @kbd{z M} (@code{vip-line-to-middle})
-@kindex 1722 @kbd{z .} (@code{vip-line-to-middle})
+@kindex 1723 z M @r{(}@code{vip-line-to-middle}@r{)}
+@kindex 1722 z . @r{(}@code{vip-line-to-middle}@r{)}
 Put point on the @i{middle} line in the window.  Given a count @var{n},
 point will be placed in the @var{n}-th line from the middle line
 (@code{vip-line-to-middle}).
 @item z L
 @itemx z -
-@kindex 1723 @kbd{z L} (@code{vip-line-to-bottom})
-@kindex 1722 @kbd{z -} (@code{vip-line-to-bottom})
+@kindex 1723 z L @r{(}@code{vip-line-to-bottom}@r{)}
+@kindex 1722 z - @r{(}@code{vip-line-to-bottom}@r{)}
 Put point on the @i{bottom} line in the window.  Given a count @var{n},
 point will be placed in the @var{n}-th line from bottom
 (@code{vip-line-to-bottom}).
@@ -1004,7 +1004,7 @@ The following commands are used to mark positions in the buffer.
 
 @table @kbd
 @item m @var{ch}
-@kindex 155 @kbd{m} (@code{vip-mark-point})
+@kindex 155 m @r{(}@code{vip-mark-point}@r{)}
 Store current point in the register @var{ch}.  @var{ch} must be a
 lower-case @acronym{ASCII} letter.
 @item m <
@@ -1034,31 +1034,31 @@ to be described in the next section.
 
 @table @kbd
 @item h
-@kindex 150 @kbd{h} (@code{vip-backward-char})
+@kindex 150 h @r{(}@code{vip-backward-char}@r{)}
 Move point backward by one character.  Signal error if point is at the
 beginning of buffer, but (unlike Vi) do not complain otherwise
 (@code{vip-backward-char}).
 @item l
-@kindex 154 @kbd{l} (@code{vip-forward-char})
+@kindex 154 l @r{(}@code{vip-forward-char}@r{)}
 Move point backward by one character.  Signal error if point is at the
 end of buffer, but (unlike Vi) do not complain otherwise
 (@code{vip-forward-char}).
 @item j
-@kindex 152 @kbd{j} (@code{vip-next-line})
+@kindex 152 j @r{(}@code{vip-next-line}@r{)}
 Move point to the next line keeping the current column.  If point is on the
 last line of the buffer, a new line will be created and point will move to
 that line (@code{vip-next-line}).
 @item k
-@kindex 153 @kbd{k} (@code{vip-previous-line})
+@kindex 153 k @r{(}@code{vip-previous-line}@r{)}
 Move point to the previous line keeping the current column
 (@code{vip-next-line}).
 @item +
-@kindex 053 @kbd{+} (@code{vip-next-line-at-bol})
+@kindex 053 + @r{(}@code{vip-next-line-at-bol}@r{)}
 Move point to the next line at the first non-white character.  If point is
 on the last line of the buffer, a new line will be created and point will
 move to the beginning of that line (@code{vip-next-line-at-bol}).
 @item -
-@kindex 055 @kbd{-} (@code{vip-previous-line-at-bol})
+@kindex 055 - @r{(}@code{vip-previous-line-at-bol}@r{)}
 Move point to the previous line at the first non-white character
 (@code{vip-previous-line-at-bol}).
 @end table
@@ -1068,17 +1068,17 @@ many times.
 
 @table @kbd
 @item 0
-@kindex 060 @kbd{0} (@code{vip-beginning-of-line})
+@kindex 060 0 @r{(}@code{vip-beginning-of-line}@r{)}
 Move point to the beginning of line (@code{vip-beginning-of-line}).
 @item ^
-@kindex 136 @kbd{^} (@code{vip-bol-and-skip-white})
+@kindex 136 ^ @r{(}@code{vip-bol-and-skip-white}@r{)}
 Move point to the first non-white character on the line
 (@code{vip-bol-and-skip-white}).
 @item $
-@kindex 044 @kbd{$} (@code{vip-goto-eol})
+@kindex 044 $ @r{(}@code{vip-goto-eol}@r{)}
 Move point to the end of line (@code{vip-goto-eol}).
 @item @var{n} |
-@kindex 174 @kbd{|} (@code{vip-goto-col})
+@kindex 174 | @r{(}@code{vip-goto-col}@r{)}
 Move point to the @var{n}-th column on the line (@code{vip-goto-col}).
 @end table
 @noindent
@@ -1088,25 +1088,25 @@ Except for the @kbd{|} command, these commands neglect a count.
 
 @table @kbd
 @item w
-@kindex 167 @kbd{w} (@code{vip-forward-word})
+@kindex 167 w @r{(}@code{vip-forward-word}@r{)}
 Move point forward to the beginning of the next word
 (@code{vip-forward-word}).
 @item W
-@kindex 127 @kbd{W} (@code{vip-forward-Word})
+@kindex 127 W @r{(}@code{vip-forward-Word}@r{)}
 Move point forward to the beginning of the next word, where a @dfn{word} is
 considered as a sequence of non-white characters (@code{vip-forward-Word}).
 @item b
-@kindex 142 @kbd{b} (@code{vip-backward-word})
+@kindex 142 b @r{(}@code{vip-backward-word}@r{)}
 Move point backward to the beginning of a word (@code{vip-backward-word}).
 @item B
-@kindex 102 @kbd{B} (@code{vip-backward-Word})
+@kindex 102 B @r{(}@code{vip-backward-Word}@r{)}
 Move point backward to the beginning of a word, where a @i{word} is
 considered as a sequence of non-white characters (@code{vip-forward-Word}).
 @item e
-@kindex 145 @kbd{e} (@code{vip-end-of-word})
+@kindex 145 e @r{(}@code{vip-end-of-word}@r{)}
 Move point forward to the end of a word (@code{vip-end-of-word}).
 @item E
-@kindex 105 @kbd{E} (@code{vip-end-of-Word})
+@kindex 105 E @r{(}@code{vip-end-of-Word}@r{)}
 Move point forward to the end of a word, where a @i{word} is
 considered as a sequence of non-white characters (@code{vip-end-of-Word}).
 @end table
@@ -1120,17 +1120,17 @@ details of syntax table.
 
 @table @kbd
 @item H
-@kindex 110 @kbd{H} (@code{vip-window-top})
+@kindex 110 H @r{(}@code{vip-window-top}@r{)}
 Move point to the beginning of the @i{home} (top) line of the window.
 Given a count @var{n}, go to the @var{n}-th line from top
 (@code{vip-window-top}).
 @item M
-@kindex 115 @kbd{M} (@code{vip-window-middle})
+@kindex 115 M @r{(}@code{vip-window-middle}@r{)}
 Move point to the beginning of the @i{middle} line of the window.  Given
 a count @var{n}, go to the @var{n}-th line from the middle line
 (@code{vip-window-middle}).
 @item L
-@kindex 114 @kbd{L} (@code{vip-window-bottom})
+@kindex 114 L @r{(}@code{vip-window-bottom}@r{)}
 Move point to the beginning of the @i{lowest} (bottom) line of the
 window.  Given count, go to the @var{n}-th line from bottom
 (@code{vip-window-bottom}).
@@ -1140,19 +1140,19 @@ These commands can be used to go to the desired line visible on the screen.
 
 @table @kbd
 @item (
-@kindex 050 @kbd{(} (@code{vip-backward-sentence})
+@kindex 050 ( @r{(}@code{vip-backward-sentence}@r{)}
 Move point backward to the beginning of the sentence
 (@code{vip-backward-sentence}).
 @item )
-@kindex 051 @kbd{)} (@code{vip-forward-sentence})
+@kindex 051 ) @r{(}@code{vip-forward-sentence}@r{)}
 Move point forward to the end of the sentence
 (@code{vip-forward-sentence}).
 @item @{
-@kindex 173 @kbd{@{} (@code{vip-backward-paragraph})
+@kindex 173 @{ @r{(}@code{vip-backward-paragraph}@r{)}
 Move point backward to the beginning of the paragraph
 (@code{vip-backward-paragraph}).
 @item @}
-@kindex 175 @kbd{@}} (@code{vip-forward-paragraph})
+@kindex 175 @} @r{(}@code{vip-forward-paragraph}@r{)}
 Move point forward to the end of the paragraph
 (@code{vip-forward-paragraph}).
 @end table
@@ -1161,25 +1161,25 @@ A count repeats the effect for these commands.
 
 @table @kbd
 @item G
-@kindex 107 @kbd{G} (@code{vip-goto-line})
+@kindex 107 G @r{(}@code{vip-goto-line}@r{)}
 Given a count @var{n}, move point to the @var{n}-th line in the buffer on
 the first non-white character.  Without a count, go to the end of the buffer
 (@code{vip-goto-line}).
 @item ` `
-@kindex 140 @kbd{`} (@code{vip-goto-mark})
+@kindex 140 ` @r{(}@code{vip-goto-mark}@r{)}
 Exchange point and mark (@code{vip-goto-mark}).
 @item ` @var{ch}
 Move point to the position stored in the register @var{ch}.  @var{ch} must
 be a lower-case letter.
 @item ' '
-@kindex 047 @kbd{'} (@code{vip-goto-mark-and-skip-white})
+@kindex 047 ' @r{(}@code{vip-goto-mark-and-skip-white}@r{)}
 Exchange point and mark, and then move point to the first non-white
 character on the line (@code{vip-goto-mark-and-skip-white}).
 @item ' @var{ch}
 Move point to the position stored in the register @var{ch} and skip to the
 first non-white character on the line.  @var{ch} must be a lower-case letter.
 @item %
-@kindex 045 @kbd{%} (@code{vip-paren-match})
+@kindex 045 % @r{(}@code{vip-paren-match}@r{)}
 Move point to the matching parenthesis if point is looking at @kbd{(},
 @kbd{)}, @kbd{@{}, @kbd{@}}, @kbd{[} or @kbd{]}
 @*(@code{vip-paren-match}).
@@ -1194,27 +1194,27 @@ will repeat the effect.
 
 @table @kbd
 @item f @var{ch}
-@kindex 146 @kbd{f} (@code{vip-find-char-forward})
+@kindex 146 f @r{(}@code{vip-find-char-forward}@r{)}
 Move point forward to the character @var{ch} on the line.  Signal error if
 @var{ch} could not be found (@code{vip-find-char-forward}).
 @item F @var{ch}
-@kindex 106 @kbd{F} (@code{vip-find-char-backward})
+@kindex 106 F @r{(}@code{vip-find-char-backward}@r{)}
 Move point backward to the character @var{ch} on the line.  Signal error if
 @var{ch} could not be found (@code{vip-find-char-backward}).
 @item t @var{ch}
-@kindex 164 @kbd{t} (@code{vip-goto-char-forward})
+@kindex 164 t @r{(}@code{vip-goto-char-forward}@r{)}
 Move point forward upto the character @var{ch} on the line.  Signal error if
 @var{ch} could not be found (@code{vip-goto-char-forward}).
 @item T @var{ch}
-@kindex 124 @kbd{T} (@code{vip-goto-char-backward})
+@kindex 124 T @r{(}@code{vip-goto-char-backward}@r{)}
 Move point backward upto the character @var{ch} on the line.  Signal error if
 @var{ch} could not be found (@code{vip-goto-char-backward}).
 @item ;
-@kindex 073 @kbd{;} (@code{vip-repeat-find})
+@kindex 073 ; @r{(}@code{vip-repeat-find}@r{)}
 Repeat previous @kbd{f}, @kbd{t}, @kbd{F} or @kbd{T} command
 (@code{vip-repeat-find}).
 @item ,
-@kindex 054 @kbd{,} (@code{vip-repeat-find-opposite})
+@kindex 054 , @r{(}@code{vip-repeat-find-opposite}@r{)}
 Repeat previous @kbd{f}, @kbd{t}, @kbd{F} or @kbd{T} command, in the
 opposite direction (@code{vip-repeat-find-opposite}).
 @end table
@@ -1228,7 +1228,7 @@ Following commands are available for searching and replacing.
 
 @table @kbd
 @item / @var{string} @key{RET}
-@kindex 057 @kbd{/} (@code{vip-search-forward})
+@kindex 057 / @r{(}@code{vip-search-forward}@r{)}
 Search the first occurrence of the string @var{string} forward starting
 from point.  Given a count @var{n}, the @var{n}-th occurrence of
 @var{string} will be searched.  If the variable @code{vip-re-search} has value
@@ -1238,28 +1238,28 @@ empty string as @var{string} then the search mode will change from vanilla
 search to regular expression search and vice versa
 (@code{vip-search-forward}).
 @item ? @var{string} @key{RET}
-@kindex 077 @kbd{?} (@code{vip-search-backward})
+@kindex 077 ? @r{(}@code{vip-search-backward}@r{)}
 Same as @kbd{/}, except that search is done backward
 (@code{vip-search-backward}).
 @item n
-@kindex 156 @kbd{n} (@code{vip-search-next})
+@kindex 156 n @r{(}@code{vip-search-next}@r{)}
 Search the previous search pattern in the same direction as before
 (@code{vip-search-next}).
 @item N
-@kindex 116 @kbd{N} (@code{vip-search-Next})
+@kindex 116 N @r{(}@code{vip-search-Next}@r{)}
 Search the previous search pattern in the opposite direction
 (@code{vip-search-Next}).
 @item C-s
-@kindex 023 @kbd{C-s} (@code{isearch-forward})
+@kindex 023 C-s @r{(}@code{isearch-forward}@r{)}
 Search forward incrementally.  See GNU Emacs Manual for details
 (@code{isearch-forward}).
 @item C-r
-@kindex 022 @kbd{C-r} (@code{isearch-backward})
+@kindex 022 C-r @r{(}@code{isearch-backward}@r{)}
 Search backward incrementally (@code{isearch-backward}).
 @cindex vanilla (replacement)
 @cindex regular expression (replacement)
 @item R @var{string} RET @var{newstring}
-@kindex 122 @kbd{R} (@code{vip-replace-string})
+@kindex 122 R @r{(}@code{vip-replace-string}@r{)}
 There are two modes of replacement, @dfn{vanilla} and @dfn{regular expression}.
 If the mode is @i{vanilla} you will get a prompt @samp{Replace string:},
 and if the mode is @i{regular expression} you will ge a prompt
@@ -1270,12 +1270,12 @@ vanilla, this command replaces every occurrence of @var{string} with
 treated as a regular expression and every string matching the regular
 expression is replaced with @var{newstring} (@code{vip-replace-string}).
 @item Q @var{string} RET @var{newstring}
-@kindex 121 @kbd{Q} (@code{vip-query-replace})
+@kindex 121 Q @r{(}@code{vip-query-replace}@r{)}
 Same as @kbd{R} except that you will be asked form confirmation before each
 replacement
 @*(@code{vip-query-replace}).
 @item r @var{ch}
-@kindex 162 @kbd{r} (@code{vip-replace-char})
+@kindex 162 r @r{(}@code{vip-replace-char}@r{)}
 Replace the character point is looking at by the character @var{ch}.  Give
 count, replace that many characters by @var{ch} (@code{vip-replace-char}).
 @end table
@@ -1326,7 +1326,7 @@ command.
 
 @table @kbd
 @item d @var{motion-command}
-@kindex 1440 @kbd{d} (@code{vip-command-argument})
+@kindex 1440 d @r{(}@code{vip-command-argument}@r{)}
 Delete the region determined by the motion command @var{motion-command}.
 @end table
 @noindent
@@ -1337,7 +1337,7 @@ end of the buffer, since @kbd{G} is a line command.  A count given to the
 command above will become the count for the associated motion command.
 Thus, @kbd{3 d w} will delete three words.
 
-@kindex 042 @kbd{"} (@code{vip-command-argument})
+@kindex 042 " @r{(}@code{vip-command-argument}@r{)}
 It is also possible to save the deleted text into a register you specify.
 For example, you can say @kbd{" t 3 d w} to delete three words and save it
 to register @kbd{t}.  The name of a register is a lower-case letter between
@@ -1352,23 +1352,23 @@ We have more delete commands as below.
 
 @table @kbd
 @item d d
-@kindex 1442 @kbd{d d}
+@kindex 1442 d d
 Delete a line.  Given a count @var{n}, delete @var{n} lines.
 @item d r
-@kindex 1442 @kbd{d r}
+@kindex 1442 d r
 Delete current region.
 @item d R
-@kindex 1441 @kbd{d R}
+@kindex 1441 d R
 Expand current region and delete it.
 @item D
-@kindex 104 @kbd{D} (@code{vip-kill-line})
+@kindex 104 D @r{(}@code{vip-kill-line}@r{)}
 Delete to the end of a line (@code{vip-kill-line}).
 @item x
-@kindex 170 @kbd{x} (@code{vip-delete-char})
+@kindex 170 x @r{(}@code{vip-delete-char}@r{)}
 Delete a character after point.  Given @var{n}, delete @var{n} characters
 (@code{vip-delete-char}).
 @item @key{DEL}
-@kindex 177 @kbd{DEL} (@code{vip-delete-backward-char})
+@kindex 177 @key{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
@@ -1385,7 +1385,7 @@ commands that put back the yanked text into the buffer.
 
 @table @kbd
 @item y @var{motion-command}
-@kindex 1710 @kbd{y} (@code{vip-command-argument})
+@kindex 1710 y @r{(}@code{vip-command-argument}@r{)}
 Yank the region determined by the motion command @var{motion-command}.
 @end table
 @noindent
@@ -1398,14 +1398,14 @@ Use the following command to yank consecutive lines of text.
 @table @kbd
 @item y y
 @itemx Y
-@kindex 131 @kbd{Y} (@code{vip-yank-line})
-@kindex 1712 @kbd{y y} (@code{vip-yank-line})
+@kindex 131 Y @r{(}@code{vip-yank-line}@r{)}
+@kindex 1712 y y @r{(}@code{vip-yank-line}@r{)}
 Yank a line.  Given @var{n}, yank @var{n} lines (@code{vip-yank-line}).
 @item y r
-@kindex 1712 @kbd{y r}
+@kindex 1712 y r
 Yank current region.
 @item y R
-@kindex 1711 @kbd{y R}
+@kindex 1711 y R
 Expand current region and yank it.
 @end table
 
@@ -1416,7 +1416,7 @@ below.
 
 @table @kbd
 @item p
-@kindex 160 @kbd{p} (@code{vip-put-back})
+@kindex 160 p @r{(}@code{vip-put-back}@r{)}
 Insert, after the character point is looking at, most recently
 deleted/yanked text from anonymous register. Given a register name
 argument, the content of the named register will be put back.  Given a
@@ -1424,7 +1424,7 @@ count, the command will be repeated that many times. This command also
 checks if the text to put back ends with a new line character, and if so
 the text will be put below the current line (@code{vip-put-back}).
 @item P
-@kindex 120 @kbd{P} (@code{vip-Put-back})
+@kindex 120 P @r{(}@code{vip-Put-back}@r{)}
 Insert at point most recently deleted/yanked text from anonymous register.
 Given a register name argument, the content of the named register will
 be put back.  Given a count, the command will be repeated that many times.
@@ -1447,7 +1447,7 @@ Most commonly used change command takes the following form.
 
 @table @kbd
 @item c @var{motion-command}
-@kindex 1430 @kbd{c} (@code{vip-command-argument})
+@kindex 1430 c @r{(}@code{vip-command-argument}@r{)}
 Replace the content of the region determined by the motion command
 @var{motion-command} by the text you type.  If the motion command is a
 point command then you will type the text into minibuffer, and if the
@@ -1463,13 +1463,13 @@ command.
 
 @table @kbd
 @item c c
-@kindex 1432 @kbd{c c}
+@kindex 1432 c c
 Change a line.  Given a count, that many lines are changed.
 @item c r
-@kindex 1432 @kbd{c r}
+@kindex 1432 c r
 Change current region.
 @item c R
-@kindex 1431 @kbd{c R}
+@kindex 1431 c R
 Expand current region and change it.
 @end table
 
@@ -1481,13 +1481,13 @@ it.  It is also very easy to undo changes made by modifying commands.
 
 @table @kbd
 @item u
-@kindex 165 @kbd{u} (@code{vip-undo})
+@kindex 165 u @r{(}@code{vip-undo}@r{)}
 Undo the last change.  You can undo more by repeating undo by the repeat
 command @samp{.}.  For example, you can undo 5 previous changes by typing
 @samp{u....}.  If you type @samp{uu}, then the second @samp{u} undoes the
 first undo command (@code{vip-undo}).
 @item .
-@kindex 056 @kbd{.} (@code{vip-repeat})
+@kindex 056 . @r{(}@code{vip-repeat}@r{)}
 Repeat the last modifying command.  Given count @var{n} it becomes the new
 count for the repeated command.  Otherwise, the count for the last
 modifying command is used again (@code{vip-repeat}).
@@ -1500,12 +1500,12 @@ Miscellaneous Vi commands are collected here.
 
 @table @kbd
 @item Z Z
-@kindex 132 @kbd{Z Z} (@code{save-buffers-kill-emacs})
+@kindex 132 Z Z @r{(}@code{save-buffers-kill-emacs}@r{)}
 Exit Emacs.  If modified buffers exist, you will be asked whether you wish
 to save them or not (@code{save-buffers-kill-emacs}).
 @item !@: @var{motion-command} @var{format-command}
 @itemx @var{n} !@: !@: @var{format-command}
-@kindex 041 @kbd{!} (@code{vip-command-argument})
+@kindex 041 ! @r{(}@code{vip-command-argument}@r{)}
 The region determined by the motion command @var{motion-command} will be
 given to the shell command @var{format-command} and the region will be
 replaced by its output.  If a count is given, it will be passed to
@@ -1514,30 +1514,30 @@ between point and the 3rd line.  If @kbd{!} is used instead of
 @var{motion-command} then @var{n} lines will be processed by
 @var{format-command} (@code{vip-command-argument}).
 @item J
-@kindex 112 @kbd{J} (@code{vip-join-lines})
+@kindex 112 J @r{(}@code{vip-join-lines}@r{)}
 Join two lines.  Given count, join that many lines.  A space will be
 inserted at each junction (@code{vip-join-lines}).
 @item < @var{motion-command}
 @itemx @var{n} < <
-@kindex 074 @kbd{<} (@code{vip-command-argument})
+@kindex 074 < @r{(}@code{vip-command-argument}@r{)}
 Shift region determined by the motion command @var{motion-command} to
 left by @var{shift-width} (default is 8).  If @kbd{<} is used instead of
 @var{motion-command} then shift @var{n} lines
 @*(@code{vip-command-argument}).
 @item > @var{motion-command}
 @itemx @var{n} > >
-@kindex 076 @kbd{>} (@code{vip-command-argument})
+@kindex 076 > @r{(}@code{vip-command-argument}@r{)}
 Shift region determined by the motion command @var{motion-command} to
 right by @var{shift-width} (default is 8).  If @kbd{<} is used instead of
 @var{motion-command} then shift @var{n} lines
 @*(@code{vip-command-argument}).
 @item = @var{motion-command}
-@kindex 075 @kbd{=} (@code{vip-command-argument})
+@kindex 075 = @r{(}@code{vip-command-argument}@r{)}
 Indent region determined by the motion command @var{motion-command}.  If
 @kbd{=} is used instead of @var{motion-command} then indent @var{n} lines
 (@code{vip-command-argument}).
 @item *
-@kindex 052 @kbd{*} (@code{vip-call-last-kbd-macro})
+@kindex 052 * @r{(}@code{vip-call-last-kbd-macro}@r{)}
 Call last remembered keyboard macro.
 @item #
 A new vi operator. @xref{New Commands}, for more details.
@@ -1546,14 +1546,14 @@ A new vi operator. @xref{New Commands}, for more details.
 The following keys are reserved for future extensions, and currently
 assigned to a function that just beeps (@code{vip-nil}).
 
-@kindex 046 @kbd{&} (@code{vip-nil})
-@kindex 100 @kbd{@@} (@code{vip-nil})
-@kindex 125 @kbd{U} (@code{vip-nil})
-@kindex 133 @kbd{[} (@code{vip-nil})
-@kindex 135 @kbd{]} (@code{vip-nil})
-@kindex 137 @kbd{_} (@code{vip-nil})
-@kindex 161 @kbd{q} (@code{vip-nil})
-@kindex 176 @kbd{~} (@code{vip-nil})
+@kindex 046 & @r{(}@code{vip-nil}@r{)}
+@kindex 100 @@ @r{(}@code{vip-nil}@r{)}
+@kindex 125 U @r{(}@code{vip-nil}@r{)}
+@kindex 133 [ @r{(}@code{vip-nil}@r{)}
+@kindex 135 ] @r{(}@code{vip-nil}@r{)}
+@kindex 137 _ @r{(}@code{vip-nil}@r{)}
+@kindex 161 q @r{(}@code{vip-nil}@r{)}
+@kindex 176 ~ @r{(}@code{vip-nil}@r{)}
 
 @example
 &, @@, U, [, ], _, q, ~
@@ -1567,48 +1567,48 @@ keymap.  See GNU Emacs Manual for details.
 
 @table @kbd
 @item C-@@
-@kindex 000 @kbd{C-@@} (@code{set-mark-command})
+@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 TAB (@code{indent-for-tab-command})
+@kindex 011 @key{TAB} @r{(}@code{indent-for-tab-command}@r{)}
 Indent line for current major mode (@code{indent-for-tab-command}).
 @item C-j
-@kindex 012 @kbd{C-j} (@code{electric-newline-and-maybe-indent})
+@kindex 012 C-j @r{(}@code{electric-newline-and-maybe-indent}@r{)}
 Insert a newline, and maybe indent according to mode.
 @item C-k
-@kindex 013 @kbd{C-k} (@code{kill-line})
+@kindex 013 C-k @r{(}@code{kill-line}@r{)}
 Kill the rest of the current line; before a newline, kill the newline.
 With a numeric argument, kill that many lines from point.  Negative arguments
 kill lines backward (@code{kill-line}).
 @item C-l
-@kindex 014 @kbd{C-l} (@code{recenter})
+@kindex 014 C-l @r{(}@code{recenter}@r{)}
 Clear the screen and reprint everything (@code{recenter}).
 @item @var{n} C-p
-@kindex 020 @kbd{C-p} (@code{previous-line})
+@kindex 020 C-p @r{(}@code{previous-line}@r{)}
 Move cursor vertically up @var{n} lines (@code{previous-line}).
 @item C-q
-@kindex 021 @kbd{C-q} (@code{quoted-insert})
+@kindex 021 C-q @r{(}@code{quoted-insert}@r{)}
 Read next input character and insert it.  Useful for inserting control
 characters
 @*(@code{quoted-insert}).
 @item C-r
-@kindex 022 @kbd{C-r} (@code{isearch-backward})
+@kindex 022 C-r @r{(}@code{isearch-backward}@r{)}
 Search backward incrementally (@code{isearch-backward}).
 @item C-s
-@kindex 023 @kbd{C-s} (@code{isearch-forward})
+@kindex 023 C-s @r{(}@code{isearch-forward}@r{)}
 Search forward incrementally (@code{isearch-forward}).
 @item @var{n} C-t
-@kindex 024 @kbd{C-t} (@code{transpose-chars})
+@kindex 024 C-t @r{(}@code{transpose-chars}@r{)}
 Interchange characters around point, moving forward one character.  With
 count @var{n}, take character before point and drag it forward past @var{n}
 other characters.  If no argument and at end of line, the previous two
 characters are exchanged (@code{transpose-chars}).
 @item @var{n} C-v
-@kindex 026 @kbd{C-v} (@code{scroll-up})
+@kindex 026 C-v @r{(}@code{scroll-up}@r{)}
 Scroll text upward @var{n} lines.  If @var{n} is not given, scroll near
 full screen (@code{scroll-up}).
 @item C-w
-@kindex 027 @kbd{C-w} (@code{kill-region})
+@kindex 027 C-w @r{(}@code{kill-region}@r{)}
 Kill between point and mark.  The text is save in the kill ring.  The
 command @kbd{P} or @kbd{p} can retrieve it from kill ring
 (@code{kill-region}).
@@ -1624,29 +1624,29 @@ and you can repeat them by the repeat command @kbd{.} (@code{vip-repeat}).
 
 @table @kbd
 @item i
-@kindex 151 @kbd{i} (@code{vip-insert})
+@kindex 151 i @r{(}@code{vip-insert}@r{)}
 Enter insert mode at point (@code{vip-insert}).
 @item I
-@kindex 111 @kbd{I} (@code{vip-Insert})
+@kindex 111 I @r{(}@code{vip-Insert}@r{)}
 Enter insert mode at the first non white character on the line
 (@code{vip-Insert}).
 @item a
-@kindex 141 @kbd{a} (@code{vip-append})
+@kindex 141 a @r{(}@code{vip-append}@r{)}
 Move point forward by one character and then enter insert mode
 (@code{vip-append}).
 @item A
-@kindex 101 @kbd{A} (@code{vip-Append})
+@kindex 101 A @r{(}@code{vip-Append}@r{)}
 Enter insert mode at end of line (@code{vip-Append}).
 @item o
-@kindex 157 @kbd{o} (@code{vip-open-line})
+@kindex 157 o @r{(}@code{vip-open-line}@r{)}
 Open a new line below the current line and enter insert mode
 (@code{vip-open-line}).
 @item O
-@kindex 117 @kbd{O} (@code{vip-Open-line})
+@kindex 117 O @r{(}@code{vip-Open-line}@r{)}
 Open a new line above the current line and enter insert mode
 (@code{vip-Open-line}).
 @item C-o
-@kindex 017 @kbd{C-o} (@code{vip-open-line-at-point})
+@kindex 017 C-o @r{(}@code{vip-open-line-at-point}@r{)}
 Insert a newline and leave point before it, and then enter insert mode
 @*(@code{vip-open-line-at-point}).
 @end table
@@ -1656,16 +1656,16 @@ differently from emacs mode.
 
 @table @kbd
 @item @key{ESC}
-@kindex 033 @kbd{ESC} (@code{vip-change-mode-to-vi}) (insert mode)
+@kindex 033 @key{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 @kbd{C-h} (@code{delete-backward-char}) (insert mode)
+@kindex 010 C-h @r{(}@code{delete-backward-char}@r{) (insert mode)}
 Delete previous character (@code{delete-backward-char}).
 @item C-w
-@kindex 027 @kbd{C-w} (@code{vip-delete-backward-word}) (insert mode)
+@kindex 027 C-w @r{(}@code{vip-delete-backward-word}@r{) (insert mode)}
 Delete previous word (@code{vip-delete-backward-word}).
 @item C-z
-@kindex 032 @kbd{C-z} (@code{vip-ESC}) (insert mode)
+@kindex 032 C-z @r{(}@code{vip-ESC}@r{) (insert mode)}
 This key simulates @key{ESC} key in emacs mode.  For instance, typing
 @kbd{C-z x} in insert mode is the same as typing @kbd{ESC x} in emacs mode
 (@code{vip-ESC}).
@@ -1685,7 +1685,7 @@ commands while in insert mode.
 @node Ex Commands
 @chapter Ex Commands
 
-@kindex 072 @kbd{:} (@code{vip-ex})
+@kindex 072 : @r{(}@code{vip-ex}@r{)}
 
 In vi mode, you can execute an Ex command @var{ex-command} by typing:
 @example
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 8948437632b..366d576da2e 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -368,9 +368,9 @@ toggles Viperization of Emacs on and off.
 @node States in Viper
 @section States in Viper
 
-@kindex @kbd{C-z}
+@kindex C-z
 @kindex @key{ESC}
-@kindex @kbd{i}
+@kindex i
 @cindex Emacs state
 @cindex Vi state
 @cindex Insert state
@@ -474,7 +474,7 @@ to allow Emacs keys in Insert state.
 @node Emacs State
 @subsection Emacs State
 
-@kindex @kbd{C-z}
+@kindex C-z
 @cindex Emacs state
 
 
@@ -514,7 +514,7 @@ exceptions are:
 
 @table @kbd
 @item C-x
-@kindex @kbd{C-x}
+@kindex C-x
 @kbd{C-x} is used to invoke Emacs commands, mainly those that do window
 management.  @kbd{C-x 2} will split a window, @kbd{C-x 0} will close a
 window.  @kbd{C-x 1} will close all other windows.  @kbd{C-xb} is used to
@@ -523,14 +523,14 @@ These are about the only necessary keystrokes.
 For the rest, see the GNU Emacs Manual.
 
 @item C-c
-@kindex @kbd{C-c}
+@kindex C-c
 For user levels 2 and higher, this key serves as a prefix key for the key
 sequences used by various major modes.  For users at Viper level 1, @kbd{C-c}
 simply beeps.
 
 @item C-g and C-]
-@kindex @kbd{C-g}
-@kindex @kbd{C-]}
+@kindex C-g
+@kindex C-]
 
 These are the Emacs @samp{quit} keys.
 There will be cases where you will have to
@@ -543,7 +543,7 @@ Edit,Recursive Edit,emacs,The GNU Emacs Manual}.
 At user level 1, @kbd{C-g} is bound to @code{viper-info-on-file}
 function instead.
 @item C-\
-@kindex @kbd{C-\}
+@kindex C-\
 @cindex Meta key
 
 Viper uses @key{ESC} as a switch between Insert and Vi states.  Emacs uses
@@ -569,7 +569,7 @@ about are:
 
 @table @samp
 @item Undo
-@kindex @kbd{u}
+@kindex u
 @kbd{u} will undo.  Undo can be repeated by the @kbd{.} key.  Undo itself
 can be undone.  Another @kbd{u} will change the direction.  The presence
 of repeatable undo means that @kbd{U}, undoing lines, is not very
@@ -599,7 +599,7 @@ to case-insensitive and back.
 @cindex vanilla search
 @cindex case-sensitive search
 @cindex case-insensitive search
-@kindex @kbd{C-c /}
+@kindex C-c /
 
 @item Ex commands
 @cindex Ex commands
@@ -1302,8 +1302,8 @@ These commands have no Vi analogs.
 
 @table @kbd
 @item C-x, C-c
-@kindex @kbd{C-x}
-@kindex @kbd{C-c}
+@kindex C-x
+@kindex C-c
 These two keys invoke many important Emacs functions.  For example, if you
 hit @kbd{C-x} followed by @kbd{2}, then the current window will be split
 into 2.  Except for novice users, @kbd{C-c} is also set to execute an Emacs
@@ -1313,11 +1313,11 @@ configure @key{ESC} as Meta by setting @code{viper-no-multiple-ESC} to
 @kbd{C-\} in Insert, Replace, or Vi states will make Emacs think
 @kbd{Meta} has been hit.
 @item \
-@kindex @kbd{\}
+@kindex \
 Escape to Emacs to execute a single Emacs command.  For instance,
 @kbd{\ @key{ESC}} will act like a Meta key.
 @item Q
-@kindex @kbd{Q}
+@kindex Q
 @cindex query replace
 @kbd{Q} is for query replace.  By default,
 each string to be replaced is treated as a regular expression.  You can use
@@ -1327,16 +1327,16 @@ that @kbd{:se nomagic} turns Regexps off completely, unlike Vi).
 @item v
 @itemx V
 @itemx C-v
-@kindex @kbd{v}
-@kindex @kbd{V}
-@kindex @kbd{C-v}
+@kindex v
+@kindex V
+@kindex C-v
 These keys are used to visit files.  @kbd{v} will switch to a buffer
 visiting file whose name can be entered in the minibuffer.  @kbd{V} is
 similar, but will use a window different from the current window.
 @kbd{C-v} is like @kbd{V}, except that a new frame (X window) will be used
 instead of a new Emacs window.
 @item #
-@kindex @kbd{#}
+@kindex #
 If followed by a certain character @var{ch}, it becomes an operator whose
 argument is the region determined by the motion command that follows
 (indicated as <move>).
@@ -1344,34 +1344,34 @@ Currently, @var{ch} can be one of @kbd{c}, @kbd{C}, @kbd{g}, @kbd{q}, and
 @kbd{s}.  For instance, @kbd{#qr} will prompt you for a string and then
 prepend this string to each line in the buffer.
 @item # c
-@kindex @kbd{#c<move>}
+@kindex #c<move>
 @cindex changing case
 Change upper-case characters in the region to lower-case
 (@code{downcase-region}).
 Emacs command @kbd{M-l} does the same for words.
 @item # C
-@kindex @kbd{#C<move>}
+@kindex #C<move>
 Change lower-case characters in the region to upper-case.  For instance,
 @kbd{# C 3 w} will capitalize 3 words from the current point
 (@code{upcase-region}).
 Emacs command @kbd{M-u} does the same for words.
 @item # g
-@kindex @kbd{#g<move>}
+@kindex #g<move>
 Execute last keyboard macro for each line in the region
 (@code{viper-global-execute}).
 @item # q
-@kindex @kbd{#q<move>}
+@kindex #q<move>
 Insert specified string at the beginning of each line in the region
 (@code{viper-quote-region}).  The default string is composed of the comment
 character(s) appropriate for the current major mode.
 @item # s
-@kindex @kbd{#s<move>}
+@kindex #s<move>
 Check spelling of words in the region (@code{spell-region}).
 The function used for spelling is determined from the variable
 @code{viper-spell-function}.
 @vindex viper-spell-function
 @item *
-@kindex @kbd{*}
+@kindex *
 Call last keyboard macro.
 @item m .
 Set mark at point and push old mark off the ring
@@ -1382,41 +1382,41 @@ Set mark at beginning and end of buffer, respectively.
 Jump to mark and pop mark off the ring.  @xref{Mark,,Mark,emacs,The GNU
 Emacs Manual}, for more info.
 @item ] register
-@kindex @kbd{]<a-z>}
+@kindex ]<a-z>
 View contents of register
 @item [ textmarker
-@kindex @kbd{[<a-z>}
+@kindex [<a-z>
 View filename and position of textmarker
 @item @@#
 @item @@register
 @item @@!
-@kindex @kbd{@@#}
-@kindex @kbd{@@<a-z>}
-@kindex @kbd{@@!}
+@kindex @@#
+@kindex @@<a-z>
+@kindex @@!
 @cindex keyboard macros
 @cindex register execution
 
 Begin/end keyboard macro.  @@register has a different meaning when used after
 a @kbd{@@#}.  @xref{Macros and Registers}, for details
 @item []
-@kindex @kbd{[]}
+@kindex []
 Go to end of heading.
 @item g <@emph{movement command}>
 Search buffer for text delimited by movement command.  The canonical
 example is @kbd{gw} to search for the word under the cursor.
 @xref{Improved Search}, for details.
 @item C-g and C-]
-@kindex @kbd{C-g}
-@kindex @kbd{C-]}
+@kindex C-g
+@kindex C-]
 Quit and Abort Recursive edit.  These may be necessary on occasion.
 @xref{Vi State}, for a reason.
 @item C-c C-g
-@kindex @kbd{C-c C-g}
+@kindex C-c C-g
 Hitting @kbd{C-c} followed by @kbd{C-g} will display the information on the
 current buffer.  This is the same as hitting @kbd{C-g} in Vi, but, as
 explained above, @kbd{C-g} is needed for other purposes in Emacs.
 @item C-c /
-@kindex @kbd{C-c /}
+@kindex C-c /
 Without a prefix argument, this command toggles
 case-sensitive/case-insensitive search modes and plain vanilla/regular
 expression search.  With the prefix argument 1, i.e.,
@@ -1429,21 +1429,21 @@ this function.
 @cindex case-insensitive search
 
 @item M-p and M-n
-@kindex @kbd{M-p}
-@kindex @kbd{M-n}
+@kindex M-p
+@kindex M-n
 In the minibuffer, these commands navigate through the minibuffer
 histories, such as the history of search strings, Ex commands, etc.
 
 @item C-s
-@kindex @kbd{C-s}
+@kindex C-s
 If the minibuffer is entered via a Viper search commands @kbd{/} or @kbd{?},
 then typing this key inserts the last search string used by the
 Emacs incremental search command (that is bound to @kbd{C-s} everywhere
 except in this case).
 
 @item C-c M-p and C-c M-n
-@kindex @kbd{C-c M-p}
-@kindex @kbd{C-c M-n}
+@kindex C-c M-p
+@kindex C-c M-n
 @cindex Insertion history
 @cindex Insertion ring
 @cindex Command history
@@ -2669,10 +2669,10 @@ purpose of mouse search and mouse insert.  By default, this is set to
 @code{double-click-time} in Emacs and to
 @code{mouse-track-multi-click-time} milliseconds in XEmacs.
 @end table
-@kindex @kbd{S-mouse-1}
-@kindex @kbd{S-mouse-2}
-@kindex @kbd{meta shift button1up}
-@kindex @kbd{meta shift button2up}
+@kindex S-mouse-1
+@kindex S-mouse-2
+@kindex @key{META} @key{SHIFT} button1up
+@kindex @key{META} @key{SHIFT} button2up
 @vindex viper-multiclick-timeout
 @findex viper-mouse-click-insert-word
 @findex viper-mouse-click-search-word
@@ -3383,60 +3383,60 @@ don't want this macro, put
 in your Viper customization file.
 
 @end table
-@kindex @kbd{%}
-@kindex @kbd{C-c /}
-@kindex @kbd{N}
-@kindex @kbd{n}
-@kindex @kbd{?<cr>}
-@kindex @kbd{/<cr>}
-@kindex @kbd{?<string>}
-@kindex @kbd{/<string>}
-@kindex @kbd{''}
-@kindex @kbd{``}
-@kindex @kbd{]<a-z>}
-@kindex @kbd{[<a-z>}
-@kindex @kbd{'<a-z>}
-@kindex @kbd{`<a-z>}
-@kindex @kbd{m<a-z>}
-@kindex @kbd{[]}
-@kindex @kbd{[[}
-@kindex @kbd{]]}
-@kindex @kbd{@{}
-@kindex @kbd{@}}
-@kindex @kbd{(}
-@kindex @kbd{)}
-@kindex @kbd{M}
-@kindex @kbd{L}
-@kindex @kbd{H}
-@kindex @kbd{G}
-@kindex @kbd{E}
-@kindex @kbd{e}
-@kindex @kbd{B}
-@kindex @kbd{b}
-@kindex @kbd{W}
-@kindex @kbd{w}
-@kindex @kbd{,}
-@kindex @kbd{;}
-@kindex @kbd{T<char>}
-@kindex @kbd{F<char>}
-@kindex @kbd{t<char>}
-@kindex @kbd{f<char>}
-@kindex @kbd{|}
-@kindex @kbd{0}
-@kindex @kbd{<cr>}
-@kindex @kbd{+}
-@kindex @kbd{-}
-@kindex @kbd{^}
-@kindex @kbd{$}
-@kindex @kbd{C-p}
-@kindex @kbd{<lf>}
-@kindex @kbd{<sp>}
-@kindex @kbd{C-n}
-@kindex @kbd{C-h}
-@kindex @kbd{h}
-@kindex @kbd{j}
-@kindex @kbd{k}
-@kindex @kbd{l}
+@kindex %
+@kindex C-c /
+@kindex N
+@kindex n
+@kindex ?<cr>
+@kindex /<cr>
+@kindex ?<string>
+@kindex /<string>
+@kindex ''
+@kindex ``
+@kindex ]<a-z>
+@kindex [<a-z>
+@kindex '<a-z>
+@kindex `<a-z>
+@kindex m<a-z>
+@kindex []
+@kindex [[
+@kindex ]]
+@kindex @{
+@kindex @}
+@kindex (
+@kindex )
+@kindex M
+@kindex L
+@kindex H
+@kindex G
+@kindex E
+@kindex e
+@kindex B
+@kindex b
+@kindex W
+@kindex w
+@kindex ,
+@kindex ;
+@kindex T<char>
+@kindex F<char>
+@kindex t<char>
+@kindex f<char>
+@kindex |
+@kindex 0
+@kindex @key{CR}
+@kindex +
+@kindex -
+@kindex ^
+@kindex $
+@kindex C-p
+@kindex @key{LF}
+@kindex @key{SPC}
+@kindex C-n
+@kindex C-h
+@kindex h
+@kindex j
+@kindex k
+@kindex l
 @vindex viper-parse-sexp-ignore-comments
 
 @node Marking
@@ -3478,18 +3478,18 @@ Go to specified Viper mark.
 @item `<a-z>
 Go to specified Viper mark and go to the first CHAR on line.
 @end table
-@kindex @kbd{m<a-z>}
-@kindex @kbd{m.}
-@kindex @kbd{m>}
-@kindex @kbd{m<}
-@kindex @kbd{m,}
-@kindex @kbd{m^}
+@kindex m<a-z>
+@kindex m.
+@kindex m>
+@kindex m<
+@kindex m,
+@kindex m^
 @findex @kbd{Ex mark}
 @findex @kbd{Ex k}
-@kindex @kbd{''}
-@kindex @kbd{``}
-@kindex @kbd{`<a-z>}
-@kindex @kbd{'<a-z>}
+@kindex ''
+@kindex ``
+@kindex `<a-z>
+@kindex '<a-z>
 
 @node  Appending Text
 @subsection Appending Text
@@ -3556,22 +3556,22 @@ Since typing the above sequences of keys may be tedious, the
 functions doing the perusing can be bound to unused keyboard keys in the
 Viper customization file.  @xref{Viper Specials}, for details.
 @end table
-@kindex @kbd{C-c M-p}
-@kindex @kbd{C-c M-n}
-@kindex @kbd{.}
-@kindex @kbd{]<a-z>}
-@kindex @kbd{[<a-z>}
-@kindex @kbd{P}
-@kindex @kbd{p}
-@kindex @kbd{"<a-z1-9>p}
-@kindex @kbd{"<a-z1-9>P}
-@kindex @kbd{>>}
-@kindex @kbd{><move>}
-@kindex @kbd{O}
-@kindex @kbd{o}
-@kindex @kbd{i}
-@kindex @kbd{A}
-@kindex @kbd{a}
+@kindex C-c M-p
+@kindex C-c M-n
+@kindex .
+@kindex ]<a-z>
+@kindex [<a-z>
+@kindex P
+@kindex p
+@kindex "<a-z1-9>p
+@kindex "<a-z1-9>P
+@kindex >>
+@kindex ><move>
+@kindex O
+@kindex o
+@kindex i
+@kindex A
+@kindex a
 
 @node Editing in Insert State
 @subsection Editing in Insert State
@@ -3595,9 +3595,9 @@ Back to the begin of the change on the
 current line.
 
 @end table
-@kindex @kbd{C-u}
-@kindex @kbd{C-w}
-@kindex @kbd{C-v}
+@kindex C-u
+@kindex C-w
+@kindex C-v
 
 @node Deleting Text
 @subsection Deleting Text
@@ -3634,13 +3634,13 @@ shiftwidth to the left (layout!).
 @item <count>  <<
 Shift <count> lines one shiftwidth to the left.
 @end table
-@kindex @kbd{<<}
-@kindex @kbd{<<move>}
-@kindex @kbd{D}
-@kindex @kbd{dd}
-@kindex @kbd{d<move>}
-@kindex @kbd{X}
-@kindex @kbd{x}
+@kindex <<
+@kindex <<move>
+@kindex D
+@kindex dd
+@kindex d<move>
+@kindex X
+@kindex x
 
 @node Changing Text
 @subsection Changing Text
@@ -3727,28 +3727,28 @@ In Vi state, these keys are bound to functions that peruse the history of
 destructive Vi commands.
 @xref{Viper Specials}, for details.
 @end table
-@kindex @kbd{C-c M-p}
-@kindex @kbd{C-c M-n}
-@kindex @kbd{#q<move> }
-@kindex @kbd{#C<move>}
-@kindex @kbd{#c<move>}
-@kindex @kbd{&}
-@kindex @kbd{\&}
+@kindex C-c M-p
+@kindex C-c M-n
+@kindex #q<move>
+@kindex #C<move>
+@kindex #c<move>
+@kindex &
+@kindex \&
 @findex @kbd{Ex substitute/<pat>/<repl>/<f>}
 @findex @kbd{Ex s/<pat>/<repl>/<f>}
 @findex @kbd{Ex copy [z]}
 @findex @kbd{Ex t [z]}
 @findex @kbd{Ex move [z]}
-@kindex @kbd{J}
-@kindex @kbd{~}
-@kindex @kbd{=<move>}
-@kindex @kbd{C}
-@kindex @kbd{cc}
-@kindex @kbd{c<move>}
-@kindex @kbd{S}
-@kindex @kbd{s}
-@kindex @kbd{R}
-@kindex @kbd{r<char>}
+@kindex J
+@kindex ~
+@kindex =<move>
+@kindex C
+@kindex cc
+@kindex c<move>
+@kindex S
+@kindex s
+@kindex R
+@kindex r<char>
 
 @node Search and Replace
 @subsection Search and Replace
@@ -3817,21 +3817,21 @@ Execute <ex-command> on all lines that match <pattern>.
 @itemx :v /<pattern>/<ex-command>
 Execute <ex-command> on all lines that do not match <pattern>.
 @end table
-@kindex @kbd{&}
+@kindex &
 @findex @kbd{Ex substitute/<pat>/<repl>/<f>}
-@kindex @kbd{Q}
-@kindex @kbd{#g<move>}
+@kindex Q
+@kindex #g<move>
 @findex @kbd{Ex v}
 @findex @kbd{Ex g}
 @findex @kbd{Ex global}
 @findex @kbd{Ex vglobal}
 @findex @kbd{Ex tag <name>}
-@kindex @kbd{%}
-@kindex @kbd{N}
-@kindex @kbd{n}
-@kindex @kbd{g<move>}
-@kindex @kbd{?<string>}
-@kindex @kbd{/<string>}
+@kindex %
+@kindex N
+@kindex n
+@kindex g<move>
+@kindex ?<string>
+@kindex /<string>
 
 @node Yanking
 @subsection Yanking
@@ -3865,19 +3865,19 @@ be automatically down-cased.
 Put the contents of the (default undo) buffer
 <count> times before the cursor.  The register will
 @end table
-@kindex @kbd{P}
-@kindex @kbd{p}
-@kindex @kbd{"<a-z1-9>p}
-@kindex @kbd{"<a-z1-9>P}
-@kindex @kbd{]<a-z>}
-@kindex @kbd{[<a-z>}
-@kindex @kbd{m<a-z>}
-@kindex @kbd{Y}
-@kindex @kbd{yy}
-@kindex @kbd{"<A-Z>y<move>}
-@kindex @kbd{"<a-z>y<move>}
-@kindex @kbd{y<move>}
-@kindex @kbd{yank}
+@kindex P
+@kindex p
+@kindex "<a-z1-9>p
+@kindex "<a-z1-9>P
+@kindex ]<a-z>
+@kindex [<a-z>
+@kindex m<a-z>
+@kindex Y
+@kindex yy
+@kindex "<A-Z>y<move>
+@kindex "<a-z>y<move>
+@kindex y<move>
+@kindex yank
 @findex @kbd{Ex yank}
 
 @node Undoing
@@ -3902,9 +3902,9 @@ that have a @samp{~} appended to them.
 @findex @kbd{Ex rec}
 @findex @kbd{Ex e!}
 @findex @kbd{Ex q!}
-@kindex @kbd{.}
-@kindex @kbd{U}
-@kindex @kbd{u}
+@kindex .
+@kindex U
+@kindex u
 
 @node Display
 @section Display
@@ -3948,21 +3948,21 @@ Put line <count> at the bottom of the window
 Put line <count> in the center of the window
 (default the current line).
 @end table
-@kindex @kbd{zM}
-@kindex @kbd{zL}
-@kindex @kbd{zH}
-@kindex @kbd{z<cr>}
-@kindex @kbd{z.}
-@kindex @kbd{z-}
-@kindex @kbd{z<cr>}
-@kindex @kbd{C-b}
-@kindex @kbd{C-f}
-@kindex @kbd{C-u}
-@kindex @kbd{C-d}
-@kindex @kbd{C-y}
-@kindex @kbd{C-e}
-@kindex @kbd{C-l}
-@kindex @kbd{C-g}
+@kindex zM
+@kindex zL
+@kindex zH
+@kindex z<cr>
+@kindex z.
+@kindex z-
+@kindex z<cr>
+@kindex C-b
+@kindex C-f
+@kindex C-u
+@kindex C-d
+@kindex C-y
+@kindex C-e
+@kindex C-l
+@kindex C-g
 
 
 @node File and Buffer Handling
@@ -4078,11 +4078,11 @@ Read the file <name> into the buffer after the line <address>.
 Edit a file in current or another window, or in another frame.  File name
 is typed in minibuffer.  File completion and history are supported.
 @end table
-@kindex @kbd{v}
-@kindex @kbd{V}
+@kindex v
+@kindex V
 @findex @kbd{Ex args}
 @findex @kbd{Ex rew}
-@kindex @kbd{C-^}
+@kindex C-^
 @findex @kbd{Ex e!@: [<files>]}
 @findex @kbd{Ex e [<files>]}
 @findex @kbd{Ex edit [<files>]}
@@ -4096,7 +4096,7 @@ is typed in minibuffer.  File completion and history are supported.
 @findex @kbd{Ex r}
 @findex @kbd{Ex read}
 @findex @kbd{Ex pre}
-@kindex @kbd{ZZ}
+@kindex ZZ
 @findex @kbd{Ex wq}
 @findex @kbd{Ex w <file>}
 @findex @kbd{Ex w!@: <file>}
@@ -4171,14 +4171,14 @@ Show contents of textmarker.
 @item ]<a-z>
 Show contents of register.
 @end table
-@kindex @kbd{]<a-z>}
-@kindex @kbd{[<a-z>}
-@kindex @kbd{#g<move>}
-@kindex @kbd{*}
-@kindex @kbd{@@!<a-z>}
-@kindex @kbd{@@#}
-@kindex @kbd{@@@@}
-@kindex @kbd{@@<a-z>}
+@kindex ]<a-z>
+@kindex [<a-z>
+@kindex #g<move>
+@kindex *
+@kindex @@!<a-z>
+@kindex @@#
+@kindex @@@@
+@kindex @@<a-z>
 @findex @kbd{Ex unmap <char>}
 @findex @kbd{Ex map <char> <seq>}
 @findex @kbd{Ex unmap!@: <char>}
@@ -4410,16 +4410,16 @@ Undoes the last @kbd{C-y} and puts another kill from the kill ring.
 Using this command, you can try may different kills until you find the one
 you need.
 @end table
-@kindex @kbd{M-y}
-@kindex @kbd{C-y}
-@kindex @kbd{C-xC-f}
-@kindex @kbd{C-xo}
-@kindex @kbd{C-x2}
-@kindex @kbd{C-x1}
-@kindex @kbd{C-x0}
-@kindex @kbd{C-z}
-@kindex @kbd{C-\}
-@kindex @kbd{C-c\}
+@kindex M-y
+@kindex C-y
+@kindex C-x C-f
+@kindex C-x o
+@kindex C-x 2
+@kindex C-x 1
+@kindex C-x 0
+@kindex C-z
+@kindex C-\
+@kindex C-c\
 
 @node Mouse-bound Commands
 @section Mouse-bound Commands
@@ -4445,10 +4445,10 @@ Note: Viper sets this binding only if this mouse action is not
 already bound to something else.
 @xref{Viper Specials}, for more details.
 @end table
-@kindex @kbd{S-mouse-1}
-@kindex @kbd{S-mouse-2}
-@kindex @kbd{meta button1up}
-@kindex @kbd{meta button2up}
+@kindex S-mouse-1
+@kindex S-mouse-2
+@kindex @key{META} button1up
+@kindex @key{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 f8ddbd2aff6..07dd55e6043 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 SPC
+@kindex @key{SPC}
 @findex scroll-up
 Scroll the man page up the window (@code{scroll-up}).
 
 @item @key{DEL}
 @itemx @kbd{S-@key{SPC}}
-@kindex DEL
-@kindex S-SPC
+@kindex @key{DEL}
+@kindex S-@key{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 RET
+@kindex @key{RET}
 @findex man-follow
 Get the man page for the topic under (or nearest to) point
 (@code{man-follow}).