Merge from origin/emacs-26

fd50238 (origin/emacs-26) * doc/lispref/streams.texi (Output Variable...
769ea57 Use "GTK+" where applicable in the manual
5e69219 Document print-escape-control-characters
c00fea9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
a2ab0d0 * doc/emacs/killing.texi (Rectangles): Don't use @key for cha...
6288c3d * lisp/emulation/viper.el: Unbreak it.
bf3535e More fixes in the Emacs manual
c87d04e Avoid aborts in 'md5'
9743f48 Mark keys consistently in manuals
ce557a9 Remove @key{} markups from @kindex entries in manuals
71243f0 * doc/emacs/display.texi (Standard Faces): Fix markup of inde...
7a069f3 Fix @kindex entries in manuals
6218933 Fix @cindex entries in manuals
57c9f12 Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
e415309 Fix @cindex entries in org.texi
560a23e Document reserved keys
105d085 * doc/misc/ebrowse.texi: Use @key{} for keys.

Conflicts:
	doc/misc/tramp.texi
	etc/NEWS

65 files changed, 2195 insertions, 2209 deletions

diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index aa91f0555e1..b9e0ce44046 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -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 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 END
 @findex move-end-of-line
 Move to the end of the line (@code{move-end-of-line}).
 
@@ -277,7 +277,7 @@ On graphical displays, @kbd{C-@key{HOME}} does the same.
 
 @item M->
 @kindex M->
-@kindex C-@key{END}
+@kindex C-END
 @findex end-of-buffer
 Move to the end of the buffer (@code{end-of-buffer}).  On graphical
 displays, @kbd{C-@key{END}} does the same.
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 8e2fdf11370..0697e1b590d 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -1499,7 +1499,7 @@ Evaluate all the Emacs Lisp expressions in the buffer.
 @ifinfo
 @c This uses 'colon' instead of a literal ':' because Info cannot
 @c cope with a ':' in a menu.
-@kindex M-@key{colon}
+@kindex M-colon
 @end ifinfo
 @ifnotinfo
 @kindex M-:
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 59cd57b1e6c..7d90c20a2a9 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2162,7 +2162,7 @@ loading of this library, use the option @samp{--no-site-file}.
 better to put them in @file{default.el}, so that users can more easily
 override them.
 
-@cindex site-lisp directories
+@cindex @file{site-lisp} directories
   You can place @file{default.el} and @file{site-start.el} in any of
 the directories which Emacs searches for Lisp libraries.  The variable
 @code{load-path} (@pxref{Lisp Libraries}) specifies these directories.
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 0a6228564f5..01ae91002a3 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1370,8 +1370,8 @@ C-c}.
 
 @node Image-Dired
 @section Viewing Image Thumbnails in Dired
-@cindex image-dired mode
-@cindex image-dired
+@cindex @code{image-dired} mode
+@cindex @code{image-dired}
 
   Image-Dired is a facility for browsing image files.  It provides viewing
 the images either as thumbnails or in full size, either inside Emacs
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 64a1d4b5fa0..312f70e13ba 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -526,7 +526,7 @@ frames as if they have a dark background, whereas a value of
 background.
 
 @cindex background color
-@cindex default face
+@cindex @code{default face}
   You can customize a face to alter its attributes, and save those
 customizations for future Emacs sessions.  @xref{Face Customization},
 for details.
@@ -535,7 +535,7 @@ for details.
 of its attributes are specified.  Its background color is also used as
 the frame's background color.  @xref{Colors}.
 
-@cindex cursor face
+@cindex @code{cursor} face
   Another special face is the @code{cursor} face.  On graphical
 displays, the background color of this face is used to draw the text
 cursor.  None of the other attributes of this face have any effect;
@@ -627,10 +627,10 @@ but you should not make it a variable-width font.
 @item fixed-pitch-serif
 This face is like @code{fixed-pitch}, except the font has serifs and
 looks more like traditional typewriting.
-@cindex variable-pitch face
+@cindex @code{variable-pitch} face
 @item variable-pitch
 This face forces use of a variable-width font.
-@cindex shadow face
+@cindex @code{shadow} face
 @item shadow
 This face is used for making the text less noticeable than the surrounding
 ordinary text.  Usually this can be achieved by using shades of gray in
@@ -656,8 +656,8 @@ This face is used to highlight lazy matches for Isearch and Query
 Replace (matches other than the current one).
 @item region
 This face is used for displaying an active region (@pxref{Mark}).
-When Emacs is built with GTK support, its colors are taken from the
-current GTK theme.
+When Emacs is built with GTK+ support, its colors are taken from the
+current GTK+ theme.
 @item secondary-selection
 This face is used for displaying a secondary X selection (@pxref{Secondary
 Selection}).
@@ -685,40 +685,40 @@ frame:
 
 @table @code
 @item mode-line
-@cindex mode-line face
+@cindex @code{mode-line} face
 @cindex faces for mode lines
 This face is used for the mode line of the currently selected window,
 and for menu bars when toolkit menus are not used.  By default, it's
 drawn with shadows for a raised effect on graphical displays, and
 drawn as the inverse of the default face on non-windowed terminals.
 @item mode-line-inactive
-@cindex mode-line-inactive face
+@cindex @code{mode-line-inactive} face
 Like @code{mode-line}, but used for mode lines of the windows other
 than the selected one (if @code{mode-line-in-non-selected-windows} is
 non-@code{nil}).  This face inherits from @code{mode-line}, so changes
 in that face affect mode lines in all windows.
 @item mode-line-highlight
-@cindex mode-line-highlight face
+@cindex @code{mode-line-highlight} face
 Like @code{highlight}, but used for mouse-sensitive portions of text
 on mode lines.  Such portions of text typically pop up tooltips
 (@pxref{Tooltips}) when the mouse pointer hovers above them.
 @item mode-line-buffer-id
-@cindex mode-line-buffer-id face
+@cindex @code{mode-line-buffer-id} face
 This face is used for buffer identification parts in the mode line.
 @item header-line
-@cindex header-line face
+@cindex @code{header-line} face
 Similar to @code{mode-line} for a window's header line, which appears
 at the top of a window just as the mode line appears at the bottom.
 Most windows do not have a header line---only some special modes, such
 Info mode, create one.
 @item header-line-highlight
-@cindex header-line-highlight face
+@cindex @code{header-line-highlight} face
 Similar to @code{highlight} and @code{mode-line-highlight}, but used
 for mouse-sensitive portions of text on header lines.  This is a
 separate face because the @code{header-line} face might be customized
 in a way that does not interact well with @code{highlight}.
 @item vertical-border
-@cindex vertical-border face
+@cindex @code{vertical-border} face
 This face is used for the vertical divider between windows on text
 terminals.
 @item minibuffer-prompt
@@ -741,7 +741,7 @@ The @code{:background} attribute of this face specifies the color of
 the text cursor.  @xref{Cursor Display}.
 @item tooltip
 This face is used for tooltip text.  By default, if Emacs is built
-with GTK support, tooltips are drawn via GTK and this face has no
+with GTK+ support, tooltips are drawn via GTK+ and this face has no
 effect.  @xref{Tooltips}.
 @item mouse
 This face determines the color of the mouse pointer.
@@ -1177,7 +1177,7 @@ empty lines at the end of a buffer, without realizing it.  In most
 cases, this @dfn{trailing whitespace} has no effect, but sometimes it
 can be a nuisance.
 
-@cindex trailing-whitespace face
+@cindex @code{trailing-whitespace} face
   You can make trailing whitespace at the end of a line visible by
 setting the buffer-local variable @code{show-trailing-whitespace} to
 @code{t}.  Then Emacs displays trailing whitespace, using the face
@@ -1508,8 +1508,8 @@ as octal escape sequences instead of caret escape sequences.
 @cindex non-breaking space
 @cindex non-breaking hyphen
 @cindex soft hyphen
-@cindex escape-glyph face
-@cindex nobreak-space face
+@cindex @code{escape-glyph} face
+@cindex @code{nobreak-space} face
   Some non-@acronym{ASCII} characters have the same appearance as an
 @acronym{ASCII} space or hyphen (minus) character.  Such characters
 can cause problems if they are entered into a buffer without your
@@ -1531,7 +1531,7 @@ elisp, The Emacs Lisp Reference Manual}.
 
 @cindex glyphless characters
 @cindex characters with no font glyphs
-@cindex glyphless-char face
+@cindex @code{glyphless-char} face
   On graphical displays, some characters may have no glyphs in any of
 the fonts available to Emacs.  These @dfn{glyphless characters} are
 normally displayed as boxes containing the hexadecimal character code.
@@ -1546,7 +1546,7 @@ for details.
 
 @cindex curly quotes, and terminal capabilities
 @cindex curved quotes, and terminal capabilities
-@cindex homoglyph face
+@cindex @code{homoglyph} face
 
 Emacs tries to determine if the curved quotes @samp{‘} and @samp{’}
 can be displayed on the current display.  By default, if this seems to
@@ -1801,7 +1801,7 @@ may wish to customize the variables
 @code{display-line-numbers-width} to a large enough value, to avoid
 occasional miscalculations of space reserved for the line numbers.
 
-@cindex line-number face
+@cindex @code{line-number} face
 The line numbers are displayed in a special face @code{line-number}.
 The current line number is displayed in a different face,
 @code{line-number-current-line}, so you can make the current line's
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 65affeb59fe..f917fa8e1e9 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1223,8 +1223,8 @@ GTK resources
 
 * GTK Resource Basics::   Basic usage of GTK+ resources.
 * GTK Widget Names::      How GTK+ widgets are named.
-* GTK Names in Emacs::    GTK widgets used by Emacs.
-* GTK styles::            What can be customized in a GTK widget.
+* GTK Names in Emacs::    GTK+ widgets used by Emacs.
+* GTK styles::            What can be customized in a GTK+ widget.
 
 Emacs and macOS / GNUstep
 
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index bd772e9abc1..fd35096f965 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -281,7 +281,7 @@ files.  Firstly, when Emacs is built with a suitable GUI toolkit,
 commands invoked with the mouse (by clicking on the menu bar or tool
 bar) use the toolkit's standard file selection dialog instead of
 prompting for the file name in the minibuffer.  On GNU/Linux and Unix
-platforms, Emacs does this when built with GTK, LessTif, and Motif
+platforms, Emacs does this when built with GTK+, LessTif, and Motif
 toolkits; on MS-Windows and Mac, the GUI version does that by default.
 For information on how to customize this, see @ref{Dialog Boxes}.
 
@@ -1857,7 +1857,7 @@ variable @code{tramp-mode} to @code{nil}.  You can turn off the
 feature in individual cases by quoting the file name with @samp{/:}
 (@pxref{Quoted File Names}).
 
-@cindex ange-ftp
+@cindex @code{ange-ftp}
   Remote file access through FTP is handled by the Ange-FTP package, which
 is documented in the following.  Remote file access through the other
 methods is handled by the Tramp package, which has its own manual.
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index b2ec5746a0e..17f6f35a8a3 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-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 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
@@ -901,7 +901,7 @@ that server's selected frame.
 
 @node Frame Parameters
 @section Frame Parameters
-@cindex default-frame-alist
+@vindex default-frame-alist
 
   You can control the default appearance and behavior of all frames by
 specifying a default list of @dfn{frame parameters} in the variable
@@ -925,7 +925,7 @@ default font to @samp{Monospace-10}:
   For a list of frame parameters and their effects, see @ref{Frame
 Parameters,,, elisp, The Emacs Lisp Reference Manual}.
 
-@cindex initial-frame-alist
+@vindex initial-frame-alist
   You can also specify a list of frame parameters which apply to just
 the initial frame, by customizing the variable
 @code{initial-frame-alist}.
@@ -999,11 +999,11 @@ end of the buffer is shown; if @code{nil}, the thumb will be at the
 bottom when the end of the buffer is shown.  You cannot over-scroll
 when the entire buffer is visible.
 
-@cindex scroll-bar face
+@cindex @code{scroll-bar} face
   The visual appearance of the scroll bars is controlled by the
-@code{scroll-bar} face.  (Some toolkits, such as GTK and MS-Windows,
+@code{scroll-bar} face.  (Some toolkits, such as GTK+ and MS-Windows,
 ignore this face; the scroll-bar appearance there can only be
-customized system-wide, for GTK @pxref{GTK resources}).
+customized system-wide, for GTK+ @pxref{GTK resources}).
 
 @cindex vertical border
   On graphical frames, vertical scroll bars implicitly serve to separate
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index e005fe358da..a5700760d44 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -4,7 +4,6 @@
 @c See file emacs.texi for copying conditions.
 @node Help
 @chapter Help
-@kindex Help
 @cindex help
 @cindex self-documentation
 @findex help-command
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 19aa9077d70..4c47c8b0479 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -590,7 +590,7 @@ you can access it using the following Emacs commands:
 @table @kbd
 @findex mouse-set-secondary
 @kindex M-Drag-mouse-1
-@cindex secondary-selection face
+@cindex @code{secondary-selection} face
 @item M-Drag-mouse-1
 Set the secondary selection, with one end at the place where you press
 down the button, and the other end at the place where you release it
@@ -857,7 +857,8 @@ region is active.
 
 Unlike the standard region, the region-rectangle can have its corners
 extended past the end of buffer, or inside stretches of white space
-that point normally cannot enter, like the TAB.
+that point normally cannot enter, like in the middle of a TAB
+character.
 
 @findex rectangle-exchange-point-and-mark
 @findex exchange-point-and-mark@r{, in rectangle-mark-mode}
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 23e08a58e88..8f71b12b81f 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -628,7 +628,7 @@ they use the concept of checking out individual files.
 @node Log Buffer
 @subsection Features of the Log Entry Buffer
 
-@cindex C-c C-c @r{(Log Edit mode)}
+@kindex C-c C-c @r{(Log Edit mode)}
 @findex log-edit-done
   When you tell VC to commit a change, it pops up a buffer named
 @file{*vc-log*}.  In this buffer, you should write a @dfn{log entry}
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index d8f202f6845..e1b8070f432 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -409,7 +409,7 @@ is needed.  For OpenDocument and Microsoft Office documents, the
 @code{unoconv} tool is needed.}, and displaying those images.
 
 @findex doc-view-toggle-display
-@cindex doc-view-minor-mode
+@findex doc-view-minor-mode
   When you visit a document file that can be displayed with DocView
 mode, Emacs automatically uses DocView mode @footnote{The needed
 external tools for the document type must be available, and Emacs must
diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi
index 39d003c453c..406ebd19051 100644
--- a/doc/emacs/msdos-xtra.texi
+++ b/doc/emacs/msdos-xtra.texi
@@ -412,7 +412,7 @@ will print the region while converting it to the codepage 850 encoding.
 
 @node MS-DOS and MULE
 @subsection International Support on MS-DOS
-@cindex international support @r{(MS-DOS)}
+@cindex international support (MS-DOS)
 
   Emacs on MS-DOS supports the same international character sets as it
 does on GNU, Unix and other platforms
@@ -471,7 +471,7 @@ codepage built into the display hardware.)  You can specify a different
 codepage for Emacs to use by setting the variable @code{dos-codepage} in
 your init file.
 
-@cindex language environment, automatic selection on @r{MS-DOS}
+@cindex language environment, automatic selection on MS-DOS
   Multibyte Emacs supports only certain DOS codepages: those which can
 display Far-Eastern scripts, like the Japanese codepage 932, and those
 that encode a single ISO 8859 character set.
@@ -494,7 +494,7 @@ codes.  For example, the letter @samp{@,{c}} (@samp{c} with cedilla) has
 code 231 in the standard Latin-1 character set, but the corresponding
 DOS codepage 850 uses code 135 for this glyph.}
 
-@cindex mode line @r{(MS-DOS)}
+@cindex mode line (MS-DOS)
   All the @code{cp@var{nnn}} coding systems use the letter @samp{D}
 (for ``DOS'') as their mode-line mnemonic.  Since both the terminal
 coding system and the default coding system for file I/O are set to
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index 2790d56e01c..b3b40d476e6 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -129,7 +129,7 @@ invoked---that will always give you an editor.  When invoked via
 the program that invoked @command{emacsclient}.
 @end enumerate
 
-@cindex emacsclient, on MS-Windows
+@cindex @command{emacsclient}, on MS-Windows
 Note that, due to limitations of MS-Windows, Emacs cannot have both
 GUI and text-mode frames in the same session.  It also cannot open
 text-mode frames on more than a single @dfn{Command Prompt} window,
@@ -694,7 +694,7 @@ its normal effect: for example, @kbd{@key{Lwindow}} opens the
 
 @vindex w32-recognize-altgr
 @kindex AltGr @r{(MS-Windows)}
-@cindex AltGr key (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/programs.texi b/doc/emacs/programs.texi
index 042a197f9b7..74fae2a8bb5 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1009,7 +1009,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
@@ -1626,7 +1626,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
@@ -1637,7 +1637,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
@@ -1702,17 +1702,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-DEL @r{(C Mode)}
+@kindex C-c DEL @r{(C Mode)}
 Delete the entire block of whitespace preceding point (@code{c-hungry-delete-backwards}).
 
 @item C-c C-d
 @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-Delete @r{(C Mode)}
+@kindex C-c Delete @r{(C Mode)}
 Delete the entire block of whitespace after point (@code{c-hungry-delete-forward}).
 @end table
 
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 9d7ff59beef..887fd982d01 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -92,7 +92,7 @@ the first @samp{F} previously found.  After another @kbd{O}, the
 cursor moves to just after the first @samp{FOO}.
 
 @cindex faces for highlighting search matches
-@cindex isearch face
+@cindex @code{isearch} face
   At each step, Emacs highlights the @dfn{current match}---the buffer
 text that matches the search string---using the @code{isearch} face
 (@pxref{Faces}).  @xref{Search Customizations}, for various options
@@ -280,7 +280,7 @@ down-casing.
 @node Error in Isearch
 @subsection Errors in Incremental Search
 
-@cindex isearch-fail face
+@cindex @code{isearch-fail} face
   If your string is not found at all, the echo area says @samp{Failing
 I-Search}, and the cursor moves past the place where Emacs found as
 much of your string as it could.  Thus, if you search for @samp{FOOT},
@@ -1552,8 +1552,8 @@ replacements are not added to the command history, and cannot be
 reused.
 
 @cindex faces for highlighting query replace
-@cindex query-replace face
-@cindex lazy-highlight face, in replace
+@cindex @code{query-replace} face
+@cindex @code{lazy-highlight} face, in replace
 @vindex query-replace-highlight
 @vindex query-replace-lazy-highlight
 @vindex query-replace-show-replacement
@@ -1869,7 +1869,7 @@ setting the variable @code{search-highlight} to @code{nil}.
 
 @cindex lazy highlighting customizations
 @vindex isearch-lazy-highlight
-@cindex lazy-highlight face
+@cindex @code{lazy-highlight} face
   The other matches for the search string that are visible on display
 are highlighted using the @code{lazy-highlight} face.  Setting the
 variable @code{isearch-lazy-highlight} to @code{nil} disables this
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index d32bb3c7689..9ecc41e8880 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1380,19 +1380,19 @@ 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-UP @r{(Org Mode)}
+@kindex M-DOWN @r{(Org Mode)}
+@kindex M-LEFT @r{(Org Mode)}
+@kindex M-RIGHT @r{(Org Mode)}
 @findex org-metaup
 @findex org-metadown
 @findex org-metaleft
 @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.
 
@@ -2175,7 +2175,7 @@ text properties.
 @cindex soft newline
 @cindex newlines, hard and soft
 
-@cindex use-hard-newlines
+@findex use-hard-newlines
   In Enriched mode, Emacs distinguishes between two different kinds of
 newlines, @dfn{hard} newlines and @dfn{soft} newlines.  You can also
 enable or disable this feature in other buffers, by typing @kbd{M-x
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 9712cc73de0..c0dc3d472e3 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1411,8 +1411,8 @@ patches) over all your contributions.
 @node Service
 @section How To Get Help with GNU Emacs
 @cindex help in using Emacs
-@cindex help-gnu-emacs mailing list
-@cindex gnu.emacs.help newsgroup
+@cindex @samp{help-gnu-emacs} mailing list
+@cindex @samp{gnu.emacs.help} newsgroup
 
 If you need help installing, using or changing GNU Emacs, there are
 two ways to find it:
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 096e747a044..88bfb8261ce 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -12,10 +12,10 @@ resources, as is usual for programs that use X.
 graphical widgets, such as the menu-bar, scroll-bar, and dialog boxes,
 is determined by
 @ifnottex
-GTK resources, which we will also describe.
+GTK+ resources, which we will also describe.
 @end ifnottex
 @iftex
-GTK resources.
+GTK+ resources.
 @end iftex
 When Emacs is built without GTK+ support, the appearance of these
 widgets is determined by additional X resources.
@@ -28,7 +28,7 @@ system registry (@pxref{MS-Windows Registry}).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
 * Motif Resources::     X resources for Motif and LessTif menus.
-* GTK resources::       Resources for GTK widgets.
+* GTK resources::       Resources for GTK+ widgets.
 @end menu
 
 @node Resources
@@ -160,16 +160,16 @@ Width of the frame's external border, in pixels.  This has no effect
 if Emacs is compiled with GTK+ support.
 @end ifnottex
 
-@item @code{cursorColor} (class @code{Foreground})
-Text cursor color.  If this resource is specified when Emacs starts
-up, Emacs sets its value as the background color of the @code{cursor}
-face (@pxref{Faces}).
-
 @item @code{cursorBlink} (class @code{CursorBlink})
 If the value of this resource is @samp{off} or @samp{false} or
 @samp{0} at startup, Emacs disables Blink Cursor mode (@pxref{Cursor
 Display}).
 
+@item @code{cursorColor} (class @code{Foreground})
+Text cursor color.  If this resource is specified when Emacs starts
+up, Emacs sets its value as the background color of the @code{cursor}
+face (@pxref{Faces}).
+
 @item @code{font} (class @code{Font})
 Font name for the @code{default} face (@pxref{Fonts}).  You can also
 specify a fontset name (@pxref{Fontsets}).
@@ -184,6 +184,13 @@ in which case Emacs tries using all available font backends.
 @item @code{foreground} (class @code{Foreground})
 Default foreground color for text.
 
+@item @code{fullscreen} (class @code{Fullscreen})
+The desired fullscreen size.  The value can be one of @code{fullboth},
+@code{maximized}, @code{fullwidth} or @code{fullheight}, which
+correspond to the command-line options @samp{-fs}, @samp{-mm},
+@samp{-fw}, and @samp{-fh} (@pxref{Window Size X}).  Note that this
+applies to the initial frame only.
+
 @item @code{geometry} (class @code{Geometry})
 Window size and position.  The value should be a size and position
 specification, of the same form as in the @samp{-g} or
@@ -193,18 +200,15 @@ The size applies to all frames in the Emacs session, but the position
 applies only to the initial Emacs frame (or, in the case of a resource
 for a specific frame name, only that frame).
 
-
 Be careful not to specify this resource as @samp{emacs*geometry}, as
 that may affect individual menus as well as the main Emacs frame.
 
-@item @code{fullscreen} (class @code{Fullscreen})
-The desired fullscreen size.  The value can be one of @code{fullboth},
-@code{maximized}, @code{fullwidth} or @code{fullheight}, which
-correspond to the command-line options @samp{-fs}, @samp{-mm},
-@samp{-fw}, and @samp{-fh} (@pxref{Window Size X}).  Note that this
-applies to the initial frame only.
-
 @ifnottex
+@item @code{horizontalScrollBars} (class @code{ScrollBars})
+If the value of this resource is @samp{off} or @samp{false} or
+@samp{0}, Emacs disables Horizontal Scroll Bar mode at startup
+(@pxref{Scroll Bars}).
+
 @item @code{iconName} (class @code{Title})
 Name to display in the icon.
 
@@ -318,8 +322,8 @@ This is only relevant if your Emacs is built with XIM support.  It
 might be useful to turn off XIM on slow X client/server links.
 
 @item @code{verticalScrollBars} (class @code{ScrollBars})
-Give frames scroll bars if @samp{on}; don't have scroll bars if
-@samp{off}.
+Give frames scroll bars on the left if @samp{left}, on the right if
+@samp{right}; don't have scroll bars if @samp{off}.
 
 @ifnottex
 @item @code{visualClass} (class @code{VisualClass})
@@ -346,13 +350,13 @@ resources.  @xref{Face Customization}.
 @cindex Lucid Widget X Resources
 
   If Emacs is compiled with the X toolkit support using Lucid widgets,
-you can use X resources to customize the appearance of the menu bar,
-pop-up menus, and dialog boxes.  The resources for the menu bar fall
-in the @samp{pane.menubar} class (following, as always, either the
-name of the Emacs executable or @samp{Emacs} for all Emacs
-invocations).  The resources for the pop-up menu are in the
-@samp{menu*} class.  The resources for dialog boxes are in the
-@samp{dialog*} class.
+you can use X resources to customize the appearance of the menu bar
+(@pxref{Menu Bar}), pop-up menus, and dialog boxes (@pxref{Dialog
+Boxes}).  The resources for the menu bar fall in the
+@samp{pane.menubar} class (following, as always, either the name of
+the Emacs executable or @samp{Emacs} for all Emacs invocations).  The
+resources for the pop-up menu are in the @samp{menu*} class.  The
+resources for dialog boxes are in the @samp{dialog*} class.
 
   For example, to display menu bar entries with the @samp{Courier-12}
 font (@pxref{Fonts}), write this:
@@ -374,12 +378,12 @@ Here is a list of resources for menu bars, pop-up menus, and dialogs:
 Font for menu item text.
 @item fontSet
 Fontset for menu item text.
-@item foreground
-Foreground color.
 @item background
 Background color.
 @item buttonForeground
 Foreground color for a selected item.
+@item foreground
+Foreground color.
 @ifnottex
 @item horizontalSpacing
 Horizontal spacing in pixels between items.  Default is 3.
@@ -403,14 +407,15 @@ Margin of the menu bar, in characters.  Default is 1.
 
   If Emacs is compiled with the X toolkit support using Motif or
 LessTif widgets, you can use X resources to customize the appearance
-of the menu bar, pop-up menus, and dialog boxes.  However, the
-resources are organized differently from Lucid widgets.
+of the menu bar (@pxref{Menu Bar}), pop-up menus, and dialog boxes
+(@pxref{Dialog Boxes}).  However, the resources are organized
+differently from Lucid widgets.
 
   The resource names for the menu bar are in the @samp{pane.menubar}
 class, and they must be specified in this form:
 
 @smallexample
-Emacs.pane.menubar.@var{subwidget}.@var{resource}:  @var{value}
+Emacs.pane.menubar.@var{subwidget}.@var{resource}: @var{value}
 @end smallexample
 
 @noindent
@@ -427,7 +432,7 @@ For example, to specify the font @samp{8x16} for all menu bar items,
 including submenus, write this:
 
 @smallexample
-Emacs.pane.menubar.*.fontList:  8x16
+Emacs.pane.menubar.*.fontList: 8x16
 @end smallexample
 
   Each item in a submenu also has its own name for X resources; for
@@ -471,7 +476,7 @@ itself, you must first specify the resource for all of them, then
 override the value for submenus alone.  Here is an example:
 
 @smallexample
-Emacs.pane.menubar.*.fontList:  8x16
+Emacs.pane.menubar.*.fontList: 9x18
 Emacs.pane.menubar.popup_*.fontList: 8x16
 @end smallexample
 
@@ -510,7 +515,7 @@ The color for the border shadow, on the top and the left.
 @node GTK resources
 @appendixsec GTK resources
 @cindex GTK+ resources
-@cindex resource files for GTK
+@cindex resource files for GTK+
 @cindex @file{~/.gtkrc-2.0} file
 @cindex @file{~/.emacs.d/gtkrc} file
 
@@ -525,7 +530,7 @@ resources are specified in either the file @file{~/.emacs.d/gtkrc}
 (for Emacs-specific GTK+ resources), or @file{~/.gtkrc-2.0} (for
 general GTK+ resources).  We recommend using @file{~/.emacs.d/gtkrc},
 since GTK+ seems to ignore @file{~/.gtkrc-2.0} when running GConf with
-GNOME@.  Note, however, that some GTK themes may override
+GNOME@.  Note, however, that some GTK+ themes may override
 customizations in @file{~/.emacs.d/gtkrc}; there is nothing we can do
 about this.  GTK+ resources do not affect aspects of Emacs unrelated
 to GTK+ widgets, such as fonts and colors in the main Emacs window;
@@ -548,15 +553,15 @@ system, see
 @menu
 * GTK Resource Basics::   Basic usage of GTK+ resources.
 * GTK Widget Names::      How GTK+ widgets are named.
-* GTK Names in Emacs::    GTK widgets used by Emacs.
-* GTK styles::            What can be customized in a GTK widget.
+* GTK Names in Emacs::    GTK+ widgets used by Emacs.
+* GTK styles::            What can be customized in a GTK+ widget.
 @end menu
 
 @node GTK Resource Basics
 @appendixsubsec GTK Resource Basics
 
   In a GTK+ 2 resource file (usually @file{~/.emacs.d/gtkrc}), the
-simplest kinds of resource settings simply assign a value to a
+simplest kind of a resource setting simply assigns a value to a
 variable.  For example, putting the following line in the resource
 file changes the font on all GTK+ widgets to @samp{courier-12}:
 
@@ -612,7 +617,7 @@ widget "*verticalScrollBar*" style "scroll"
 
 @node GTK Widget Names
 @appendixsubsec GTK widget names
-@cindex GTK widget names
+@cindex GTK+ widget names
 
   A GTK+ widget is specified by a @dfn{widget name} and a @dfn{widget
 class}.  The widget name refers to a specific widget
@@ -657,8 +662,8 @@ widget "*" style "my_style"
 
 @node GTK Names in Emacs
 @appendixsubsec GTK Widget Names in Emacs
-@cindex GTK widget names in Emacs
-@cindex GTK widget classes
+@cindex GTK+ widget names in Emacs
+@cindex GTK+ widget classes
 
   The GTK+ widgets used by an Emacs frame are listed below:
 
@@ -721,7 +726,7 @@ widget_class "*Menu*" style "my_menu_style"
 
 @node GTK styles
 @appendixsubsec GTK styles
-@cindex GTK styles
+@cindex GTK+ styles
 
   Here is an example of two GTK+ style declarations:
 
@@ -770,20 +775,24 @@ possible states are:
 @table @code
 @item NORMAL
 This is the default state for widgets.
+
 @item ACTIVE
 This is the state for a widget that is ready to do something.  It is
 also for the trough of a scroll bar, i.e., @code{bg[ACTIVE] = "red"}
 sets the scroll bar trough to red.  Buttons that have been armed
 (pressed but not released yet) are in this state.
+
 @item PRELIGHT
 This is the state for a widget that can be manipulated, when the mouse
 pointer is over it---for example when the mouse is over the thumb in
 the scroll bar or over a menu item.  When the mouse is over a button
 that is not pressed, the button is in this state.
+
 @item SELECTED
 This is the state for data that has been selected by the user.  It can
 be selected text or items selected in a list.  This state is not used
 in Emacs.
+
 @item INSENSITIVE
 This is the state for widgets that are visible, but they cannot be
 manipulated in the usual way---for example, buttons that can't be
@@ -805,14 +814,14 @@ dialog.
 
 @item bg_pixmap[@var{state}] = "@var{pixmap}"
 This specifies an image background (instead of a background color).
-@var{pixmap} should be the image file name.  GTK can use a number of
+@var{pixmap} should be the image file name.  GTK+ can use a number of
 image file formats, including XPM, XBM, GIF, JPEG and PNG@.  If you
 want a widget to use the same image as its parent, use
 @samp{<parent>}.  If you don't want any image, use @samp{<none>}.
 @samp{<none>} is the way to cancel a background image inherited from a
 parent style.
 
-You can't specify the file by its absolute file name.  GTK looks for
+You can't specify the file by its absolute file name.  GTK+ looks for
 the pixmap file in directories specified in @code{pixmap_path}.
 @code{pixmap_path} is a colon-separated list of directories within
 double quotes, specified at the top level in a @file{gtkrc} file
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 16216bb774c..c86ca43954e 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -5882,7 +5882,7 @@ find and use again and again.
 @node New insert-buffer
 @subsection New Body for @code{insert-buffer}
 @findex insert-buffer@r{, new version body}
-@cindex new version body for insert-buffer
+@cindex new version body for @code{insert-buffer}
 
 The body in the GNU Emacs 22 version is more confusing than the original.
 
@@ -13254,7 +13254,7 @@ If you are reading this inside of GNU Emacs and you want to see the
 whole function, you can type @kbd{C-h f} (@code{describe-function})
 and the name of the function.  This gives you the function
 documentation and the name of the library containing the function's
-source.  Place point over the name of the library and press the RET
+source.  Place point over the name of the library and press the @key{RET}
 key; you will be taken directly to the source.  (Be sure to install
 your sources!  Without them, you are like a person who tries to drive
 a car with his eyes shut!)
@@ -14739,7 +14739,7 @@ In Emacs 22
   "Edit file FILENAME.
 Switch to a buffer visiting file FILENAME,
 creating one if none already exists.
-Interactively, the default if you just type RET is the current directory,
+Interactively, the default if you just type @key{RET} is the current directory,
 but the visited file name is available through the minibuffer history:
 type M-n to pull it into the minibuffer.
 
@@ -15917,8 +15917,8 @@ a regular expression, including functions that are not interactive.
 What we want to look for is some command that prints or inserts
 columns.  Very likely, the name of the function will contain either
 the word ``print'' or the word ``insert'' or the word ``column''.
-Therefore, we can simply type @kbd{M-x apropos RET
-print\|insert\|column RET} and look at the result.  On my system, this
+Therefore, we can simply type @kbd{M-x apropos @key{RET}
+print\|insert\|column @key{RET}} and look at the result.  On my system, this
 command once took quite some time, and then produced a list of 79
 functions and variables.  Now it does not take much time at all and
 produces a list of 211 functions and variables.  Scanning down the
@@ -18147,7 +18147,7 @@ You can enter the debugger when you call the function by calling
 Type:
 
 @smallexample
-M-x debug-on-entry RET triangle-bugged RET
+M-x debug-on-entry @key{RET} triangle-bugged @key{RET}
 @end smallexample
 
 @need 1250
@@ -18255,7 +18255,7 @@ To cancel the effect of @code{debug-on-entry}, call
 @code{cancel-debug-on-entry} and the name of the function, like this:
 
 @smallexample
-M-x cancel-debug-on-entry RET triangle-bugged RET
+M-x cancel-debug-on-entry @key{RET} triangle-bugged @key{RET}
 @end smallexample
 
 @noindent
@@ -18341,7 +18341,7 @@ this by positioning your cursor within or just after the definition
 and typing
 
 @smallexample
-M-x edebug-defun RET
+M-x edebug-defun @key{RET}
 @end smallexample
 
 @noindent
@@ -18552,7 +18552,7 @@ one of those long, but decipherable functions.  You can look up
 
 In this instance, since the code is Lisp, the @file{*Help*} buffer
 contains the name of the library containing the function's source.
-You can put point over the name of the library and press the RET key,
+You can put point over the name of the library and press the @key{RET} key,
 which in this situation is bound to @code{help-follow}, and be taken
 directly to the source, in the same way as @kbd{M-.}
 (@code{find-tag}).
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 9fbdb628205..3a39826761c 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/lispref/streams.texi b/doc/lispref/streams.texi
index 6172392274a..ebd806601ef 100644
--- a/doc/lispref/streams.texi
+++ b/doc/lispref/streams.texi
@@ -778,6 +778,14 @@ In the second expression, the local binding of
 @code{prin1}, but not during the printing of the result.
 @end defvar
 
+@defvar print-escape-control-characters
+If this variable is non-@code{nil}, control characters in strings are
+printed as backslash sequences by the print functions @code{prin1} and
+@code{print} that print with quoting.  If this variable and
+@code{print-escape-newlines} are both non-@code{nil}, the latter takes
+precedences for newlines and formfeeds.
+@end defvar
+
 @defvar print-escape-nonascii
 If this variable is non-@code{nil}, then unibyte non-@acronym{ASCII}
 characters in strings are unconditionally printed as backslash sequences
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 5452ea68790..8a9e27d00ec 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -727,7 +727,7 @@ minus sign if the argument is negative.
      @result{} "-23.5"
 @end example
 
-@cindex int-to-string
+@cindex @code{int-to-string}
 @code{int-to-string} is a semi-obsolete alias for this function.
 
 See also the function @code{format} in @ref{Formatting Strings}.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 9de270c2d8e..e992c0f561d 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3862,7 +3862,7 @@ clicks on the link quickly without moving the mouse.  This behavior is
 controlled by the user option @code{mouse-1-click-follows-link}.
 @xref{Mouse References,,, emacs, The GNU Emacs Manual}.
 
-@cindex follow-link (text or overlay property)
+@kindex follow-link @r{(text or overlay property)}
   To set up the link so that it obeys
 @code{mouse-1-click-follows-link}, you must either (1) apply a
 @code{follow-link} text or overlay property to the link text, or (2)
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index a4a091f243a..1fe7948ab81 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -9710,7 +9710,7 @@ The @kbd{C-x * x} command also turns the Calculator off, no matter which
 user interface (standard, Keypad, or Embedded) is currently active.
 It also cancels @code{calc-edit} mode if used from there.
 
-@kindex d @key{SPC}
+@kindex d SPC
 @pindex calc-refresh
 @cindex Refreshing a garbled display
 @cindex Garbled displays, refreshing
@@ -10268,7 +10268,7 @@ information is cleared whenever you give any command that adds new undo
 information, i.e., if you undo, then enter a number on the stack or make
 any other change, then it will be too late to redo.
 
-@kindex M-@key{RET}
+@kindex M-RET
 @pindex calc-last-args
 @cindex Last-arguments feature
 @cindex Arguments, restoring
@@ -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
@@ -11732,8 +11732,8 @@ type, such as numbers, vectors, formulas, and incomplete objects.)
 @section Stack Manipulation Commands
 
 @noindent
-@kindex @key{RET}
-@kindex @key{SPC}
+@kindex RET
+@kindex SPC
 @pindex calc-enter
 @cindex Duplicating stack entries
 To duplicate the top object on the stack, press @key{RET} or @key{SPC}
@@ -11749,7 +11749,7 @@ For example, with @samp{10 20 30} on the stack,
 @kbd{C-u - 2 @key{RET}} creates @samp{10 20 30 20}, and
 @kbd{C-u 0 @key{RET}} creates @samp{10 20 30 10 20 30}.
 
-@kindex @key{LFD}
+@kindex LFD
 @pindex calc-over
 The @key{LFD} (@code{calc-over}) command (on a key marked Line-Feed if you
 have it, else on @kbd{C-j}) is like @code{calc-enter}
@@ -11759,7 +11759,7 @@ Thus with @samp{10 20 30} on the stack, @key{LFD} and @kbd{C-u 2 @key{LFD}}
 are both equivalent to @kbd{C-u - 2 @key{RET}}, producing
 @samp{10 20 30 20}.
 
-@kindex @key{DEL}
+@kindex DEL
 @kindex C-d
 @pindex calc-pop
 @cindex Removing stack entries
@@ -11777,7 +11777,7 @@ For example, with @samp{10 20 30} on the stack,
 @kbd{C-u - 2 @key{DEL}} leaves @samp{10 30}, and
 @kbd{C-u 0 @key{DEL}} leaves an empty stack.
 
-@kindex M-@key{DEL}
+@kindex M-DEL
 @pindex calc-pop-above
 The @kbd{M-@key{DEL}} (@code{calc-pop-above}) command is to @key{DEL} what
 @key{LFD} is to @key{RET}:  It interprets the sign of the numeric
@@ -11798,7 +11798,7 @@ specified element of the stack regardless of the cursor  position.
 Similarly, @key{DEL} will remove the corresponding elements from the
 stack.
 
-@kindex @key{TAB}
+@kindex TAB
 @pindex calc-roll-down
 To exchange the top two elements of the stack, press @key{TAB}
 (@code{calc-roll-down}).  Given a positive numeric prefix argument, the
@@ -11812,7 +11812,7 @@ For example, with @samp{10 20 30 40 50} on the stack,
 @kbd{C-u - 2 @key{TAB}} creates @samp{40 50 10 20 30}, and
 @kbd{C-u 0 @key{TAB}} creates @samp{50 40 30 20 10}.
 
-@kindex M-@key{TAB}
+@kindex M-TAB
 @pindex calc-roll-up
 The command @kbd{M-@key{TAB}} (@code{calc-roll-up}) is analogous to @key{TAB}
 except that it rotates upward instead of downward.  Also, the default
@@ -13075,7 +13075,7 @@ refresh the stack to leave the stack display alone.  The word ``Dirty''
 will appear in the mode line when Calc thinks the stack display may not
 reflect the latest mode settings.
 
-@kindex d @key{RET}
+@kindex d RET
 @pindex calc-refresh-top
 The @kbd{d @key{RET}} (@code{calc-refresh-top}) command reformats the
 top stack entry according to all the current modes.  Positive prefix
@@ -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
@@ -21942,7 +21942,7 @@ If you select an element of a vector and press @key{DEL}, that
 element is deleted from the vector.  If you delete one side of
 an equation or inequality, only the opposite side remains.
 
-@kindex j @key{DEL}
+@kindex j DEL
 @pindex calc-del-selection
 The @kbd{j @key{DEL}} (@code{calc-del-selection}) command is like
 @key{DEL} but with the auto-selecting behavior of @kbd{j '} and
@@ -21950,7 +21950,7 @@ The @kbd{j @key{DEL}} (@code{calc-del-selection}) command is like
 indicated by the cursor, or, in the absence of a selection, it
 deletes the sub-formula indicated by the cursor position.
 
-@kindex j @key{RET}
+@kindex j RET
 @pindex calc-grab-selection
 (There is also an auto-selecting @kbd{j @key{RET}} (@code{calc-copy-selection})
 command.)
@@ -35348,13 +35348,13 @@ followed by  @kbd{=}, @kbd{&}, @kbd{#}, @kbd{\}, @kbd{/}, @kbd{+} or
 @kbd{-} as well as @kbd{*} to start Calc, and so in many cases the last
 character of the prefix can simply be typed twice.
 
-Calc is controlled by many variables, most of which can be reset
-from within Calc.  Some variables are less involved with actual
-calculation and can be set outside of Calc using Emacs's
-customization facilities.  These variables are listed below.
-Typing @kbd{M-x customize-variable RET @var{variable-name} RET}
-will bring up a buffer in which the variable's value can be redefined.
-Typing @kbd{M-x customize-group RET calc RET} will bring up a buffer which
+Calc is controlled by many variables, most of which can be reset from
+within Calc.  Some variables are less involved with actual calculation
+and can be set outside of Calc using Emacs's customization facilities.
+These variables are listed below.  Typing @kbd{M-x customize-variable
+@key{RET} @var{variable-name} @key{RET}} will bring up a buffer in
+which the variable's value can be redefined.  Typing @kbd{M-x
+customize-group @key{RET} calc @key{RET}} will bring up a buffer which
 contains all of Calc's customizable variables.  (These variables can
 also be reset by putting the appropriate lines in your .emacs file;
 @xref{Init File, ,Init File, emacs, The GNU Emacs Manual}.)
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index a506213ea2d..d0d39d44e95 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -356,9 +356,9 @@ Customizing Macros
 
 @cindex BOCM
 @cindex history
-@cindex awk-mode.el
-@cindex c-mode.el
-@cindex c++-mode.el
+@cindex @file{awk-mode.el}
+@cindex @file{c-mode.el}
+@cindex @file{c++-mode.el}
 
 Welcome to @ccmode{}, a GNU Emacs mode for editing files containing C,
 C++, Objective-C, Java, CORBA IDL (and the variants CORBA PSDL and
@@ -577,9 +577,9 @@ for the latest information on Emacs version and package compatibility
 
 @deffn Command c-version
 @findex version @r{(c-)}
-You can find out what version of @ccmode{} you are using by visiting a C
-file and entering @kbd{M-x c-version RET}.  You should see this message in
-the echo area:
+You can find out what version of @ccmode{} you are using by visiting a
+C file and entering @kbd{M-x c-version @key{RET}}.  You should see
+this message in the echo area:
 
 @example
 Using CC Mode version 5.XX
@@ -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
@@ -1521,7 +1521,7 @@ deletion.
 @kindex 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,8 +1567,8 @@ 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-Backspace
+@kindex C-c Backspace
 @kindex C-c C-DEL
 @kindex C-c DEL
 @findex c-hungry-delete-backwards
@@ -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-Delete
+@kindex C-c Delete
 @findex c-hungry-delete-forward
 @findex hungry-delete-forward @r{(c-)}
 Delete any amount of whitespace in the forward direction (regardless
 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 Delete
+@kindex 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.
@@ -1708,7 +1708,7 @@ nomenclature and treat them as separate words:
 @item     @kbd{M-b}   @tab @code{backward-word}      @tab @code{c-backward-subword}
 @item     @kbd{M-@@}  @tab @code{mark-word}          @tab @code{c-mark-subword}
 @item     @kbd{M-d}   @tab @code{kill-word}          @tab @code{c-kill-subword}
-@item     @kbd{M-DEL} @tab @code{backward-kill-word} @tab @code{c-backward-kill-subword}
+@item     @kbd{M-@key{DEL}} @tab @code{backward-kill-word} @tab @code{c-backward-kill-subword}
 @item     @kbd{M-t}   @tab @code{transpose-words}    @tab @code{c-transpose-subwords}
 @item     @kbd{M-c}   @tab @code{capitalize-word}    @tab @code{c-capitalize-subword}
 @item     @kbd{M-u}   @tab @code{upcase-word}        @tab @code{c-upcase-subword}
@@ -7250,13 +7250,13 @@ Set the variable @code{c-basic-offset}.  @xref{Getting Started}.
 @item
 @kindex 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/dired-x.texi b/doc/misc/dired-x.texi
index 130c06b40e8..60e978c9d91 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -995,7 +995,7 @@ If there are several Dired buffers for a directory, the most recently
 used is chosen.
 
 Dired avoids switching to the current buffer, so that if you have a
-normal and a wildcard buffer for the same directory, @kbd{C-x d RET}
+normal and a wildcard buffer for the same directory, @kbd{C-x d @key{RET}}
 will toggle between those two.
 @end table
 
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index 9ac2af1bcf7..b6f2c1865fd 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -482,7 +482,7 @@ you are working on, some classes will only be known to exist but the
 location of their declarations and definitions will not be known.
 
 @item @key{RET}
-Works like @kbd{SPC}, except that it finds the class
+Works like @kbd{@key{SPC}}, except that it finds the class
 declaration rather than viewing it, so that it is ready for
 editing.
 @end table
@@ -886,7 +886,7 @@ the member.
 This command finds the declaration of the member the cursor is on.
 
 @item @key{SPC}
-This is the same command as @kbd{RET}, but views the member definition
+This is the same command as @kbd{@key{RET}}, but views the member definition
 instead of finding the member's source file.
 
 @item v
@@ -1314,7 +1314,7 @@ the next position stored in the position stack.
 
 @item C-c C-m p
 Displays an electric buffer showing all positions saved in the stack.
-You can select a position by pressing @kbd{SPC} in a line.  You can
+You can select a position by pressing @kbd{@key{SPC}} in a line.  You can
 view a position with @kbd{v}.
 @end table
 
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 88dc9e922e5..42bedb10f68 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -160,8 +160,8 @@ First, lets create a directory for our project.  For this example,
 we'll start with something in @file{/tmp}.
 
 @example
-C-x C-f /tmp/myproject/README RET
-M-x make-directory RET RET
+C-x C-f /tmp/myproject/README @key{RET}
+M-x make-directory @key{RET} @key{RET}
 @end example
 
 Now put some plain text in your README file to start.
@@ -169,7 +169,7 @@ Now put some plain text in your README file to start.
 Now, lets create the project:
 
 @example
-M-x ede-new RET Automake RET myproject RET
+M-x ede-new @key{RET} Automake @key{RET} myproject @key{RET}
 @end example
 
 
@@ -191,8 +191,8 @@ We'll make a more complex project, so use dired to create some more
 directories using the @kbd{+} key, and typing in new directories:
 
 @example
-+ include RET
-+ src RET
++ include @key{RET}
++ src @key{RET}
 @end example
 
 Now I'll short-cut in this tutorial.  Create the following files:
@@ -252,13 +252,13 @@ now create those projects.
 With @file{main.cpp} as your current buffer, type:
 
 @example
-M-x ede-new RET Automake RET src RET
+M-x ede-new @key{RET} Automake @key{RET} src @key{RET}
 @end example
 
 and in @file{myproj.hh} as your current buffer, type:
 
 @example
-M-x ede-new RET Automake RET include RET
+M-x ede-new @key{RET} Automake @key{RET} include @key{RET}
 @end example
 
 These steps effectively only create the Project.ede file in which you
@@ -272,7 +272,7 @@ Projects.  You can create targets either from a buffer, or from a
 
 Note: If for some reason a directory list buffer, or file does not have the
 @samp{Project} menu item, or if @ede{} keybindings don't work, just
-use @kbd{M-x revert-buffer RET} to force a refresh.  Sometimes
+use @kbd{M-x revert-buffer @key{RET}} to force a refresh.  Sometimes
 creating a new project doesn't restart buffers correctly.
 
 Lets start with the header file.  In @file{include/myproj.hh}, you
@@ -280,7 +280,7 @@ could use the menu, but we will now start using the @ede{} command prefix
 which is @kbd{C-c .}.
 
 @example
-C-c . t includes RET miscellaneous RET y
+C-c . t includes @key{RET} miscellaneous @key{RET} y
 @end example
 
 
@@ -292,7 +292,7 @@ Next, visit the @file{src} directory using dired.  There should be a
 @samp{Project} menu.   You can create a new target with
 
 @example
-. t myprogram RET program RET
+. t myprogram @key{RET} program @key{RET}
 @end example
 
 Note that @kbd{. t} is a command for creating a target.  This command
@@ -304,7 +304,7 @@ Next, place the cursor on @file{main.cpp}, and use @kbd{. a} to add
 that file to your target.
 
 @example
-. a myprogram RET
+. a myprogram @key{RET}
 @end example
 
 Note that these prompts often have completion, so you can just press
@@ -316,8 +316,8 @@ all in your dired buffer, and add them all at the same time.
 Next, do the same for the library by placing the cursor on @file{mylib.cpp}.
 
 @example
-. t mylib RET sharedobject RET
-. a mylib RET
+. t mylib @key{RET} sharedobject @key{RET}
+. a mylib @key{RET}
 @end example
 
 @section Step 5: Compile, and fail
@@ -350,7 +350,7 @@ To fix the failed compile, we need to add
 Visit @file{main.cpp}.
 
 @example
-M-x customize-project RET
+M-x customize-project @key{RET}
 @end example
 
 Select the @samp{[Settings]} subgroup of options.  Under
@@ -407,7 +407,7 @@ project.  This is because variables such as the include path are
 treated globally, whereas dependencies for a target are target specific.
 
 @example
-M-x customize-target RET
+M-x customize-target @key{RET}
 @end example
 
 On the first page, you will see an Ldlibs-local section.  Add mylib to
@@ -437,7 +437,7 @@ C-c . C
 You can run your program directly from @ede{}.
 
 @example
-C-c . R RET RET
+C-c . R @key{RET} @key{RET}
 @end example
 
 If your program takes command line arguments, you can type them in
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index e488fc07f8e..8ffa90fb5b5 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -541,12 +541,12 @@ 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
 Makes the previous difference region current.
 @item n
-@itemx SPC
+@itemx @key{SPC}
 @kindex n
 @kindex SPC
 Makes the next difference region current.
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index ed486597a7b..754e3c82b23 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -195,10 +195,10 @@ EDT Emulation.  (Note: In a few rare circumstances this does not work
 properly.  In particular, it does not work if a subset of the leading
 @acronym{ASCII} characters in a key sequence are recognized by Emacs as
 having an existing binding.  For example, if the keypad 7 (@key{KP7})
-key generates the sequence @samp{<ESC>Ow} and @samp{<ESC>O} is already
+key generates the sequence @samp{@key{ESC}Ow} and @samp{@key{ESC}O} is already
 bound to a function, pressing @key{KP7} when told to do so by
 @file{edt-mapper.el} will result in @file{edt-mapper.el} incorrectly
-mapping @samp{<ESC>O} to @key{KP7} and @samp{w} to @key{KP8}.  If
+mapping @samp{@key{ESC}O} to @key{KP7} and @samp{w} to @key{KP8}.  If
 something like this happens to you, it is probably a bug in the support
 for your keyboard within Emacs @strong{or} a bug in the Unix
 termcap/terminfo support for your terminal @strong{or} a bug in the
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index da6fda08833..e1575f592bf 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -173,7 +173,7 @@ Key sequences longer than one key (and some single-key sequences) are
 written inside quotes or on lines by themselves, like this:
 
 @display
-  @kbd{M-x frobnicate-while-foo RET}
+  @kbd{M-x frobnicate-while-foo @key{RET}}
 @end display
 
 @noindent
@@ -201,7 +201,7 @@ Also, on very few keyboards does @kbd{C-?} generate @acronym{ASCII} code 127.
 @section What does @file{M-x @var{command}} mean?
 @cindex Extended commands
 @cindex Commands, extended
-@cindex M-x, meaning of
+@cindex @kbd{M-x}, meaning of
 
 @kbd{M-x @var{command}} means type @kbd{M-x}, then type the name of the
 command, then type @key{RET}.  (@xref{Basic keys}, if you're not sure
@@ -3808,9 +3808,9 @@ defines the @kbd{M-@key{TAB}} key sequence.
 
 @node Backspace invokes help
 @section Why does the @key{Backspace} key invoke help?
-@cindex Backspace key invokes help
-@cindex Help invoked by Backspace
-@cindex DEL key does not delete
+@cindex @key{Backspace} key invokes help
+@cindex Help invoked by @key{Backspace}
+@cindex @key{DEL} key does not delete
 
 The @key{Backspace} key (on most keyboards) generates @acronym{ASCII} code 8.
 @kbd{C-h} sends the same code.  In Emacs by default @kbd{C-h} invokes
@@ -4155,7 +4155,7 @@ This will disable the use of the extra keysyms systemwide, which may be
 undesirable if you actually intend to use them.
 
 @node SPC no longer completes file names
-@section Why doesn't SPC complete file names anymore?
+@section Why doesn't @key{SPC} complete file names anymore?
 @cindex @kbd{SPC} file name completion
 
 Starting with Emacs 22.1, @kbd{SPC} no longer completes file names in
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 16c341b8877..689ff72b723 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -1263,13 +1263,13 @@ The @var{parent-instance} slot indicates the instance which is
 considered the parent of the current instance.  Default is @code{nil}.
 @end deftp
 
-@cindex clone
+@cindex @code{clone}
 To use this class, inherit from it with your own class.
 To make a new instance that inherits from and existing instance of your
 class, use the @code{clone} method with additional parameters
 to specify local values.
 
-@cindex slot-unbound
+@cindex @code{slot-unbound}
 The @code{eieio-instance-inheritor} class works by causing cloned
 objects to have all slots unbound.  This class' @code{slot-unbound}
 method will cause references to unbound slots to be redirected to the
@@ -1395,7 +1395,7 @@ with a minimum of effort.
 
 @deftp {Class} eieio-speedbar buttontype buttonface
 Enables base speedbar display for a class.
-@cindex speedbar-make-tag-line
+@cindex @code{speedbar-make-tag-line}
 The slot @var{buttontype} is any of the symbols allowed by the
 function @code{speedbar-make-tag-line} for the @var{exp-button-type}
 argument @xref{Extending,,,speedbar}.
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 4fbb3e5673d..2c607cc97c5 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -179,18 +179,18 @@ Emacs source code.  This item works only in the groups matching
 @code{mm-uu-emacs-sources-regexp}.
 
 @item diff
-@vindex diff
+@findex diff
 @vindex mm-uu-diff-groups-regexp
 Patches.  This is intended for groups where diffs of committed files
 are automatically sent to.  It only works in groups matching
 @code{mm-uu-diff-groups-regexp}.
 
 @item verbatim-marks
-@cindex verbatim-marks
+@findex verbatim-marks
 Slrn-style verbatim marks.
 
 @item LaTeX
-@cindex LaTeX
+@findex LaTeX
 LaTeX documents.  It only works in groups matching
 @code{mm-uu-tex-groups-regexp}.
 
@@ -1093,7 +1093,7 @@ If non-@code{nil} a format=flowed article will be displayed flowed.
 @node Interface Functions
 @chapter Interface Functions
 @cindex interface functions
-@cindex mail-parse
+@cindex @code{mail-parse}
 
 The @code{mail-parse} library is an abstraction over the actual
 low-level libraries that are described in the next chapter.
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/erc.texi b/doc/misc/erc.texi
index 466a4fc4b85..55556c52810 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -117,10 +117,11 @@ connect to.
 If you want to place ERC settings in their own file, you can place them
 in @file{~/.emacs.d/.ercrc.el}, creating it if necessary.
 
-If you would rather use the Customize interface to change how ERC works,
-do @kbd{M-x customize-group RET erc RET}.  In particular, ERC comes with
-lots of modules that may be enabled or disabled; to select which ones
-you want, do @kbd{M-x customize-variable RET erc-modules RET}.
+If you would rather use the Customize interface to change how ERC
+works, do @kbd{M-x customize-group @key{RET} erc @key{RET}}.  In
+particular, ERC comes with lots of modules that may be enabled or
+disabled; to select which ones you want, do @kbd{M-x
+customize-variable @key{RET} erc-modules @key{RET}}.
 
 @menu
 * Sample Session::              Example of connecting to the #emacs channel
@@ -269,14 +270,14 @@ This is a summary of keystrokes available in every ERC buffer.
 @item C-a or <home> (@code{erc-bol})
 Go to beginning of line or end of prompt.
 
-@item RET (@code{erc-send-current-line})
+@item @key{RET} (@code{erc-send-current-line})
 Send the current line
 
-@item TAB (@code{erc-complete-word})
+@item @key{TAB} (@code{erc-complete-word})
 If at prompt, complete the current word.
 Otherwise, move to the next link or button.
 
-@item M-TAB (@code{ispell-complete-word})
+@item M-@key{TAB} (@code{ispell-complete-word})
 Complete the given word, using ispell.
 
 @item C-c C-a (@code{erc-bol})
@@ -297,7 +298,7 @@ Toggle automatic CTCP replies (like VERSION and PING).
 @item C-c C-f (@code{erc-toggle-flood-control})
 Toggle use of flood control on sent messages.
 
-@item C-c TAB (@code{erc-invite-only-mode})
+@item C-c @key{TAB} (@code{erc-invite-only-mode})
 Turn on the invite only mode (+i) for the current channel.
 
 @item C-c C-j (@code{erc-join-channel})
@@ -349,8 +350,9 @@ One way to add functionality to ERC is to customize which of its many
 modules are loaded.
 
 There is a spiffy customize interface, which may be reached by typing
-@kbd{M-x customize-option erc-modules RET}.  Alternatively, set
-@code{erc-modules} manually and then call @code{erc-update-modules}.
+@kbd{M-x customize-option @key{RET} erc-modules @key{RET}}.
+Alternatively, set @code{erc-modules} manually and then call
+@code{erc-update-modules}.
 
 The following is a list of available modules.
 
@@ -743,7 +745,7 @@ stuff, to the current ERC buffer."
 
 This section is extremely incomplete.  For now, the easiest way to
 check out all the available options for ERC is to do
-@kbd{M-x customize-group erc RET}.
+@kbd{M-x customize-group @key{RET} erc @key{RET}}.
 
 @defopt erc-hide-list
 If non, @code{nil}, this is a list of IRC message types to hide, e.g.:
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 3553560f497..82e0e27ed1c 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:
@@ -262,9 +262,9 @@ 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
+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.
 
@@ -817,7 +817,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/eshell.texi b/doc/misc/eshell.texi
index 1789767dbe2..80077e5ccdb 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -894,7 +894,7 @@ will happen as it should (albeit slowly).
 
 @item Make sure syntax table is correct in Eshell mode
 
-So that @kbd{M-DEL} acts in a predictable manner, etc.
+So that @kbd{M-@key{DEL}} acts in a predictable manner, etc.
 
 @item Allow all Eshell buffers to share the same history and list-dir
 
@@ -908,19 +908,19 @@ output from all subsequent commands is swallowed.
 Make it similar to the way that @file{esh-arg.el} is structured.
 Then add parsing of @samp{$[?\n]}.
 
-@item After pressing @kbd{M-RET}, redisplay before running the next command
+@item After pressing @kbd{M-@key{RET}}, redisplay before running the next command
 
 @item Argument predicates and modifiers should work anywhere in a path
 
 @example
-/usr/local/src/editors/vim $ vi **/CVS(/)/Root(.)
-Invalid regexp: "Unmatched ( or \\("
+/usr/local/src/editors/vim $ vi **/CVS(/)/Root(.)  Invalid regexp:
+"Unmatched ( or \\("
 @end example
 
 With @command{zsh}, the glob above expands to all files named
 @file{Root} in directories named @file{CVS}.
 
-@item Typing @samp{echo $@{locate locate@}/bin<TAB>} results in a Lisp error
+@item Typing @samp{echo $@{locate locate@}/bin@key{TAB}} results in a Lisp error
 
 Perhaps it should interpolate all permutations, and make that the
 globbing result, since otherwise hitting return here will result in
@@ -960,7 +960,7 @@ At the moment, this is not supported.
 An error should be generated only if @code{eshell-error-if-no-glob} is
 non-@code{nil}.
 
-@item @samp{(+ RET SPC TAB} does not cause @code{indent-according-to-mode} to occur
+@item @samp{(+ @key{RET} @key{SPC} @key{TAB}} does not cause @code{indent-according-to-mode} to occur
 
 @item Create @code{eshell-auto-accumulate-list}
 
@@ -1172,8 +1172,8 @@ only.  That way, it could be listed as a login shell.
 @item Make @kbd{/} electric
 
 So that it automatically expands and corrects pathnames.  Or make
-pathname completion for Pcomplete auto-expand @samp{/u/i/std<TAB>} to
-@samp{/usr/include/std<TAB>}.
+pathname completion for Pcomplete auto-expand @samp{/u/i/std@key{TAB}} to
+@samp{/usr/include/std@key{TAB}}.
 
 @item Write the @command{pushd} stack to disk along with @code{last-dir-ring}
 
@@ -1221,7 +1221,7 @@ If the first thing that I do after entering Emacs is to run
 @code{eshell-command} and invoke @command{ls}, and then use @kbd{M-x
 eshell}, it doesn't display anything.
 
-@item @kbd{M-RET} during a long command (using smart display) doesn't work
+@item @kbd{M-@key{RET}} during a long command (using smart display) doesn't work
 
 Since it keeps the cursor up where the command was invoked.
 
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 258a2f2bff9..43adc2eda0f 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -99,7 +99,7 @@ web page hit @kbd{g} (@code{eww-reload}).  Pressing @kbd{w}
 
 @findex eww-open-in-new-buffer
 @kindex M-RET
-  The @kbd{M-RET} command (@code{eww-open-in-new-buffer}) opens the
+  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..70463419e80 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -263,14 +263,14 @@ prompted for confirmation before the record is deleted unless a numeric
 argument has been provided.
 
 @findex forms-search-forward
-@kindex C-c C-s @var{regexp} @key{RET}
+@kindex C-c C-s @var{regexp} RET
 @item C-c C-s @var{regexp} @key{RET}
 Search forward for @var{regexp} in all records following this one
 (@code{forms-search-forward}).  If found, this record is shown.
 If you give an empty argument, the previous regexp is used again.
 
 @findex forms-search-backward
-@kindex C-c C-r @var{regexp} @key{RET}
+@kindex C-c C-r @var{regexp} RET
 @item C-c C-r @var{regexp} @key{RET}
 Search backward for @var{regexp} in all records following this one
 (@code{forms-search-backward}).  If found, this record is shown.
@@ -334,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 NEXT
+@item @key{NEXT}
 forms-next-record
 
-@kindex prior
-@item prior
+@kindex PRIOR
+@item @key{PRIOR}
 forms-prev-record
 
-@kindex begin
-@item begin
+@kindex BEGIN
+@item @key{BEGIN}
 forms-first-record
 
-@kindex end
-@item end
+@kindex END
+@item @key{END}
 forms-last-record
 
-@kindex S-Tab
+@kindex S-TAB
 @findex forms-prev-field
-@item S-Tab
+@item S-@key{TAB}
 forms-prev-field
 @end table
 
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 4175c88754e..efef01f6978 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -397,7 +397,7 @@ The ~/ means the home directory where Gnus and Emacs look
 for the configuration files.  However, you don't really
 need to know what this means, it suffices that Emacs knows
 what it means :-) You can type
-@samp{C-x C-f ~/.gnus.el RET }
+@samp{C-x C-f ~/.gnus.el @key{RET}}
 (yes, with the forward slash, even on Windows), and
 Emacs will open the right file for you.  (It will most
 likely be new, and thus empty.)
@@ -422,7 +422,7 @@ possibility to set environment variables.  Create a new one with
 name HOME and value C:\myhome.  Rebooting is not necessary.
 
 Now to create @file{~/.gnus.el}, say
-@samp{C-x C-f ~/.gnus.el RET C-x C-s}.
+@samp{C-x C-f ~/.gnus.el @key{RET} C-x C-s}.
 in Emacs.
 
 @node FAQ 3-3
@@ -459,11 +459,11 @@ subscribe to a group.
 @subsubheading Answer
 
 If you know the name of the group say @samp{U
-name.of.group RET} in group buffer (use the
+name.of.group @key{RET}} in group buffer (use the
 tab-completion Luke). Otherwise hit ^ in group buffer,
 this brings you to the server buffer. Now place point (the
 cursor) over the server which carries the group you want,
-hit @samp{RET}, move point to the group
+hit @samp{@key{RET}}, move point to the group
 you want to subscribe to and say @samp{u}
 to subscribe to it.
 
@@ -753,11 +753,11 @@ When I enter a group, all read messages are gone. How to view them again?
 @subsubheading Answer
 
 If you enter the group by saying
-@samp{RET}
+@samp{@key{RET}}
 in group buffer with point over the group, only unread and ticked messages are loaded. Say
-@samp{C-u RET}
+@samp{C-u @key{RET}}
 instead to load all available messages. If you want only the 300 newest say
-@samp{C-u 300 RET}
+@samp{C-u 300 @key{RET}}
 
 Loading only unread messages can be annoying if you have threaded view enabled, say
 
@@ -1019,7 +1019,7 @@ back ends. Gnus thinks ``highest-article-number @minus{}
 lowest-article-number = total-number-of-articles''. This
 works OK for Usenet groups, but if you delete and move
 many messages in mail groups, this fails. To cure the
-symptom, enter the group via @samp{C-u RET}
+symptom, enter the group via @samp{C-u @key{RET}}
 (this makes Gnus get all messages), then
 hit @samp{M P b} to mark all messages and
 then say @samp{B m name.of.group} to move
@@ -1494,8 +1494,8 @@ place them in ~/.emacs:
 @end example
 @noindent
 
-Now you should be ready to go. Say @samp{M-x bbdb RET
-RET} to open a bbdb buffer showing all
+Now you should be ready to go. Say @samp{M-x bbdb @key{RET}
+@key{RET}} to open a bbdb buffer showing all
 entries. Say @samp{c} to create a new
 entry, @samp{b} to search your BBDB and
 @samp{C-o} to add a new field to an
@@ -1734,15 +1734,15 @@ world, you may find tools at
 
 Now you've got to import this mbox file into Gnus. To do
 this, create a nndoc group based on the mbox file by
-saying @samp{G f /path/file.mbox RET} in
+saying @samp{G f /path/file.mbox @key{RET}} in
 Group buffer. You now have read-only access to your
 mail. If you want to import the messages to your normal
 Gnus mail groups hierarchy, enter the nndoc group you've
-just created by saying @samp{C-u RET}
+just created by saying @samp{C-u @key{RET}}
 (thus making sure all messages are retrieved), mark all
 messages by saying @samp{M P b} and
 either copy them to the desired group by saying
-@samp{B c name.of.group RET} or send them
+@samp{B c name.of.group @key{RET}} or send them
 through nnmail-split-methods (respool them) by saying
 @samp{B r}.
 
@@ -1809,7 +1809,7 @@ a Usenet group the easiest solution is probably to ask
 @uref{http://groups.google.com, groups.google.com},
 if you found the posting there, tell Google to display
 the raw message, look for the message-id, and say
-@samp{M-^ the@@message.id RET} in a
+@samp{M-^ the@@message.id @key{RET}} in a
 summary buffer.
 Since Gnus 5.10 there's also a Gnus interface for
 groups.google.com which you can call with
@@ -1853,7 +1853,7 @@ How to get rid of old unwanted mail?
 
 You can of course just mark the mail you don't need
 anymore by saying @samp{#} with point
-over the mail and then say @samp{B DEL}
+over the mail and then say @samp{B @key{DEL}}
 to get rid of them forever. You could also instead of
 actually deleting them, send them to a junk-group by
 saying @samp{B m nnml:trash-bin} which
@@ -2089,7 +2089,7 @@ How to find information and help inside Emacs?
 @subsubheading Answer
 
 The first stop should be the Gnus manual (Say
-@samp{C-h i d m Gnus RET} to start the
+@samp{C-h i d m Gnus @key{RET}} to start the
 Gnus manual, then walk through the menus or do a
 full-text search with @samp{s}). Then
 there are the general Emacs help commands starting with
@@ -2191,8 +2191,8 @@ The reason for this could be the way Gnus reads its
 active file, see the node "The Active File" in the Gnus
 manual for things you might try to speed the process up.
 An other idea would be to byte compile your @file{~/.gnus.el} (say
-@samp{M-x byte-compile-file RET ~/.gnus.el
-RET} to do it). Finally, if you have require
+@samp{M-x byte-compile-file @key{RET} ~/.gnus.el
+@key{RET}} to do it). Finally, if you have require
 statements in your .gnus, you could replace them with
 @code{with-eval-after-load}, which loads the stuff not at startup
 time, but when it's needed. Say you've got this in your
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi
index 91908584c96..171f59a3ad0 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -324,7 +324,7 @@ messages are deleted again).
 @itemize @bullet
 
 @item The tool bar has been updated to use GNOME icons.
-You can also customize the tool bars: @kbd{M-x customize-apropos RET
+You can also customize the tool bars: @kbd{M-x customize-apropos @key{RET}
 -tool-bar$} should get you started.  (Only for Emacs, not in XEmacs.)
 @c FIXME: Document this in the manual
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 17fbe0e3e39..8a0b6319363 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 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 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 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-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-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-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 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 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 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 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 TAB @r{(Topic)}
+@kindex TAB @r{(Topic)}
 @findex gnus-topic-indent
 ``Indent'' the current topic so that it becomes a sub-topic of the
 previous topic (@code{gnus-topic-indent}).  If given a prefix,
 ``un-indent'' the topic instead.
 
-@item M-TAB
-@kindex M-TAB (Topic)
+@item M-@key{TAB}
+@kindex M-TAB @r{(Topic)}
 @findex gnus-topic-unindent
 ``Un-indent'' the current topic so that it becomes a sub-topic of the
 parent of its current parent (@code{gnus-topic-unindent}).
@@ -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 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 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 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 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 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 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-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.
@@ -7043,7 +7037,7 @@ visible effects, but is useful if you use the @kbd{A T} command a lot
 
 The server has to support @acronym{NOV} for any of this to work.
 
-@cindex Gmane, gnus-fetch-old-headers
+@cindex Gmane, @code{gnus-fetch-old-headers}
 This feature can seriously impact performance it ignores all locally
 cached header entries.  Setting it to @code{t} for groups for a server
 that doesn't expire articles (such as news.gmane.org), leads to very
@@ -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-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-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 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 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 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 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-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 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 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 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-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,
@@ -12225,7 +12218,7 @@ If non-@code{nil}, use the same article buffer for all the groups.
 article buffer.
 
 @item gnus-widen-article-window
-@cindex gnus-widen-article-window
+@vindex gnus-widen-article-window
 If non-@code{nil}, selecting the article buffer with the @kbd{h}
 command will ``widen'' the article window to take the entire frame.
 
@@ -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.
 
@@ -13224,72 +13217,72 @@ in your init files.
 @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 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
@@ -13421,7 +13414,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.
@@ -13441,7 +13434,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.
 
 
@@ -13512,44 +13505,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
@@ -13557,7 +13550,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}).
 
@@ -14565,7 +14558,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,
@@ -14582,7 +14575,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
@@ -15721,7 +15713,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
@@ -16036,7 +16028,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
@@ -16713,7 +16705,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
@@ -17062,14 +17053,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
@@ -18670,51 +18661,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
@@ -18788,7 +18779,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
@@ -18809,44 +18800,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.
 
@@ -18859,43 +18850,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}).
@@ -18908,13 +18899,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}).
@@ -19015,8 +19006,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
@@ -19070,14 +19059,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
@@ -19463,18 +19450,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
@@ -19483,12 +19470,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
@@ -19496,32 +19483,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}).
@@ -19533,13 +19520,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
@@ -19674,7 +19661,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
 
@@ -19709,13 +19696,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
@@ -20199,20 +20186,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
@@ -20578,7 +20565,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.
 
@@ -20765,12 +20752,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
@@ -20780,12 +20767,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
@@ -21725,7 +21712,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.
@@ -21770,34 +21757,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
@@ -21805,20 +21792,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
@@ -21828,20 +21815,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
@@ -21853,14 +21840,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}.
@@ -21872,21 +21859,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
@@ -21894,14 +21881,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,
@@ -21911,7 +21898,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
@@ -22334,7 +22321,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
@@ -22390,7 +22377,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,
@@ -24292,10 +24278,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
@@ -24567,7 +24553,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
@@ -24603,7 +24589,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
@@ -26235,7 +26221,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
@@ -26670,7 +26656,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
@@ -27749,7 +27734,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}.
@@ -28304,10 +28289,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
@@ -28396,7 +28381,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
@@ -28492,7 +28477,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
@@ -28723,7 +28708,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''.
@@ -29125,12 +29110,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
@@ -29163,9 +29148,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}.
@@ -29183,8 +29168,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/htmlfontify.texi b/doc/misc/htmlfontify.texi
index 9f1d1b4ee32..6bc57daf627 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -1116,7 +1116,7 @@ Some of the (informal) data structures used in Htmlfontify are detailed here:
 @table @code
 
 @item hfy-style-assoc
-@cindex hfy-style-assoc
+@cindex @code{hfy-style-assoc}
 @anchor{hfy-style-assoc}
 
 An assoc representing/describing an Emacs face.  Properties may be repeated,
@@ -1148,7 +1148,7 @@ Some examples:
 @end lisp
 
 @item hfy-sheet-assoc
-@cindex hfy-sheet-assoc
+@cindex @code{hfy-sheet-assoc}
 @anchor{hfy-sheet-assoc}
 
 An assoc with elements of the form @samp{(face-name style-name . style-string)}.
@@ -1160,7 +1160,7 @@ The actual stylesheet for each page is derived from one of these.
 @end lisp
 
 @item hfy-facemap-assoc
-@cindex hfy-facemap-assoc
+@cindex @code{hfy-facemap-assoc}
 @anchor{hfy-facemap-assoc}
 
 An assoc of @code{(point . @var{face-symbol})} or
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index c37ca16b0cf..204a4499258 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -172,7 +172,7 @@ Catalogs
 @cindex CORBA (Common Object Request Broker Architecture)
 @cindex Interface Definition Language
 @cindex Interactive Data Language
-@cindex cc-mode.el
+@cindex @file{cc-mode.el}
 @cindex @file{idl.el}
 @cindex @file{idl-shell.el}
 @cindex Feature overview
@@ -935,7 +935,7 @@ IDL code.
 @cindex String splitting
 @cindex Splitting, of lines
 
-@kindex M-@key{RET}
+@kindex M-RET
 In IDL, a newline character terminates a statement unless preceded by a
 @samp{$}.  If you would like to start a continuation line, use
 @kbd{M-@key{RET}}, which calls the command @code{idlwave-split-line}.
@@ -1523,7 +1523,7 @@ The case-insensitive heading word in doclib headers to locate the
 @cindex Function name completion
 @cindex Procedure name completion
 
-@kindex M-@key{TAB}
+@kindex M-TAB
 @kindex C-c C-i
 IDLWAVE offers completion for class names, routine names, keywords,
 system variables, system variable tags, class structure tags, regular
@@ -4064,7 +4064,7 @@ sure you check the following things:
 @itemize @bullet
 @item When you download the IDLWAVE distribution, make sure you save the
 file under the names @file{idlwave.tar.gz}.
-@item M-TAB switches among running programs---use Esc-TAB
+@item M-@key{TAB} switches among running programs---use @key{ESC}-@key{TAB}
 instead.
 @item Other issues as yet unnamed...
 @end itemize
diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi
index bc374299730..098b28ee524 100644
--- a/doc/misc/ido.texi
+++ b/doc/misc/ido.texi
@@ -456,14 +456,14 @@ You can toggle display of the hidden buffers and files with @kbd{C-a}
 You can customize the @code{ido} group to change Ido functionality:
 
 @example
-M-x customize-group RET ido RET
+M-x customize-group @key{RET} ido @key{RET}
 @end example
 
 @noindent
 or customize a certain variable:
 
 @example
-M-x customize-variable RET ido-xxxxx
+M-x customize-variable @key{RET} ido-xxxxx @key{RET}
 @end example
 
 To modify the keybindings, use the @code{ido-setup-hook}.  For example:
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 906448c1028..8d620c720e6 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -169,13 +169,13 @@ the updates incrementally and hence is very fast.
 
 First, put @code{mairix.el} in your Emacs search path and put
 @code{(require 'mairix)} into your @file{.emacs} file.  Then, use
-@kbd{M-x customize-group mairix RET} to set your preferences for
-mairix.el.  The most important items are @emph{Mairix File Path},
-@emph{Mairix Search File} and @emph{Mairix Mail Program}.  The latter
-specifies which mail program should be used to display the mairix search
-results.  Currently, RMail, Gnus with mbox files, and VM are supported.
-If you use Gnus with maildir or mh, use the native Gnus back end
-nnmairix instead.
+@kbd{M-x customize-group @key{RET} mairix @key{RET}} to set your
+preferences for mairix.el.  The most important items are @emph{Mairix
+File Path}, @emph{Mairix Search File} and @emph{Mairix Mail Program}.
+The latter specifies which mail program should be used to display the
+mairix search results.  Currently, RMail, Gnus with mbox files, and VM
+are supported.  If you use Gnus with maildir or mh, use the native
+Gnus back end nnmairix instead.
 
 If you use another Emacs mail program which is not yet supported by
 mairix.el, it is pretty easy to integrate it.  @xref{Extending},
@@ -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 1ef67fe0cb2..0a2a6ce49d2 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -104,7 +104,7 @@ sending it.
 @end menu
 
 You can customize the Message Mode tool bar, see @kbd{M-x
-customize-apropos RET message-tool-bar}.  This feature is only available
+customize-apropos @key{RET} message-tool-bar}.  This feature is only available
 in Emacs.
 
 @node New Mail Message
@@ -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
@@ -921,7 +919,7 @@ is fully available) @acronym{IDNA} encoding happens automatically.
 
 @findex message-idna-to-ascii-rhs
 If you want to experiment with the @acronym{IDNA} encoding, you can
-invoke @kbd{M-x message-idna-to-ascii-rhs RET} in the message buffer
+invoke @kbd{M-x message-idna-to-ascii-rhs @key{RET}} in the message buffer
 to have the non-@acronym{ASCII} domain names encoded while you edit
 the message.
 
@@ -1084,7 +1082,7 @@ Since signing and especially encryption often is used when sensitive
 information is sent, you may want to have some way to ensure that your
 mail is actually signed or encrypted.  After invoking the above
 sign/encrypt commands, it is possible to preview the raw article by
-using @kbd{C-u C-c RET P} (@code{mml-preview}).  Then you can
+using @kbd{C-u C-c @key{RET} P} (@code{mml-preview}).  Then you can
 verify that your long rant about what your ex-significant other or
 whomever actually did with that funny looking person at that strange
 party the other night, actually will be sent encrypted.
@@ -1176,7 +1174,7 @@ without some kind of configuration.  Especially, you need to tell it
 where your private key and your certificate is stored.  @acronym{MML}
 uses an Emacs interface to OpenSSL, aptly named @code{smime.el}, and it
 contain a @code{custom} group used for this configuration.  So, try
-@kbd{M-x customize-group RET smime RET} and look around.
+@kbd{M-x customize-group @key{RET} smime @key{RET}} and look around.
 
 Currently there is no support for talking to a CA (or RA) to create
 your own certificate.  None is planned either.  You need to do this
@@ -1222,7 +1220,7 @@ according to two different standards, namely @acronym{PGP} or
 @node Passphrase caching
 @subsection Passphrase caching
 
-@cindex gpg-agent
+@cindex @command{gpg-agent}
 Message with EasyPG internally calls GnuPG (the @command{gpg} or
 @command{gpgsm} command) to perform
 data encryption, and in certain cases (decrypting or signing for
@@ -1379,7 +1377,7 @@ 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
+@item M-@key{RET}
 @kindex M-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
+@item @key{TAB}
 @kindex 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 5f0cc32cc48..74b17264d27 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -442,7 +442,7 @@ either @code{customize-option} or @code{add-hook}.
 @cindex point
 @cindex region
 @kindex C-@@
-@kindex C-@key{SPC}
+@kindex C-SPC
 
 There are several other terms that are used in Emacs that you should
 know. The @dfn{point} is where the cursor currently is. You can save
@@ -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}
@@ -790,7 +787,7 @@ use @kbd{F r} to pull all your messages into MH-E.
 @end quotation
 @sp 1
 
-@kindex @key{RET}
+@kindex RET
 @kindex n
 @kindex p
 
@@ -820,8 +817,8 @@ This is a test message to get the wheels churning...
 @end cartouche
 @i{After incorporating new messages}
 
-@kindex @key{DEL}
-@kindex @key{SPC}
+@kindex DEL
+@kindex SPC
 
 If you typed a long message, you can view subsequent pages with
 @key{SPC} and previous pages with @key{DEL}.
@@ -830,7 +827,7 @@ If you typed a long message, you can view subsequent pages with
 @section Processing Mail
 
 @cindex processing mail
-@kindex @key{RET}
+@kindex RET
 @kindex r
 
 The first thing we want to do is reply to the message that we sent
@@ -883,7 +880,7 @@ Type C-c C-c to send message, C-c ? for help
 @kindex C-f
 @kindex C-n
 @kindex C-p
-@kindex @key{BS}
+@kindex BS
 
 By default, MH will not add you to the address list of your replies,
 so if you find that the @samp{To:} header field is missing, don't
@@ -898,7 +895,7 @@ editing your message, send it with @kbd{C-c C-c} as before.
 @cindex @command{refile}
 @cindex MH commands, @command{refile}
 @cindex folders
-@kindex @key{SPC}
+@kindex SPC
 @kindex o
 
 You'll often want to save messages that were sent to you in an
@@ -918,7 +915,7 @@ in a moment.
 @cindex modes, MH-Folder
 @kindex d
 @kindex i
-@kindex @key{RET}
+@kindex RET
 @kindex n
 @kindex p
 @kindex x
@@ -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
@@ -1592,38 +1586,38 @@ Display cheat sheet for the MH-E commands (@code{mh-help}).
 @c -------------------------
 @cindex @samp{Message > Show Message} menu item
 @cindex menu item, @samp{Message > Show Message}
-@kindex @key{RET}
+@kindex RET
 @findex mh-show
 @item @key{RET}
 Display message (@code{mh-show}).
 @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}
 (@code{mh-toggle-mh-decode-mime-flag}).
 @c -------------------------
-@kindex @key{SPC}
+@kindex SPC
 @findex mh-page-msg
 @item @key{SPC}
 Display next page in message (@code{mh-page-msg}).
 @c -------------------------
-@kindex @key{BS}
+@kindex BS
 @findex mh-previous-page
 @item @key{BS}
 Display previous page in message (@code{mh-previous-page}).
@@ -1661,12 +1655,12 @@ Delete range (@code{mh-delete-msg}).
 Display cheat sheet for the commands of the current prefix in
 minibuffer (@code{mh-prefix-help}).
 @c -------------------------
-@kindex D @key{SPC}
+@kindex D SPC
 @findex mh-page-digest
 @item D @key{SPC}
 Display next message in digest (@code{mh-page-digest}).
 @c -------------------------
-@kindex D @key{BS}
+@kindex D BS
 @findex mh-page-digest-backwards
 @item D @key{BS}
 Display previous message in digest (@code{mh-page-digest-backwards}).
@@ -1697,12 +1691,12 @@ Delete messages with same subject or thread
 Display cheat sheet for the commands of the current prefix in
 minibuffer (@code{mh-prefix-help}).
 @c -------------------------
-@kindex K @key{TAB}
+@kindex K TAB
 @findex mh-next-button
 @item K @key{TAB}
 Go to the next button (@code{mh-next-button}).
 @c -------------------------
-@kindex K S-@key{TAB}
+@kindex K S-TAB
 @findex mh-prev-button
 @item K S-@key{TAB}
 Go to the previous button (@code{mh-prev-button}).
@@ -1844,7 +1838,7 @@ Move point to mouse event and show message (@code{mh-show-mouse}).
 Within the MH-Show buffer, the following command is defined.
 
 @table @kbd
-@kindex @key{RET}
+@kindex RET
 @kindex mouse-1
 @kindex mouse-2
 @findex mh-press-button
@@ -2017,11 +2011,11 @@ detail in the following sections.
 @findex mh-previous-page
 @findex mh-show
 @findex mh-show-mouse
-@kindex , (comma)
-@kindex . (period)
-@kindex @key{BS}
-@kindex @key{RET}
-@kindex @key{SPC}
+@kindex , @r{(comma)}
+@kindex . @r{(period)}
+@kindex BS
+@kindex RET
+@kindex SPC
 @kindex mouse-2
 
 The command @key{RET} (@code{mh-show}) displays the message that the
@@ -2101,9 +2095,9 @@ Emacs 21 and XEmacs. For more information, see
 @uref{http://quimby.gnus.org/circus/face/}.}.
 
 @cindex @command{uncompface}
-@cindex Emacs, packages, x-face
+@cindex Emacs, packages, @samp{x-face}
 @cindex Unix commands, @command{uncompface}
-@cindex x-face package
+@cindex @samp{x-face} package
 @vindex mh-show-xface
 
 Next is the traditional @samp{X-Face:} header field@footnote{The
@@ -2200,7 +2194,7 @@ highlighting of citations entirely, choose @samp{None}.
 @cindex highlighting email addresses
 @cindex links, following
 @findex goto-address-at-point
-@kindex C-c @key{RET}
+@kindex C-c RET
 @kindex mouse-2
 @vindex goto-address-highlight-p
 
@@ -2306,10 +2300,10 @@ System: type @kbd{M-! xterm -e mhshow @var{message-number}}. You can
 leave out the @samp{xterm -e} if you use @command{mhlist} or
 @command{mhstore}.}.
 
-@cindex Emacs, packages, mm-decode
-@cindex mm-decode package
+@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}
@@ -2334,9 +2328,9 @@ Attachments in MH-E are indicated by @dfn{buttons} like this:
 @findex mh-next-button
 @findex mh-press-button
 @findex mh-prev-button
-@kindex @key{RET}
-@kindex K @key{TAB}
-@kindex K S-@key{TAB}
+@kindex RET
+@kindex K TAB
+@kindex K S-TAB
 @kindex mouse-1
 @kindex mouse-2
 
@@ -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
@@ -2688,10 +2682,10 @@ buffer, including HTML buffers.
 @cindex digests
 @findex mh-page-digest
 @findex mh-page-digest-backwards
-@kindex D @key{BS}
-@kindex D @key{SPC}
-@kindex @key{BS}
-@kindex @key{SPC}
+@kindex D BS
+@kindex D SPC
+@kindex BS
+@kindex SPC
 
 A digest is a message that contains other messages. Special MH-E
 commands let you read digests conveniently. You can use @key{SPC} and
@@ -2904,8 +2898,8 @@ Another related function is the command @kbd{P F}
 faces and not. When faces are enabled, the printed message will look
 very similar to the message in the MH-Show buffer.
 
-@cindex ps-print package
-@cindex Emacs, packages, ps-print
+@cindex @samp{ps-print} package
+@cindex Emacs, packages, @samp{ps-print}
 
 MH-E uses the @samp{ps-print} package to do the printing, so you can
 customize the printing further by going to the @samp{ps-print}
@@ -2995,7 +2989,7 @@ like to change the initial default directory, customize the option
 directory for storing the content of these messages.
 
 @findex mh-store-buffer
-@kindex @key{RET}
+@kindex RET
 @kindex X s
 
 By the way, @kbd{X s} calls the Emacs Lisp function
@@ -3045,7 +3039,7 @@ message with @kbd{M-<} (@code{mh-first-msg}) and @kbd{M->}
 @findex previous-line
 @kindex C-n
 @kindex C-p
-@kindex @key{RET}
+@kindex RET
 
 You can also use the Emacs commands @kbd{C-p} (@code{previous-line})
 and @kbd{C-n} (@code{next-line}) to move up and down the scan lines in
@@ -3746,7 +3740,7 @@ The command @kbd{F p} runs @code{mh-pack-folder-hook} after
 renumbering the messages. A variable that is useful with this hook
 is @code{mh-current-folder}.
 
-@kindex @key{TAB}
+@kindex TAB
 @vindex mh-recursive-folders-flag
 
 By default, operations on folders work only one level at a time. Set
@@ -3850,16 +3844,15 @@ buffers that you would rather remove, you can use both
 
 You can use dired to manipulate the folders themselves. For example, I
 renamed my @samp{+out} folder to the more common @samp{+outbox} by
-running dired on my mail directory (@kbd{M-x dired RET ~/Mail RET}),
-moving my cursor to @samp{out} and using the command @kbd{R}
-(@code{dired-do-rename}).
+running dired on my mail directory (@kbd{M-x dired @key{RET} ~/Mail
+@key{RET}}), moving my cursor to @samp{out} and using the command
+@kbd{R} (@code{dired-do-rename}).
 
 @node Sending Mail, Editing Drafts, Folders, Top
 @chapter Sending Mail
 
 @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.
@@ -4390,28 +4381,28 @@ commands in addition to the normal Emacs editing commands to help you
 edit your draft. These can also be found in the @samp{Letter} menu.
 
 @table @kbd
-@kindex @key{SPC}
+@kindex SPC
 @findex mh-letter-complete-or-space
 @item @key{SPC}
 Perform completion or insert space (@code{mh-letter-complete-or-space}).
 @c -------------------------
-@kindex M-@key{TAB}
+@kindex M-TAB
 @findex mh-letter-complete
 @item M-@key{TAB}
 Perform completion on header field or word preceding point
 (@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}).
 @c -------------------------
-@kindex @key{TAB}
+@kindex TAB
 @findex mh-letter-next-header-field-or-indent
 @item @key{TAB}
 Cycle to next field (@code{mh-letter-next-header-field-or-indent}).
 @c -------------------------
-@kindex S-@key{TAB}
+@kindex S-TAB
 @findex mh-letter-previous-header-field
 @item S-@key{TAB}
 Cycle to the previous header field
@@ -4816,8 +4807,8 @@ draft. @xref{Folder Selection}.
 @findex indent-relative
 @findex mh-letter-next-header-field-or-indent
 @findex mh-letter-previous-header-field
-@kindex @key{TAB}
-@kindex S-@key{TAB}
+@kindex TAB
+@kindex S-TAB
 @vindex mh-compose-skipped-header-fields
 @vindex mh-letter-header-field
 
@@ -4842,9 +4833,9 @@ 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 @key{SPC}
-@kindex M-@key{TAB}
+@kindex , @r{(comma)}
+@kindex SPC
+@kindex M-TAB
 @vindex mh-alias-flash-on-comma
 @vindex mh-compose-space-does-completion-flag
 @vindex mh-letter-complete-function
@@ -4997,8 +4988,8 @@ You can also turn on the @code{mh-delete-yanked-msg-window-flag}
 option to delete the window containing the original message after
 yanking it to make more room on your screen for your reply.
 
-@cindex Emacs, packages, supercite
-@cindex supercite package
+@cindex Emacs, packages, @samp{supercite}
+@cindex @samp{supercite} package
 @kindex r
 @vindex mail-citation-hook
 @vindex mh-yank-behavior
@@ -5061,8 +5052,8 @@ and it should leave point and mark around the modified citation text
 for the next hook function. The standard prefix
 @code{mh-ins-buf-prefix} is not added if this hook is set.
 
-@cindex Emacs, packages, trivial-cite
-@cindex trivial-cite package
+@cindex Emacs, packages, @samp{trivial-cite}
+@cindex @samp{trivial-cite} package
 @vindex mh-yank-behavior
 
 For example, if you use the hook function
@@ -5499,7 +5490,7 @@ LyogWFBNICovCnN0YXRpYyBjaGFyICogc2V0aWF0aG9tZV94cG1bXSA9IHsKIjQ1IDQ1IDc2N
 @end cartouche
 @i{MH-E @sc{mime} draft ready to send}
 
-@cindex undo effects of mh-mml-to-mime
+@cindex undo effects of @code{mh-mml-to-mime}
 
 This action can be undone by running @kbd{C-_} (@code{undo}).
 
@@ -5507,7 +5498,7 @@ This action can be undone by running @kbd{C-_} (@code{undo}).
 @cindex @command{mhn}
 @cindex MH commands, @command{mhbuild}
 @cindex MH commands, @command{mhn}
-@cindex undo effects of mh-mh-to-mime
+@cindex undo effects of @code{mh-mh-to-mime}
 @findex mh-mh-to-mime
 @findex mh-mh-to-mime-undo
 @kindex C-c C-e
@@ -5723,12 +5714,12 @@ The following commands are available in MH-Letter mode with the
 exception of @code{mh-alias-reload} which can be called from anywhere.
 
 @table @kbd
-@kindex @key{SPC}
+@kindex SPC
 @findex mh-letter-complete-or-space
 @item @key{SPC}
 Perform completion or insert space (@code{mh-letter-complete-or-space}).
 @c -------------------------
-@kindex M-@key{TAB}
+@kindex M-TAB
 @findex mh-letter-complete
 @item M-@key{TAB}
 Perform completion on header field or word preceding point
@@ -5800,7 +5791,7 @@ Hook run by @code{mh-alias-reload} after loading aliases (default:
 You can use aliases when you are adding recipients to a message.
 
 @findex minibuffer-complete
-@kindex @key{TAB}
+@kindex TAB
 @vindex mh-alias-expand-aliases-flag
 @vindex mh-compose-prompt-flag
 
@@ -5814,8 +5805,8 @@ aliases to be expanded to their respective addresses in the draft.
 
 @findex mh-letter-complete
 @findex mh-letter-complete-or-space
-@kindex @key{SPC}
-@kindex M-@key{TAB}
+@kindex SPC
+@kindex M-TAB
 
 Otherwise, you can complete aliases in the header of the draft with
 @kbd{M-@key{TAB}} (@code{mh-letter-complete}) or @key{SPC}
@@ -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
@@ -6623,12 +6607,12 @@ Another few commands are available in the MH-Folder buffer resulting
 from a search.
 
 @table @kbd
-@kindex @key{TAB}
+@kindex TAB
 @findex mh-index-next-folder
 @item @key{TAB}
 Jump to the next folder marker (@code{mh-index-next-folder}).
 @c -------------------------
-@kindex S-@key{TAB}
+@kindex S-TAB
 @findex mh-index-previous-folder
 @item S-@key{TAB}
 Jump to the previous folder marker (@code{mh-index-previous-folder}).
@@ -6773,8 +6757,8 @@ method with the pick method by running the command @kbd{C-c C-p}
 @cindex @samp{+mhe-index}
 @findex mh-index-next-folder
 @findex mh-index-previous-folder
-@kindex @key{TAB}
-@kindex S-@key{TAB}
+@kindex TAB
+@kindex S-TAB
 @vindex mh-search-folder
 
 The messages that are found are put in a temporary sub-folder of
@@ -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..ac29ced8fb7 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-UP
+@kindex M-DOWN
 @findex newsticker-group-shift-feed-up
 @findex newsticker-group-shift-feed-down
 Shift the currently selected feed up and down within its group.
-@item M-S-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-UP
+@kindex M-S-DOWN
 @findex newsticker-group-shift-group-up
 @findex newsticker-group-shift-group-down
 Shift the currently selected group up and down within its parent group.
@@ -397,8 +397,8 @@ Mark current item as immortal.  Immortal items are kept forever.
 @table @kbd
 @cindex Get News
 @item v
-@itemx RET
-@itemx <mouse-1>
+@itemx @key{RET}
+@itemx mouse-1
 @findex newsticker-treeview-browse-url
 Open the link to the full article (as contained in the current
 headline) in your web browser @code{newsticker-treeview-browse-url}).
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 17931905f1a..4434636b7f2 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -749,7 +749,7 @@ Specific header arguments
 
 Miscellaneous
 
-* Completion::                  M-TAB guesses completions
+* Completion::                  M-@key{TAB} guesses completions
 * Easy templates::              Quick insertion of structural elements
 * Speed keys::                  Electric commands at the beginning of a headline
 * Code evaluation security::    Org mode files evaluate inline code
@@ -884,7 +884,8 @@ We @b{strongly recommend} to stick to a single installation method.
 @subsubheading Using Emacs packaging system
 
 Recent Emacs distributions include a packaging system which lets you install
-Elisp libraries.  You can install Org with @kbd{M-x package-install RET org}.
+Elisp libraries.  You can install Org with @kbd{M-x package-install @key{RET}
+org}.
 
 @noindent @b{Important}: you need to do this in a session where no @code{.org} file has
 been visited, i.e., where no Org built-in function have been loaded.
@@ -1011,10 +1012,10 @@ version of Org available---if you are running an outdated version, it is
 quite possible that the bug has been fixed already.  If the bug persists,
 prepare a report and provide as much information as possible, including the
 version information of Emacs (@kbd{M-x emacs-version @key{RET}}) and Org
-(@kbd{M-x org-version RET}), as well as the Org related setup in the Emacs
-init file.  The easiest way to do this is to use the command
+(@kbd{M-x org-version @key{RET}}), as well as the Org related setup in the
+Emacs init file.  The easiest way to do this is to use the command
 @example
-@kbd{M-x org-submit-bug-report RET}
+@kbd{M-x org-submit-bug-report @key{RET}}
 @end example
 @noindent which will put all this information into an Emacs mail buffer so
 that you only need to add your description.  If you are not sending the Email
@@ -1074,7 +1075,7 @@ Reload uncompiled versions of all Org mode Lisp files.  The backtrace
 contains much more information if it is produced with uncompiled code.
 To do this, use
 @example
-@kbd{C-u M-x org-reload RET}
+@kbd{C-u M-x org-reload @key{RET}}
 @end example
 @noindent
 or select @code{Org -> Refresh/Reload -> Reload Org uncompiled} from the
@@ -1134,7 +1135,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
@@ -1340,9 +1341,9 @@ following lines anywhere in the buffer:
 #+STARTUP: showeverything
 @end example
 
-@cindex property, VISIBILITY
+@cindex property, @code{VISIBILITY}
 @noindent
-Furthermore, any entries with a @samp{VISIBILITY} property (@pxref{Properties
+Furthermore, any entries with a @code{VISIBILITY} property (@pxref{Properties
 and columns}) will get their visibility adapted accordingly.  Allowed values
 for this property are @code{folded}, @code{children}, @code{content}, and
 @code{all}.
@@ -1350,7 +1351,7 @@ for this property are @code{folded}, @code{children}, @code{content}, and
 @table @asis
 @orgcmd{C-u C-u @key{TAB},org-set-startup-visibility}
 Switch back to the startup visibility of the buffer, i.e., whatever is
-requested by startup options and @samp{VISIBILITY} properties in individual
+requested by startup options and @code{VISIBILITY} properties in individual
 entries.
 @end table
 
@@ -1390,7 +1391,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}}
@@ -1451,18 +1452,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
@@ -1728,10 +1729,10 @@ one.
 @end table
 
 @table @kbd
-@kindex M-S-@key{RET}
+@kindex M-S-RET
 @item M-S-@key{RET}
 Insert a new item with a checkbox (@pxref{Checkboxes}).
-@kindex S-@key{down}
+@kindex S-DOWN
 @item S-up
 @itemx S-down
 @cindex shift-selection-mode
@@ -1741,25 +1742,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-UP
+@kindex M-DOWN
 @item M-up
 @itemx M-down
 Move the item including subitems up/down@footnote{See
 @code{org-list-use-circular-motion} for a cyclic behavior.} (swap with
 previous/next item of same indentation).  If the list is ordered, renumbering
 is automatic.
-@kindex M-@key{left}
-@kindex M-@key{right}
+@kindex M-LEFT
+@kindex M-RIGHT
 @item M-left
 @itemx M-right
 Decrease/increase the indentation of an item, leaving children alone.
-@kindex M-S-@key{left}
-@kindex M-S-@key{right}
-@item M-S-@key{left}
-@itemx M-S-@key{right}
+@kindex M-S-LEFT
+@kindex M-S-RIGHT
+@item M-S-@key{LEFT}
+@itemx M-S-@key{RIGHT}
 Decrease/increase the indentation of the item, including subitems.
 Initially, the item tree is selected based on current indentation.  When
 these commands are executed several times in direct succession, the initially
@@ -1797,9 +1798,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-LEFT
+@kindex S-RIGHT
+@item S-@key{LEFT}/@key{RIGHT}
 @vindex org-support-shift-select
 This command also cycles bullet styles when the cursor in on the bullet or
 anywhere in an item line, details depending on
@@ -1817,7 +1818,7 @@ or by a custom function.
 @cindex drawers
 @cindex visibility cycling, drawers
 
-@cindex org-insert-drawer
+@cindex @code{org-insert-drawer}
 @kindex C-c C-x d
 Sometimes you want to keep information associated with an entry, but you
 normally don't want to see it.  For this, Org mode has @emph{drawers}.  They
@@ -1873,7 +1874,7 @@ export output.  Property drawers are not affected by this variable: configure
 Org mode uses begin...end blocks for various purposes from including source
 code examples (@pxref{Literal examples}) to capturing time logging
 information (@pxref{Clocking work time}).  These blocks can be folded and
-unfolded by pressing TAB in the begin line.  You can also get all blocks
+unfolded by pressing @key{TAB} in the begin line.  You can also get all blocks
 folded at startup by configuring the option @code{org-hide-block-startup}
 or on a per-file basis by using
 
@@ -1997,7 +1998,7 @@ a separate window.  The window can be closed by pressing @kbd{C-c '}.
 If you like the intuitive way the Org mode structure editing and list
 formatting works, you might want to use these commands in other modes like
 Text mode or Mail mode as well.  The minor mode @code{orgstruct-mode} makes
-this possible.   Toggle the mode with @kbd{M-x orgstruct-mode RET}, or
+this possible.   Toggle the mode with @kbd{M-x orgstruct-mode @key{RET}}, or
 turn it on by default, for example in Message mode, with one of:
 
 @lisp
@@ -2038,7 +2039,7 @@ file falls into one of the categories above.
 To explore the abstract structure of an Org buffer, run this in a buffer:
 
 @lisp
-M-: (org-element-parse-buffer) RET
+M-: (org-element-parse-buffer) @key{RET}
 @end lisp
 
 It will output a list containing the buffer's content represented as an
@@ -2132,10 +2133,10 @@ table.  But it is easier just to start typing, like
 @orgcmd{C-c C-c,org-table-align}
 Re-align the table and don't move to another field.
 @c
-@orgcmd{C-c SPC,org-table-blank-field}
+@orgcmd{C-c @key{SPC},org-table-blank-field}
 Blank the field at point.
 @c
-@orgcmd{TAB,org-table-next-field}
+@orgcmd{@key{TAB},org-table-next-field}
 Re-align the table, move to the next field.  Creates a new row if
 necessary.
 @c
@@ -2153,22 +2154,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
@@ -2250,7 +2251,7 @@ window follow the cursor through the table and always show the current
 field.  The follow mode exits automatically when the cursor leaves the table,
 or when you repeat this command with @kbd{C-u C-u C-c `}.
 @c
-@item M-x org-table-import RET
+@item M-x org-table-import @key{RET}
 Import a file as a table.  The table should be TAB or whitespace
 separated.  Use, for example, to import a spreadsheet table or data
 from a database, because these programs generally can write
@@ -2263,7 +2264,7 @@ Tables can also be imported by pasting tabular text into the Org
 buffer, selecting the pasted text with @kbd{C-x C-x} and then using the
 @kbd{C-c |} command (see above under @i{Creation and conversion}).
 @c
-@item M-x org-table-export RET
+@item M-x org-table-export @key{RET}
 @findex org-table-export
 @vindex org-table-export-default-format
 Export the table, by default as a TAB-separated file.  Use for data
@@ -2388,11 +2389,11 @@ every vertical line you would like to have:
 @cindex Orgtbl mode
 @cindex minor mode for tables
 
-If you like the intuitive way the Org table editor works, you
-might also want to use it in other modes like Text mode or Mail mode.
-The minor mode Orgtbl mode makes this possible.  You can always toggle
-the mode with @kbd{M-x orgtbl-mode RET}.  To turn it on by default, for
-example in Message mode, use
+If you like the intuitive way the Org table editor works, you might also want
+to use it in other modes like Text mode or Mail mode.  The minor mode Orgtbl
+mode makes this possible.  You can always toggle the mode with @kbd{M-x
+orgtbl-mode @key{RET}}.  To turn it on by default, for example in Message
+mode, use
 
 @lisp
 (add-hook 'message-mode-hook 'turn-on-orgtbl)
@@ -2565,7 +2566,7 @@ rows/columns.
 @cindex references, named
 @cindex name, of column or field
 @cindex constants, in calculations
-@cindex #+CONSTANTS
+@cindex @code{#+CONSTANTS}
 
 @vindex org-table-formula-constants
 @samp{$name} is interpreted as the name of a column, parameter or
@@ -2602,7 +2603,7 @@ numbers.
 @cindex references, to a different table
 @cindex name, of column or field
 @cindex constants, in calculations
-@cindex #+NAME, for table
+@cindex @code{#+NAME}, for table
 
 You may also reference constants, fields and ranges from a different table,
 either in the current file or even in a different file.  The syntax is
@@ -2824,8 +2825,8 @@ preceded by @samp{:=}, for example @samp{:=vsum(@@II..III)}.  When you press
 the formula will be stored as the formula for this field, evaluated, and the
 current field will be replaced with the result.
 
-@cindex #+TBLFM
-Formulas are stored in a special line starting with @samp{#+TBLFM:} directly
+@cindex @code{#+TBLFM}
+Formulas are stored in a special line starting with @code{#+TBLFM:} directly
 below the table.  If you type the equation in the 4th field of the 3rd data
 line in the table, the formula will look like @samp{@@3$4=$1+$2}.  When
 inserting/deleting/swapping columns and rows with the appropriate commands,
@@ -2843,7 +2844,7 @@ command
 @table @kbd
 @orgcmd{C-u C-c =,org-table-eval-formula}
 Install a new formula for the current field.  The command prompts for a
-formula with default taken from the @samp{#+TBLFM:} line, applies
+formula with default taken from the @code{#+TBLFM:} line, applies
 it to the current field, and stores it.
 @end table
 
@@ -2890,7 +2891,7 @@ the formula will be stored as the formula for the current column, evaluated
 and the current field replaced with the result.  If the field contains only
 @samp{=}, the previously stored formula for this column is used.  For each
 column, Org will only remember the most recently used formula.  In the
-@samp{#+TBLFM:} line, column formulas will look like @samp{$4=$1+$2}.  The
+@code{#+TBLFM:} line, column formulas will look like @samp{$4=$1+$2}.  The
 left-hand side of a column formula cannot be the name of column, it must be
 the numeric column reference or @code{$>}.
 
@@ -2901,7 +2902,7 @@ following command:
 @orgcmd{C-c =,org-table-eval-formula}
 Install a new formula for the current column and replace current field with
 the result of the formula.  The command prompts for a formula, with default
-taken from the @samp{#+TBLFM} line, applies it to the current field and
+taken from the @code{#+TBLFM} line, applies it to the current field and
 stores it.  With a numeric prefix argument(e.g., @kbd{C-5 C-c =}) the command
 will apply it to that many consecutive fields in the current column.
 @end table
@@ -3012,22 +3013,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-UP
+@kindex S-DOWN
+@kindex S-LEFT
+@kindex S-RIGHT
 @findex org-table-fedit-ref-up
 @findex org-table-fedit-ref-down
 @findex org-table-fedit-ref-left
 @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
@@ -3037,25 +3038,25 @@ Turn the coordinate grid in the table on and off.
 @end table
 
 Making a table field blank does not remove the formula associated with
-the field, because that is stored in a different line (the @samp{#+TBLFM}
+the field, because that is stored in a different line (the @code{#+TBLFM}
 line)---during the next recalculation the field will be filled again.
 To remove a formula from a field, you have to give an empty reply when
-prompted for the formula, or to edit the @samp{#+TBLFM} line.
+prompted for the formula, or to edit the @code{#+TBLFM} line.
 
 @kindex C-c C-c
-You may edit the @samp{#+TBLFM} directly and re-apply the changed
+You may edit the @code{#+TBLFM} directly and re-apply the changed
 equations with @kbd{C-c C-c} in that line or with the normal
 recalculation commands in the table.
 
 @anchor{Using multiple #+TBLFM lines}
-@subsubheading Using multiple #+TBLFM lines
-@cindex #+TBLFM line, multiple
-@cindex #+TBLFM
-@cindex #+TBLFM, switching
+@subsubheading Using multiple @code{#+TBLFM} lines
+@cindex @code{#+TBLFM} line, multiple
+@cindex @code{#+TBLFM}
+@cindex @code{#+TBLFM}, switching
 @kindex C-c C-c
 
 You may apply the formula temporarily.  This is useful when you
-switch the formula.  Place multiple @samp{#+TBLFM} lines right
+switch the formula.  Place multiple @code{#+TBLFM} lines right
 after the table, and then press @kbd{C-c C-c} on the formula to
 apply.  Here is an example:
 
@@ -3082,7 +3083,7 @@ Pressing @kbd{C-c C-c} in the line of @samp{#+TBLFM: $2=$1*2} yields:
 
 @noindent
 Note: If you recalculate this table (with @kbd{C-u C-c *}, for example), you
-will get the following result of applying only the first @samp{#+TBLFM} line.
+will get the following result of applying only the first @code{#+TBLFM} line.
 
 @example
 | x | y |
@@ -3131,10 +3132,10 @@ hline are left alone, assuming that these are part of the table header.
 Iterate the table by recomputing it until no further changes occur.
 This may be necessary if some computed fields use the value of other
 fields that are computed @i{later} in the calculation sequence.
-@item M-x org-table-recalculate-buffer-tables RET
+@item M-x org-table-recalculate-buffer-tables @key{RET}
 @findex org-table-recalculate-buffer-tables
 Recompute all tables in the current buffer.
-@item M-x org-table-iterate-buffer-tables RET
+@item M-x org-table-iterate-buffer-tables @key{RET}
 @findex org-table-iterate-buffer-tables
 Iterate all tables in the current buffer, in order to converge table-to-table
 dependencies.
@@ -3249,7 +3250,7 @@ functions.
 @section Org-Plot
 @cindex graph, in tables
 @cindex plot tables using Gnuplot
-@cindex #+PLOT
+@cindex @code{#+PLOT}
 
 Org-Plot can produce graphs of information stored in org tables, either
 graphically or in ASCII-art.
@@ -3432,7 +3433,7 @@ internal structure of all links, use the menu entry
 @cindex links, internal
 @cindex targets, for links
 
-@cindex property, CUSTOM_ID
+@cindex property, @code{CUSTOM_ID}
 If the link does not look like a URL, it is considered to be internal in the
 current file.  The most important case is a link like
 @samp{[[#my-custom-id]]} which will link to the entry with the
@@ -3448,7 +3449,7 @@ point to the corresponding headline.  The preferred match for a text link is
 a @i{dedicated target}: the same string in double angular brackets, like
 @samp{<<My Target>>}.
 
-@cindex #+NAME
+@cindex @code{#+NAME}
 If no dedicated target exists, the link will then try to match the exact name
 of an element within the buffer.  Naming is done with the @code{#+NAME}
 keyword, which has to be put in the line before the element it refers to, as
@@ -3640,8 +3641,8 @@ removed from the link and result in a wrong link---you should avoid putting
 timestamp in the headline.}.
 
 @vindex org-id-link-to-org-use-id
-@cindex property, CUSTOM_ID
-@cindex property, ID
+@cindex property, @code{CUSTOM_ID}
+@cindex property, @code{ID}
 If the headline has a @code{CUSTOM_ID} property, a link to this custom ID
 will be stored.  In addition or alternatively (depending on the value of
 @code{org-id-link-to-org-use-id}), a globally unique @code{ID} property will
@@ -3708,7 +3709,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
@@ -3883,7 +3884,7 @@ what the Org author is doing besides Emacs hacking with
 If you need special abbreviations just for a single Org buffer, you
 can define them in the file with
 
-@cindex #+LINK
+@cindex @code{#+LINK}
 @example
 #+LINK: bugzilla  http://10.1.2.9/bugzilla/show_bug.cgi?id=
 #+LINK: google    http://www.google.com/search?q=%s
@@ -4041,9 +4042,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-RIGHT
+@kindex S-LEFT
+@item S-@key{RIGHT} @ @r{/} @ S-@key{LEFT}
 @vindex org-treat-S-cursor-todo-selection-as-state-change
 Select the following/preceding TODO state, similar to cycling.  Useful
 mostly if more than two TODO states are possible (@pxref{TODO
@@ -4124,7 +4125,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
@@ -4190,23 +4191,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-RIGHT
+@kindex C-S-LEFT
 @kindex C-u C-u C-c C-t
 @item C-u C-u C-c C-t
-@itemx C-S-@key{right}
-@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-RIGHT
+@kindex S-LEFT
+@item S-@key{RIGHT}
+@itemx S-@key{LEFT}
+@kbd{S-@key{LEFT}} and @kbd{S-@key{RIGHT}} and walk through @emph{all}
+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}.
@@ -4229,8 +4230,8 @@ each keyword, in parentheses@footnote{All characters are allowed except
 @end lisp
 
 @vindex org-fast-tag-selection-include-todo
-If you then press @kbd{C-c C-t} followed by the selection key, the entry
-will be switched to this state.  @kbd{SPC} can be used to remove any TODO
+If you then press @kbd{C-c C-t} followed by the selection key, the entry will
+be switched to this state.  @kbd{@key{SPC}} can be used to remove any TODO
 keyword from an entry.@footnote{Check also the option
 @code{org-fast-tag-selection-include-todo}, it allows you to change the TODO
 state through the tags interface (@pxref{Setting tags}), in case you like to
@@ -4241,9 +4242,9 @@ unique keys across both sets of keywords.}
 @subsection Setting up keywords for individual files
 @cindex keyword options
 @cindex per-file keywords
-@cindex #+TODO
-@cindex #+TYP_TODO
-@cindex #+SEQ_TODO
+@cindex @code{#+TODO}
+@cindex @code{#+TYP_TODO}
+@cindex @code{#+SEQ_TODO}
 
 It can be very useful to use different aspects of the TODO mechanism in
 different files.  For file-local settings, you need to add special lines to
@@ -4269,7 +4270,7 @@ A setup for using several sets in parallel would be:
 @end example
 
 @cindex completion, of option keywords
-@kindex M-@key{TAB}
+@kindex M-TAB
 @noindent To make sure you are using the correct keyword, type
 @samp{#+} into the buffer and then use @kbd{M-@key{TAB}} completion.
 
@@ -4318,7 +4319,7 @@ foreground or a background color.
 @cindex TODO dependencies, NOBLOCKING
 
 @vindex org-enforce-todo-dependencies
-@cindex property, ORDERED
+@cindex property, @code{ORDERED}
 The structure of Org files (hierarchy and lists) makes it easy to define TODO
 dependencies.  Usually, a parent TODO task should not be marked DONE until
 all subtasks (defined as children tasks) are marked as DONE@.  And sometimes
@@ -4357,7 +4358,7 @@ property:
 @table @kbd
 @orgcmd{C-c C-x o,org-toggle-ordered-property}
 @vindex org-track-ordered-property-with-tag
-@cindex property, ORDERED
+@cindex property, @code{ORDERED}
 Toggle the @code{ORDERED} property of the current entry.  A property is used
 for this behavior because this should be local to the current entry, not
 inherited like a tag.  However, if you would like to @i{track} the value of
@@ -4419,7 +4420,7 @@ Then each time you turn an entry from a TODO (not-done) state into any of the
 DONE states, a line @samp{CLOSED: [timestamp]} will be inserted just after
 the headline.  If you turn the entry back into a TODO item through further
 state cycling, that line will be removed again.  If you turn the entry back
-to a non-TODO state (by pressing @key{C-c C-t SPC} for example), that line
+to a non-TODO state (by pressing @key{C-c C-t @key{SPC}} for example), that line
 will also be removed, unless you set @code{org-closed-keep-when-no-todo} to
 non-@code{nil}.  If you want to record a note along with the timestamp,
 use@footnote{The corresponding in-buffer setting is: @code{#+STARTUP:
@@ -4439,7 +4440,7 @@ the entry with a @samp{Closing Note} heading.
 
 @vindex org-log-states-order-reversed
 @vindex org-log-into-drawer
-@cindex property, LOG_INTO_DRAWER
+@cindex property, @code{LOG_INTO_DRAWER}
 When TODO keywords are used as workflow states (@pxref{Workflow states}), you
 might want to keep track of when a state change occurred and maybe take a
 note about this change.  You can either record just a timestamp, or a
@@ -4449,8 +4450,8 @@ headline as an itemized list, newest first@footnote{See the option
 want to get the notes out of the way into a drawer (@pxref{Drawers}).
 Customize @code{org-log-into-drawer} to get this behavior---the recommended
 drawer for this is called @code{LOGBOOK}@footnote{Note that the
-@code{LOGBOOK} drawer is unfolded when pressing @key{SPC} in the agenda to
-show an entry---use @key{C-u SPC} to keep it folded here}.  You can also
+@code{LOGBOOK} drawer is unfolded when pressing @kbd{@key{SPC}} in the agenda to
+show an entry---use @kbd{C-u @key{SPC}} to keep it folded here}.  You can also
 overrule the setting of this variable for a subtree by setting a
 @code{LOG_INTO_DRAWER} property.
 
@@ -4493,12 +4494,12 @@ to a buffer:
 #+TODO: TODO(t) WAIT(w@@/!) | DONE(d!) CANCELED(c@@)
 @end example
 
-@cindex property, LOGGING
-In order to define logging settings that are local to a subtree or a
-single item, define a LOGGING property in this entry.  Any non-empty
-LOGGING property resets all logging settings to @code{nil}.  You may then turn
-on logging for this specific tree using STARTUP keywords like
-@code{lognotedone} or @code{logrepeat}, as well as adding state specific
+@cindex property, @code{LOGGING}
+In order to define logging settings that are local to a subtree or a single
+item, define a @code{LOGGING} property in this entry.  Any non-empty
+@code{LOGGING} property resets all logging settings to @code{nil}.  You may
+then turn on logging for this specific tree using @code{#+STARTUP} keywords
+like @code{lognotedone} or @code{logrepeat}, as well as adding state specific
 settings like @code{TODO(!)}.  For example
 
 @example
@@ -4642,7 +4643,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}.
@@ -4650,7 +4651,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
@@ -4669,7 +4670,7 @@ these values (highest, lowest, default) like this (please make sure that
 the highest priority is earlier in the alphabet than the lowest
 priority):
 
-@cindex #+PRIORITIES
+@cindex @code{#+PRIORITIES}
 @example
 #+PRIORITIES: A C B
 @end example
@@ -4698,7 +4699,7 @@ be updated each time the TODO status of a child changes, or when pressing
 ** DONE Talk to neighbor
 @end example
 
-@cindex property, COOKIE_DATA
+@cindex property, @code{COOKIE_DATA}
 If a heading has both checkboxes and TODO children below it, the meaning of
 the statistics cookie become ambiguous.  Set the property
 @code{COOKIE_DATA} to either @samp{checkbox} or @samp{todo} to resolve
@@ -4770,7 +4771,7 @@ checked.
 
 @cindex statistics, for checkboxes
 @cindex checkbox statistics
-@cindex property, COOKIE_DATA
+@cindex property, @code{COOKIE_DATA}
 @vindex org-checkbox-hierarchical-statistics
 The @samp{[2/4]} and @samp{[1/3]} in the first and second line are cookies
 indicating how many checkboxes present in this entry have been checked off,
@@ -4792,7 +4793,7 @@ to either @samp{checkbox} or @samp{todo} to resolve this issue.
 
 @cindex blocking, of checkboxes
 @cindex checkbox blocking
-@cindex property, ORDERED
+@cindex property, @code{ORDERED}
 If the current outline node has an @code{ORDERED} property, checkboxes must
 be checked off in sequence, and an error will be thrown if you try to check
 off a box while there are unchecked boxes above it.
@@ -4829,7 +4830,7 @@ Insert a new item with a checkbox.  This works only if the cursor is already
 in a plain list item (@pxref{Plain lists}).
 @orgcmd{C-c C-x o,org-toggle-ordered-property}
 @vindex org-track-ordered-property-with-tag
-@cindex property, ORDERED
+@cindex property, @code{ORDERED}
 Toggle the @code{ORDERED} property of the entry, to toggle if checkboxes must
 be checked off in sequence.  A property is used for this behavior because
 this should be local to the current entry, not inherited like a tag.
@@ -4897,7 +4898,7 @@ a hypothetical level zero that surrounds the entire file.  Use a line like
 this@footnote{As with all these in-buffer settings, pressing @kbd{C-c C-c}
 activates any changes in the line.}:
 
-@cindex #+FILETAGS
+@cindex @code{#+FILETAGS}
 @example
 #+FILETAGS: :Peter:Boss:Secret:
 @end example
@@ -4931,7 +4932,7 @@ can really speed up agenda generation.
 @cindex setting tags
 @cindex tags, setting
 
-@kindex M-@key{TAB}
+@kindex M-TAB
 Tags can simply be typed into the buffer at the end of a headline.
 After a colon, @kbd{M-@key{TAB}} offers completion on tags.  There is
 also a special command for inserting tags:
@@ -4959,7 +4960,7 @@ currently used in the buffer.  You may also globally specify a hard list
 of tags with the variable @code{org-tag-alist}.  Finally you can set
 the default tags for a given file with lines like
 
-@cindex #+TAGS
+@cindex @code{#+TAGS}
 @example
 #+TAGS: @@work @@home @@tennisclub
 #+TAGS: laptop car pc sailboat
@@ -4978,7 +4979,7 @@ If you have a preferred set of tags that you would like to use in every file,
 in addition to those defined on a per-file basis by TAGS option lines, then
 you may specify a list of tags with the variable
 @code{org-tag-persistent-alist}.  You may turn this off on a per-file basis
-by adding a STARTUP option line to that file:
+by adding a @code{#+STARTUP} option line to that file:
 
 @example
 #+STARTUP: noptag
@@ -5062,17 +5063,17 @@ will turn off any other tags from that group.
 In this interface, you can also use the following special keys:
 
 @table @kbd
-@kindex @key{TAB}
+@kindex TAB
 @item @key{TAB}
 Enter a tag in the minibuffer, even if the tag is not in the predefined
 list.  You will be able to complete on all tags present in the buffer.
 You can also add several tags: just separate them with a comma.
 
-@kindex @key{SPC}
+@kindex SPC
 @item @key{SPC}
 Clear all tags for this line.
 
-@kindex @key{RET}
+@kindex RET
 @item @key{RET}
 Accept the modified set.
 
@@ -5328,8 +5329,8 @@ publishers and the number of disks in a box like this:
 
 If you want to set properties that can be inherited by any entry in a
 file, use a line like
-@cindex property, _ALL
-@cindex #+PROPERTY
+@cindex property, @code{_ALL}
+@cindex @code{#+PROPERTY}
 @example
 #+PROPERTY: NDisks_ALL 1 2 3 4
 @end example
@@ -5340,7 +5341,7 @@ buffer with @kbd{C-c C-c} to activate this change.
 If you want to add to the value of an existing property, append a @code{+} to
 the property name.  The following results in the property @code{var} having
 the value ``foo=1 bar=2''.
-@cindex property, +
+@cindex property, @code{+}
 @example
 #+PROPERTY: var  foo=1
 #+PROPERTY: var+ bar=2
@@ -5349,7 +5350,7 @@ the value ``foo=1 bar=2''.
 It is also possible to add to the values of inherited properties.  The
 following results in the @code{genres} property having the value ``Classic
 Baroque'' under the @code{Goldberg Variations} subtree.
-@cindex property, +
+@cindex property, @code{+}
 @example
 * CD collection
 ** Classic
@@ -5383,8 +5384,8 @@ in the current file will be offered as possible completions.
 @orgcmd{C-c C-x p,org-set-property}
 Set a property.  This prompts for a property name and a value.  If
 necessary, the property drawer is created as well.
-@item C-u M-x org-insert-drawer RET
-@cindex org-insert-drawer
+@item C-u M-x org-insert-drawer @key{RET}
+@cindex @code{org-insert-drawer}
 Insert a property drawer into the current entry.  The drawer will be
 inserted early in the entry, but after the lines with planning
 information like deadlines.
@@ -5393,7 +5394,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.
@@ -5415,20 +5416,20 @@ a column view (@pxref{Column view}), or to use them in queries.  The
 following property names are special and should not be used as keys in the
 properties drawer:
 
-@cindex property, special, ALLTAGS
-@cindex property, special, BLOCKED
-@cindex property, special, CLOCKSUM
-@cindex property, special, CLOCKSUM_T
-@cindex property, special, CLOSED
-@cindex property, special, DEADLINE
-@cindex property, special, FILE
-@cindex property, special, ITEM
-@cindex property, special, PRIORITY
-@cindex property, special, SCHEDULED
-@cindex property, special, TAGS
-@cindex property, special, TIMESTAMP
-@cindex property, special, TIMESTAMP_IA
-@cindex property, special, TODO
+@cindex property, special, @code{ALLTAGS}
+@cindex property, special, @code{BLOCKED}
+@cindex property, special, @code{CLOCKSUM}
+@cindex property, special, @code{CLOCKSUM_T}
+@cindex property, special, @code{CLOSED}
+@cindex property, special, @code{DEADLINE}
+@cindex property, special, @code{FILE}
+@cindex property, special, @code{ITEM}
+@cindex property, special, @code{PRIORITY}
+@cindex property, special, @code{SCHEDULED}
+@cindex property, special, @code{TAGS}
+@cindex property, special, @code{TIMESTAMP}
+@cindex property, special, @code{TIMESTAMP_IA}
+@cindex property, special, @code{TODO}
 @example
 ALLTAGS      @r{All tags, including inherited ones.}
 BLOCKED      @r{"t" if task is currently blocked by children or siblings.}
@@ -5508,7 +5509,7 @@ search will stop at this value and return @code{nil}.
 Org mode has a few properties for which inheritance is hard-coded, at
 least for the special applications for which they are used:
 
-@cindex property, COLUMNS
+@cindex property, @code{COLUMNS}
 @table @code
 @item COLUMNS
 The @code{:COLUMNS:} property defines the format of column view
@@ -5517,16 +5518,16 @@ where a @code{:COLUMNS:} property is defined is used as the starting
 point for a column view table, independently of the location in the
 subtree from where columns view is turned on.
 @item CATEGORY
-@cindex property, CATEGORY
+@cindex property, @code{CATEGORY}
 For agenda view, a category set through a @code{:CATEGORY:} property
 applies to the entire subtree.
 @item ARCHIVE
-@cindex property, ARCHIVE
+@cindex property, @code{ARCHIVE}
 For archiving, the @code{:ARCHIVE:} property may define the archive
 location for the entire subtree (@pxref{Moving subtrees}).
 @item LOGGING
-@cindex property, LOGGING
-The LOGGING property may define logging settings for an entry or a
+@cindex property, @code{LOGGING}
+The @code{LOGGING} property may define logging settings for an entry or a
 subtree (@pxref{Tracking TODO state changes}).
 @end table
 
@@ -5571,7 +5572,7 @@ done by defining a column format line.
 
 To define a column format for an entire file, use a line like
 
-@cindex #+COLUMNS
+@cindex @code{#+COLUMNS}
 @example
 #+COLUMNS: %25ITEM %TAGS %PRIORITY %TODO
 @end example
@@ -5723,17 +5724,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-LEFT
+@kindex S-RIGHT
+@item  S-@key{LEFT}/@key{RIGHT}
 Switch to the next/previous allowed value of the field.  For this, you
 have to have specified allowed values for a property.
 @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
@@ -5752,9 +5753,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
 
@@ -5766,7 +5767,7 @@ exported or printed directly.  If you want to capture a column view, use
 a @code{columnview} dynamic block (@pxref{Dynamic blocks}).  The frame
 of this block looks like this:
 
-@cindex #+BEGIN, columnview
+@cindex @code{#+BEGIN}, columnview
 @example
 * The column view
 #+BEGIN: columnview :hlines 1 :id "label"
@@ -5782,7 +5783,7 @@ This is the most important parameter.  Column view is a feature that is
 often localized to a certain (sub)tree, and the capture block might be
 at a different location in the file.  To identify the tree whose view to
 capture, you can use 4 values:
-@cindex property, ID
+@cindex property, @code{ID}
 @example
 local     @r{use the tree in which the capture block is located}
 global    @r{make a global view, including all headings in the file}
@@ -5790,7 +5791,7 @@ global    @r{make a global view, including all headings in the file}
           @r{run column view at the top of this file}
 "@var{ID}"      @r{call column view in the tree that has an @code{:ID:}}
           @r{property with the value @i{label}.  You can use}
-          @r{@kbd{M-x org-id-copy RET} to create a globally unique ID for}
+          @r{@kbd{M-x org-id-copy @key{RET}} to create a globally unique @code{ID} for}
           @r{the current entry and copy it to the kill-ring.}
 @end example
 @item :hlines
@@ -5814,7 +5815,7 @@ The following commands insert or update the dynamic block:
 @table @kbd
 @orgcmd{C-c C-x i,org-insert-columns-dblock}
 Insert a dynamic block capturing a column view.  You will be prompted
-for the scope or ID of the view.
+for the scope or @code{ID} of the view.
 @orgcmdkkc{C-c C-c,C-c C-x C-u,org-dblock-update}
 Update dynamic block at point.
 @orgcmd{C-u C-c C-x C-u,org-update-all-dblocks}
@@ -6008,11 +6009,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,
@@ -6136,25 +6137,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 @key{RET}
-@kindex M-S-@key{down}
-@kindex M-S-@key{up}
+@kindex S-RIGHT
+@kindex S-LEFT
+@kindex S-DOWN
+@kindex S-UP
+@kindex M-S-RIGHT
+@kindex M-S-LEFT
+@kindex RET
+@kindex M-S-DOWN
+@kindex M-S-UP
 
 @example
 @key{RET}              @r{Choose date at cursor in calendar.}
 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
@@ -6194,10 +6195,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
@@ -6222,7 +6223,7 @@ they refer to.
 
 @table @var
 @item DEADLINE
-@cindex DEADLINE keyword
+@cindex @code{DEADLINE} keyword
 
 Meaning: the task (most likely a TODO item, though not necessarily) is supposed
 to be finished on that date.
@@ -6248,7 +6249,7 @@ deactivated if the task gets scheduled and you set
 @code{org-agenda-skip-deadline-prewarning-if-scheduled} to @code{t}.
 
 @item SCHEDULED
-@cindex SCHEDULED keyword
+@cindex @code{SCHEDULED} keyword
 
 Meaning: you are planning to start working on that task on the given
 date.
@@ -6313,7 +6314,7 @@ an item:
 @table @kbd
 @c
 @orgcmd{C-c C-d,org-deadline}
-Insert @samp{DEADLINE} keyword along with a stamp.  Any CLOSED timestamp will
+Insert @code{DEADLINE} keyword along with a stamp.  Any CLOSED timestamp will
 be removed.  When called with a prefix arg, an existing deadline will be
 removed from the entry.  Depending on the variable
 @code{org-log-redeadline}@footnote{with corresponding @code{#+STARTUP}
@@ -6322,7 +6323,7 @@ keywords @code{logredeadline}, @code{lognoteredeadline}, and
 deadline.
 
 @orgcmd{C-c C-s,org-schedule}
-Insert @samp{SCHEDULED} keyword along with a stamp.  Any CLOSED timestamp
+Insert @code{SCHEDULED} keyword along with a stamp.  Any CLOSED timestamp
 will be removed.  When called with a prefix argument, remove the scheduling
 date from the entry.  Depending on the variable
 @code{org-log-reschedule}@footnote{with corresponding @code{#+STARTUP}
@@ -6356,8 +6357,8 @@ to the previous week before any current timestamp.
 @cindex tasks, repeated
 @cindex repeated tasks
 
-Some tasks need to be repeated again and again.  Org mode helps to
-organize such tasks using a so-called repeater in a DEADLINE, SCHEDULED,
+Some tasks need to be repeated again and again.  Org mode helps to organize
+such tasks using a so-called repeater in a @code{DEADLINE}, @code{SCHEDULED},
 or plain timestamp.  In the following example
 @example
 ** TODO Pay the rent
@@ -6374,18 +6375,18 @@ first and the warning period last: @code{DEADLINE: <2005-10-01 Sat +1m -3d>}.
 @vindex org-todo-repeat-to-state
 Deadlines and scheduled items produce entries in the agenda when they are
 over-due, so it is important to be able to mark such an entry as completed
-once you have done so.  When you mark a DEADLINE or a SCHEDULE with the TODO
-keyword DONE, it will no longer produce entries in the agenda.  The problem
-with this is, however, that then also the @emph{next} instance of the
-repeated entry will not be active.  Org mode deals with this in the following
-way: When you try to mark such an entry DONE (using @kbd{C-c C-t}), it will
-shift the base date of the repeating timestamp by the repeater interval, and
-immediately set the entry state back to TODO@footnote{In fact, the target
-state is taken from, in this sequence, the @code{REPEAT_TO_STATE} property or
-the variable @code{org-todo-repeat-to-state}.  If neither of these is
-specified, the target state defaults to the first state of the TODO state
-sequence.}.  In the example above, setting the state to DONE would actually
-switch the date like this:
+once you have done so.  When you mark a @code{DEADLINE} or a @code{SCHEDULED}
+with the TODO keyword DONE, it will no longer produce entries in the agenda.
+The problem with this is, however, that then also the @emph{next} instance of
+the repeated entry will not be active.  Org mode deals with this in the
+following way: When you try to mark such an entry DONE (using @kbd{C-c C-t}),
+it will shift the base date of the repeating timestamp by the repeater
+interval, and immediately set the entry state back to TODO@footnote{In fact,
+the target state is taken from, in this sequence, the @code{REPEAT_TO_STATE}
+property or the variable @code{org-todo-repeat-to-state}.  If neither of
+these is specified, the target state defaults to the first state of the TODO
+state sequence.}.  In the example above, setting the state to DONE would
+actually switch the date like this:
 
 @example
 ** TODO Pay the rent
@@ -6491,22 +6492,21 @@ what to do with it.
 @orgcmd{C-c C-x C-i,org-clock-in}
 @vindex org-clock-into-drawer
 @vindex org-clock-continuously
-@cindex property, LOG_INTO_DRAWER
-Start the clock on the current item (clock-in).  This inserts the CLOCK
-keyword together with a timestamp.  If this is not the first clocking of
-this item, the multiple CLOCK lines will be wrapped into a
-@code{:LOGBOOK:} drawer (see also the variable
-@code{org-clock-into-drawer}).  You can also overrule
-the setting of this variable for a subtree by setting a
-@code{CLOCK_INTO_DRAWER} or @code{LOG_INTO_DRAWER} property.
-When called with a @kbd{C-u} prefix argument,
-select the task from a list of recently clocked tasks.  With two @kbd{C-u
-C-u} prefixes, clock into the task at point and mark it as the default task;
-the default task will then always be available with letter @kbd{d} when
-selecting a clocking task.  With three @kbd{C-u C-u C-u} prefixes, force
-continuous clocking by starting the clock when the last clock stopped.@*
-@cindex property: CLOCK_MODELINE_TOTAL
-@cindex property: LAST_REPEAT
+@cindex property, @code{LOG_INTO_DRAWER}
+!Start the clock on the current item (clock-in).  This inserts the
+@code{CLOCK} keyword together with a timestamp.  If this is not the first
+clocking of this item, the multiple @code{CLOCK} lines will be wrapped into a
+@code{:LOGBOOK:} drawer (see also the variable @code{org-clock-into-drawer}).
+You can also overrule the setting of this variable for a subtree by setting a
+@code{CLOCK_INTO_DRAWER} or @code{LOG_INTO_DRAWER} property.  When called
+with a @kbd{C-u} prefix argument, select the task from a list of recently
+clocked tasks.  With two @kbd{C-u C-u} prefixes, clock into the task at point
+and mark it as the default task; the default task will then always be
+available with letter @kbd{d} when selecting a clocking task.  With three
+@kbd{C-u C-u C-u} prefixes, force continuous clocking by starting the clock
+when the last clock stopped.@*
+@cindex property, @code{CLOCK_MODELINE_TOTAL}
+@cindex property, @code{LAST_REPEAT}
 @vindex org-clock-modeline-total
 While the clock is running, the current clocking time is shown in the mode
 line, along with the title of the task.  The clock time shown will be all
@@ -6554,7 +6554,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}
@@ -6605,7 +6605,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.
@@ -6615,7 +6615,7 @@ needs to be in the @code{#+BEGIN: clocktable} line for this command.  If
 Here is an example of the frame for a clock table as it is inserted into the
 buffer with the @kbd{C-c C-x C-r} command:
 
-@cindex #+BEGIN, clocktable
+@cindex @code{#+BEGIN}, clocktable
 @example
 #+BEGIN: clocktable :maxlevel 2 :emphasize nil :scope file
 #+END: clocktable
@@ -6655,7 +6655,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.}
@@ -6691,8 +6691,8 @@ but you can specify your own function using the @code{:formatter} parameter.
              @r{E.g., @code{:sort (1 . ?a)} sorts the first column alphabetically.}
 :compact     @r{Abbreviation for @code{:level nil :indent t :narrow 40! :tcolumns 1}}
              @r{All are overwritten except if there is an explicit @code{:narrow}}
-:timestamp   @r{A timestamp for the entry, when available.  Look for SCHEDULED,}
-             @r{DEADLINE, TIMESTAMP and TIMESTAMP_IA, in this order.}
+:timestamp   @r{A timestamp for the entry, when available.  Look for @code{SCHEDULED},}
+             @r{@code{DEADLINE}, @code{TIMESTAMP} and @code{TIMESTAMP_IA}, in this order.}
 :properties  @r{List of properties that should be shown in the table.  Each}
              @r{property will get its own column.}
 :inherit-props @r{When this flag is @code{t}, the values for @code{:properties} will be inherited.}
@@ -6805,7 +6805,8 @@ identical to dealing with away time due to idleness; it is just happening due
 to a recovery event rather than a set amount of idle time.
 
 You can also check all the files visited by your Org agenda for dangling
-clocks at any time using @kbd{M-x org-resolve-clocks RET} (or @kbd{C-c C-x C-z}).
+clocks at any time using @kbd{M-x org-resolve-clocks @key{RET}} (or @kbd{C-c
+C-x C-z}).
 
 @subsubheading Continuous clocking
 @cindex continuous clocking
@@ -6823,7 +6824,7 @@ with @code{org-clock-in} and two @kbd{C-u C-u} with @code{org-clock-in-last}.
 @section Effort estimates
 @cindex effort estimates
 
-@cindex property, Effort
+@cindex property, @code{EFFORT}
 If you want to plan your work in a very detailed way, or if you need to
 produce offers with quotations of the estimated work effort, you may want to
 assign effort estimates to entries.  If you are also clocking your work, you
@@ -6861,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.
 
@@ -6965,7 +6966,7 @@ If your configuration depends on @file{org-remember.el}, you need to update
 it and use the setup described below.  To convert your
 @code{org-remember-templates}, run the command
 @example
-@kbd{M-x org-capture-import-remember-templates RET}
+@kbd{M-x org-capture-import-remember-templates @key{RET}}
 @end example
 @noindent and then customize the new variable with @kbd{M-x
 customize-variable org-capture-templates}, check the result, and save the
@@ -7041,7 +7042,7 @@ Visit the last stored capture item in its buffer.
 @end table
 
 @vindex org-capture-bookmark
-@cindex org-capture-last-stored
+@cindex @code{org-capture-last-stored}
 You can also jump to the bookmark @code{org-capture-last-stored}, which will
 automatically be created unless you set @code{org-capture-bookmark} to
 @code{nil}.
@@ -7462,12 +7463,12 @@ Delete all of a task's attachments.  A safer way is to open the directory in
 @command{dired} and delete from there.
 
 @orgcmdtkc{s,C-c C-a s,org-attach-set-directory}
-@cindex property, ATTACH_DIR
+@cindex property, @code{ATTACH_DIR}
 Set a specific directory as the entry's attachment directory.  This works by
 putting the directory path into the @code{ATTACH_DIR} property.
 
 @orgcmdtkc{i,C-c C-a i,org-attach-set-inherit}
-@cindex property, ATTACH_DIR_INHERIT
+@cindex property, @code{ATTACH_DIR_INHERIT}
 Set the @code{ATTACH_DIR_INHERIT} property, so that children will use the
 same directory for attachments as the parent does.
 @end table
@@ -7641,14 +7642,14 @@ javascript:location.href='org-protocol://open-source?&url='+
       encodeURIComponent(location.href)
 @end example
 
-@cindex protocol, open-source, :base-url property
-@cindex :base-url property in open-source protocol
-@cindex protocol, open-source, :working-directory property
-@cindex :working-directory property in open-source protocol
-@cindex protocol, open-source, :online-suffix property
-@cindex :online-suffix property in open-source protocol
-@cindex protocol, open-source, :working-suffix property
-@cindex :working-suffix property in open-source protocol
+@cindex protocol, open-source, @code{:base-url} property
+@cindex @code{:base-url} property in open-source protocol
+@cindex protocol, open-source, @code{:working-directory} property
+@cindex @code{:working-directory} property in open-source protocol
+@cindex protocol, open-source, @code{:online-suffix} property
+@cindex @code{:online-suffix} property in open-source protocol
+@cindex protocol, open-source, @code{:working-suffix} property
+@cindex @code{:working-suffix} property in open-source protocol
 @vindex org-protocol-project-alist
 The variable @code{org-protocol-project-alist} maps URLs to local file names,
 by stripping URL parameters from the end and replacing the @code{:base-url}
@@ -7685,8 +7686,8 @@ to something like
 @code{open-source} handler probably cannot find a file named
 @file{/home/user/example/print/posters.html.php} and fails.
 
-@cindex protocol, open-source, :rewrites property
-@cindex :rewrites property in open-source protocol
+@cindex protocol, open-source, @code{:rewrites} property
+@cindex @code{:rewrites property} in open-source protocol
 Such an entry in @code{org-protocol-project-alist} may hold an additional
 property @code{:rewrites}.  This property is a list of cons cells, each of
 which maps a regular expression to a path relative to the
@@ -7837,12 +7838,12 @@ see the documentation string of the variable
 
 There is also an in-buffer option for setting this variable, for example:
 
-@cindex #+ARCHIVE
+@cindex @code{#+ARCHIVE}
 @example
 #+ARCHIVE: %s_done::
 @end example
 
-@cindex property, ARCHIVE
+@cindex property, @code{ARCHIVE}
 @noindent
 If you would like to have a special ARCHIVE location for a single entry
 or a (sub)tree, give the entry an @code{:ARCHIVE:} property with the
@@ -7909,7 +7910,7 @@ To do this, each subtree is checked for open TODO entries.  If none are
 found, the command offers to set the ARCHIVE tag for the child.  If the
 cursor is @emph{not} on a headline when this command is invoked, the
 level 1 trees will be checked.
-@orgcmd{C-@kbd{TAB},org-force-cycle-archived}
+@orgcmd{C-@key{TAB},org-force-cycle-archived}
 Cycle a tree even if it is tagged with ARCHIVE.
 @orgcmd{C-c C-x A,org-archive-to-archive-sibling}
 Move the current entry to the @emph{Archive Sibling}.  This is a sibling of
@@ -8021,8 +8022,7 @@ 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
+@item M-x org-iswitchb @key{RET}
 Command to use an @code{iswitchb}-like interface to switch to and between Org
 buffers.
 @end table
@@ -8150,7 +8150,7 @@ The purpose of the weekly/daily @emph{agenda} is to act like a page of a
 paper agenda, showing all the tasks for the current week or day.
 
 @table @kbd
-@cindex org-agenda, command
+@cindex @code{org-agenda}, command
 @orgcmd{C-c a a,org-agenda-list}
 Compile an agenda for the current week from a list of Org files.  The agenda
 shows the entries for each day.  With a numeric prefix@footnote{For backward
@@ -8637,7 +8637,7 @@ associated with the item.
 @subsection Categories
 
 @cindex category
-@cindex #+CATEGORY
+@cindex @code{#+CATEGORY}
 The category is a broad label assigned to each agenda item.  By default, the
 category is simply derived from the file name, but you can also specify it
 with a special line in the buffer, like this:
@@ -8647,8 +8647,8 @@ with a special line in the buffer, like this:
 @end example
 
 @noindent
-@cindex property, CATEGORY
-If you would like to have a special CATEGORY for a single entry or a
+@cindex property, @code{CATEGORY}
+If you would like to have a special @code{CATEGORY} for a single entry or a
 (sub)tree, give the entry a @code{:CATEGORY:} property with the
 special category you want to apply as the value.
 
@@ -8788,12 +8788,13 @@ excluding the next tag.
 Org also supports automatic, context-aware tag filtering.  If the variable
 @code{org-agenda-auto-exclude-function} is set to a user-defined function,
 that function can decide which tags should be excluded from the agenda
-automatically.  Once this is set, the @kbd{/} command then accepts @kbd{RET}
-as a sub-option key and runs the auto exclusion logic.  For example, let's
-say you use a @code{Net} tag to identify tasks which need network access, an
-@code{Errand} tag for errands in town, and a @code{Call} tag for making phone
-calls.  You could auto-exclude these tags based on the availability of the
-Internet, and outside of business hours, with something like this:
+automatically.  Once this is set, the @kbd{/} command then accepts
+@kbd{@key{RET}} as a sub-option key and runs the auto exclusion logic.  For
+example, let's say you use a @code{Net} tag to identify tasks which need
+network access, an @code{Errand} tag for errands in town, and a @code{Call}
+tag for making phone calls.  You could auto-exclude these tags based on the
+availability of the Internet, and outside of business hours, with something
+like this:
 
 @smalllisp
 @group
@@ -8949,9 +8950,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}
@@ -9004,7 +9005,7 @@ Delete other windows.
 @xorgcmd{v t,org-agenda-fortnight-view}
 @xorgcmd{v m,org-agenda-month-view}
 @xorgcmd{v y,org-agenda-year-view}
-@xorgcmd{v SPC,org-agenda-reset-view}
+@xorgcmd{v @key{SPC},org-agenda-reset-view}
 @vindex org-agenda-span
 Switch to day/week/month/year view.  When switching to day or week view, this
 setting becomes the default for subsequent agenda refreshes.  Since month and
@@ -9102,8 +9103,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}
@@ -9167,8 +9168,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}
@@ -9218,12 +9219,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}
@@ -9241,19 +9242,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
@@ -9423,7 +9424,7 @@ calendars.
 @orgcmd{H,org-agenda-holidays}
 Show holidays for three months around the cursor date.
 
-@item M-x org-icalendar-combine-agenda-files RET
+@item M-x org-icalendar-combine-agenda-files @key{RET}
 Export a single iCalendar file containing entries from all agenda files.
 This is a globally available command, and also available in the agenda menu.
 
@@ -9860,7 +9861,7 @@ does not have a specific format---defined in a property, or in its file---it
 uses @code{org-columns-default-format}.
 
 @item
-@cindex property, special, CLOCKSUM
+@cindex property, special, @code{CLOCKSUM}
 If any of the columns has a summary type defined (@pxref{Column attributes}),
 turning on column view in the agenda will visit all relevant agenda files and
 make sure that the computations of this property are up to date.  This is
@@ -9884,7 +9885,7 @@ clocked time in the displayed period use clock table mode (press @kbd{R} in
 the agenda).
 
 @item
-@cindex property, special, CLOCKSUM_T
+@cindex property, special, @code{CLOCKSUM_T}
 When the column view in the agenda shows the @code{CLOCKSUM_T}, that is
 always today's clocked time for this item.  So even in the weekly agenda, the
 clocksum listed in column view only originates from today.  This lets you
@@ -9924,7 +9925,7 @@ To preserve the line breaks, indentation and blank lines in a region, but
 otherwise use normal formatting, you can use this construct, which can also
 be used to format poetry.
 
-@cindex #+BEGIN_VERSE
+@cindex @code{#+BEGIN_VERSE}
 @cindex verse blocks
 @example
 #+BEGIN_VERSE
@@ -9940,7 +9941,7 @@ When quoting a passage from another document, it is customary to format this
 as a paragraph that is indented on both the left and the right margin.  You
 can include quotations in Org mode documents like this:
 
-@cindex #+BEGIN_QUOTE
+@cindex @code{#+BEGIN_QUOTE}
 @cindex quote blocks
 @example
 #+BEGIN_QUOTE
@@ -9950,7 +9951,7 @@ but not any simpler -- Albert Einstein
 @end example
 
 If you would like to center some text, do it like this:
-@cindex #+BEGIN_CENTER
+@cindex @code{#+BEGIN_CENTER}
 @cindex center blocks
 @example
 #+BEGIN_CENTER
@@ -9994,8 +9995,8 @@ a horizontal line.
 @section Images and Tables
 
 @cindex tables, markup rules
-@cindex #+CAPTION
-@cindex #+NAME
+@cindex @code{#+CAPTION}
+@cindex @code{#+NAME}
 Both the native Org mode tables (@pxref{Tables}) and tables formatted with
 the @file{table.el} package will be exported properly.  For Org mode tables,
 the lines before the first horizontal separator line will become table header
@@ -10046,7 +10047,7 @@ or may not be handled.
 You can include literal examples that should not be subjected to
 markup.  Such examples will be typeset in monospace, so this is well suited
 for source code and similar examples.
-@cindex #+BEGIN_EXAMPLE
+@cindex @code{#+BEGIN_EXAMPLE}
 
 @example
 #+BEGIN_EXAMPLE
@@ -10085,7 +10086,7 @@ example@footnote{Code in @samp{src} blocks may also be evaluated either
 interactively or on export.  @xref{Working with source code}, for more
 information on evaluating code blocks.}, see @ref{Easy templates} for
 shortcuts to easily insert code blocks.
-@cindex #+BEGIN_SRC
+@cindex @code{#+BEGIN_SRC}
 
 @example
 #+BEGIN_SRC emacs-lisp
@@ -10407,14 +10408,14 @@ To disable it, simply use
 
 CD@LaTeX{} mode is a minor mode that is normally used in combination with a
 major @LaTeX{} mode like AUC@TeX{} in order to speed-up insertion of
-environments and math templates.  Inside Org mode, you can make use of
-some of the features of CD@LaTeX{} mode.  You need to install
-@file{cdlatex.el} and @file{texmathp.el} (the latter comes also with
-AUC@TeX{}) from @url{https://staff.fnwi.uva.nl/c.dominik/Tools/cdlatex}.
-Don't use CD@LaTeX{} mode itself under Org mode, but use the light
-version @code{org-cdlatex-mode} that comes as part of Org mode.  Turn it
-on for the current buffer with @kbd{M-x org-cdlatex-mode RET}, or for all
-Org files with
+environments and math templates.  Inside Org mode, you can make use of some
+of the features of CD@LaTeX{} mode.  You need to install @file{cdlatex.el}
+and @file{texmathp.el} (the latter comes also with AUC@TeX{}) from
+@url{https://staff.fnwi.uva.nl/c.dominik/Tools/cdlatex}.  Don't use
+CD@LaTeX{} mode itself under Org mode, but use the light version
+@code{org-cdlatex-mode} that comes as part of Org mode.  Turn it on for the
+current buffer with @kbd{M-x org-cdlatex-mode @key{RET}}, or for all Org
+files with
 
 @lisp
 (add-hook 'org-mode-hook 'turn-on-org-cdlatex)
@@ -10427,7 +10428,7 @@ details see the documentation of CD@LaTeX{} mode):
 @item
 Environment templates can be inserted with @kbd{C-c @{}.
 @item
-@kindex @key{TAB}
+@kindex TAB
 The @key{TAB} key will do template expansion if the cursor is inside a
 @LaTeX{} fragment@footnote{Org mode has a method to test if the cursor is
 inside such a fragment, see the documentation of the function
@@ -10438,7 +10439,8 @@ the second brace.  Even outside fragments, @key{TAB} will expand
 environment abbreviations at the beginning of a line.  For example, if
 you write @samp{equ} at the beginning of a line and press @key{TAB},
 this abbreviation will be expanded to an @code{equation} environment.
-To get a list of all abbreviations, type @kbd{M-x cdlatex-command-help RET}.
+To get a list of all abbreviations, type @kbd{M-x cdlatex-command-help
+@key{RET}}.
 @item
 @kindex _
 @kindex ^
@@ -10600,7 +10602,7 @@ Org document by adjusting outline visibility settings.
 @section Export settings
 @cindex Export, settings
 
-@cindex #+OPTIONS
+@cindex @code{#+OPTIONS}
 Export options can be set: globally with variables; for an individual file by
 making variables buffer-local with in-buffer settings (@pxref{In-buffer
 settings}), by setting individual keywords, or by specifying them in a
@@ -10608,7 +10610,7 @@ compact form with the @code{#+OPTIONS} keyword; or for a tree by setting
 properties (@pxref{Properties and columns}).  Options set at a specific level
 override options set at a more general level.
 
-@cindex #+SETUPFILE
+@cindex @code{#+SETUPFILE}
 In-buffer settings may appear anywhere in the file, either directly or
 indirectly through a file included using @samp{#+SETUPFILE: filename or URL}
 syntax.  Option keyword sets tailored to a particular back-end can be
@@ -10616,37 +10618,37 @@ inserted from the export dispatcher (@pxref{The export dispatcher}) using the
 @code{Insert template} command by pressing @key{#}.  To insert keywords
 individually, a good way to make sure the keyword is correct is to type
 @code{#+} and then to use @kbd{M-@key{TAB}}@footnote{Many desktops intercept
-@kbd{M-TAB} to switch windows.  Use @kbd{C-M-i} or @kbd{@key{ESC} @key{TAB}}
-instead.} for completion.
+@kbd{M-@key{TAB}} to switch windows.  Use @kbd{C-M-i} or @kbd{@key{ESC}
+@key{TAB}} instead.} for completion.
 
 The export keywords available for every back-end, and their equivalent global
 variables, include:
 
 @table @samp
 @item AUTHOR
-@cindex #+AUTHOR
+@cindex @code{#+AUTHOR}
 @vindex user-full-name
 The document author (@code{user-full-name}).
 
 @item CREATOR
-@cindex #+CREATOR
+@cindex @code{#+CREATOR}
 @vindex org-export-creator-string
 Entity responsible for output generation (@code{org-export-creator-string}).
 
 @item DATE
-@cindex #+DATE
+@cindex @code{#+DATE}
 @vindex org-export-date-timestamp-format
 A date or a time-stamp@footnote{The variable
 @code{org-export-date-timestamp-format} defines how this time-stamp will be
 exported.}.
 
 @item EMAIL
-@cindex #+EMAIL
+@cindex @code{#+EMAIL}
 @vindex user-mail-address
 The email address (@code{user-mail-address}).
 
 @item LANGUAGE
-@cindex #+LANGUAGE
+@cindex @code{#+LANGUAGE}
 @vindex org-export-default-language
 Language to use for translating certain strings
 (@code{org-export-default-language}).  With @samp{#+LANGUAGE: fr}, for
@@ -10654,7 +10656,7 @@ example, Org translates @emph{Table of contents} to the French @emph{Table
 des matières}.
 
 @item SELECT_TAGS
-@cindex #+SELECT_TAGS
+@cindex @code{#+SELECT_TAGS}
 @vindex org-export-select-tags
 The default value is @code{:export:}.  When a tree is tagged with
 @code{:export:} (@code{org-export-select-tags}), Org selects that tree and
@@ -10663,7 +10665,7 @@ see below.  When selectively exporting files with @code{:export:} tags set,
 Org does not export any text that appears before the first headline.
 
 @item EXCLUDE_TAGS
-@cindex #+EXCLUDE_TAGS
+@cindex @code{#+EXCLUDE_TAGS}
 @vindex org-export-exclude-tags
 The default value is @code{:noexport:}.  When a tree is tagged with
 @code{:noexport:} (@code{org-export-exclude-tags}), Org excludes that tree
@@ -10673,12 +10675,12 @@ unconditionally excluded from the export, even if they have an
 code blocks contained in them.
 
 @item TITLE
-@cindex #+TITLE
+@cindex @code{#+TITLE}
 @cindex document title
 Org displays this title.  For long titles, use multiple @code{#+TITLE} lines.
 
 @item EXPORT_FILE_NAME
-@cindex #+EXPORT_FILE_NAME
+@cindex @code{#+EXPORT_FILE_NAME}
 The name of the output file to be generated.  Otherwise, Org generates the
 file name based on the buffer name and the extension based on the back-end
 format.
@@ -10784,7 +10786,7 @@ Toggle inclusion of inlinetasks (@code{org-export-with-inlinetasks}).
 
 @item num:
 @vindex org-export-with-section-numbers
-@cindex property, UNNUMBERED
+@cindex property, @code{UNNUMBERED}
 Toggle section-numbers (@code{org-export-with-section-numbers}).  When set to
 number @samp{n}, Org numbers only those headlines at level @samp{n} or above.
 Setting @code{UNNUMBERED} property to non-@code{nil} disables numbering of
@@ -10860,7 +10862,7 @@ respectively, @samp{EXPORT_DATE} and @samp{EXPORT_FILE_NAME}.  Except for
 @samp{SETUPFILE}, all other keywords listed above have an @samp{EXPORT_}
 equivalent.
 
-@cindex #+BIND
+@cindex @code{#+BIND}
 @vindex org-export-allow-bind-keywords
 If @code{org-export-allow-bind-keywords} is non-@code{nil}, Emacs variables
 can become buffer-local during export by using the BIND keyword.  Its syntax
@@ -10873,7 +10875,7 @@ settings that cannot be changed using keywords.
 @cindex list of tables
 @cindex list of listings
 
-@cindex #+TOC
+@cindex @code{#+TOC}
 @vindex org-export-with-toc
 Org normally inserts the table of contents directly before the first headline
 of the file.  Org sets the TOC depth the same as the headline levels in the
@@ -10919,7 +10921,7 @@ with captions.
 #+TOC: tables             @r{build a list of tables}
 @end example
 
-@cindex property, ALT_TITLE
+@cindex property, @code{ALT_TITLE}
 Normally Org uses the headline for its entry in the table of contents.  But
 with @code{ALT_TITLE} property, a different entry can be specified for the
 table of contents.
@@ -10929,7 +10931,7 @@ table of contents.
 @cindex include files, during export
 Include other files during export.  For example, to include your @file{.emacs}
 file, you could use:
-@cindex #+INCLUDE
+@cindex @code{#+INCLUDE}
 
 @example
 #+INCLUDE: "~/.emacs" src emacs-lisp
@@ -11001,7 +11003,7 @@ Visit the include file at point.
 @node Macro replacement
 @section Macro replacement
 @cindex macro replacement, during export
-@cindex #+MACRO
+@cindex @code{#+MACRO}
 
 @vindex org-export-global-macros
 Macros replace text snippets during export.  Macros are defined globally in
@@ -11093,9 +11095,9 @@ Lines starting with zero or more whitespace characters followed by one
 @samp{#} and a whitespace are treated as comments and, as such, are not
 exported.
 
-@cindex #+BEGIN_COMMENT
-Likewise, regions surrounded by @samp{#+BEGIN_COMMENT}
-... @samp{#+END_COMMENT} are not exported.
+@cindex @code{#+BEGIN_COMMENT}
+Likewise, regions surrounded by @code{#+BEGIN_COMMENT}
+... @code{#+END_COMMENT} are not exported.
 
 @cindex comment trees
 Finally, a @samp{COMMENT} keyword at the beginning of an entry, but after any
@@ -11151,7 +11153,7 @@ settings}).
 
 @table @samp
 @item SUBTITLE
-@cindex #+SUBTITLE (ASCII)
+@cindex @code{#+SUBTITLE} (ASCII)
 The document subtitle.  For long subtitles, use multiple @code{#+SUBTITLE}
 lines in the Org file.  Org prints them on one continuous line, wrapping into
 multiple lines if necessary.
@@ -11168,8 +11170,8 @@ where levels become lists, @pxref{Export settings}.
 To insert text within the Org file by the ASCII back-end, use one the
 following constructs, inline, keyword, or export block:
 
-@cindex #+ASCII
-@cindex #+BEGIN_EXPORT ascii
+@cindex @code{#+ASCII}
+@cindex @code{#+BEGIN_EXPORT ascii}
 @example
 Inline text @@@@ascii:and additional text@@@@ within a paragraph.
 
@@ -11181,7 +11183,7 @@ Org exports text in this block only when using ASCII back-end.
 @end example
 
 @subheading ASCII specific attributes
-@cindex #+ATTR_ASCII
+@cindex @code{#+ATTR_ASCII}
 @cindex horizontal rules, in ASCII export
 
 ASCII back-end recognizes only one attribute, @code{:width}, which specifies
@@ -11195,8 +11197,8 @@ syntax for specifying widths is:
 
 @subheading ASCII special blocks
 @cindex special blocks, in ASCII export
-@cindex #+BEGIN_JUSTIFYLEFT
-@cindex #+BEGIN_JUSTIFYRIGHT
+@cindex @code{#+BEGIN_JUSTIFYLEFT}
+@cindex @code{#+BEGIN_JUSTIFYRIGHT}
 
 Besides @code{#+BEGIN_CENTER} blocks (@pxref{Paragraphs}), ASCII back-end has
 these two left and right justification blocks:
@@ -11254,7 +11256,7 @@ output.  These keywords work similar to the general options settings
 
 @table @samp
 @item BEAMER_THEME
-@cindex #+BEAMER_THEME
+@cindex @code{#+BEAMER_THEME}
 @vindex org-beamer-theme
 The Beamer layout theme (@code{org-beamer-theme}).  Use square brackets for
 options.  For example:
@@ -11263,24 +11265,24 @@ options.  For example:
 @end smallexample
 
 @item BEAMER_FONT_THEME
-@cindex #+BEAMER_FONT_THEME
+@cindex @code{#+BEAMER_FONT_THEME}
 The Beamer font theme.
 
 @item BEAMER_INNER_THEME
-@cindex #+BEAMER_INNER_THEME
+@cindex @code{#+BEAMER_INNER_THEME}
 The Beamer inner theme.
 
 @item BEAMER_OUTER_THEME
-@cindex #+BEAMER_OUTER_THEME
+@cindex @code{#+BEAMER_OUTER_THEME}
 The Beamer outer theme.
 
 @item BEAMER_HEADER
-@cindex #+BEAMER_HEADER
+@cindex @code{#+BEAMER_HEADER}
 Arbitrary lines inserted in the preamble, just before the @samp{hyperref}
 settings.
 
 @item DESCRIPTION
-@cindex #+DESCRIPTION (Beamer)
+@cindex @code{#+DESCRIPTION} (Beamer)
 The document description.  For long descriptions, use multiple
 @code{#+DESCRIPTION} keywords.  By default, @samp{hyperref} inserts
 @code{#+DESCRIPTION} as metadata.  Use @code{org-latex-hyperref-template} to
@@ -11288,7 +11290,7 @@ configure document metadata.  Use @code{org-latex-title-command} to configure
 typesetting of description as part of front matter.
 
 @item KEYWORDS
-@cindex #+KEYWORDS (Beamer)
+@cindex @code{#+KEYWORDS} (Beamer)
 The keywords for defining the contents of the document.  Use multiple
 @code{#+KEYWORDS} lines if necessary.  By default, @samp{hyperref} inserts
 @code{#+KEYWORDS} as metadata.  Use @code{org-latex-hyperref-template} to
@@ -11296,7 +11298,7 @@ configure document metadata.  Use @code{org-latex-title-command} to configure
 typesetting of keywords as part of front matter.
 
 @item SUBTITLE
-@cindex #+SUBTITLE (Beamer)
+@cindex @code{#+SUBTITLE} (Beamer)
 @vindex org-beamer-subtitle-format
 Document's subtitle.  For typesetting, use @code{org-beamer-subtitle-format}
 string.  Use @code{org-latex-hyperref-template} to configure document
@@ -11318,7 +11320,7 @@ Org headlines become Beamer frames when the heading level in Org is equal to
 @code{org-beamer-frame-level} or @code{H} value in an @code{OPTIONS} line
 (@pxref{Export settings}).
 
-@cindex property, BEAMER_ENV
+@cindex property, @code{BEAMER_ENV}
 Org overrides headlines to frames conversion for the current tree of an Org
 file if it encounters the @code{BEAMER_ENV} property set to @code{frame} or
 @code{fullframe}.  Org ignores whatever @code{org-beamer-frame-level} happens
@@ -11337,7 +11339,7 @@ aid and has no semantic relevance.}.  For valid values see
 @code{org-beamer-environments-extra}.
 
 @item
-@cindex property, BEAMER_REF
+@cindex property, @code{BEAMER_REF}
 If @code{BEAMER_ENV} is set to @code{appendix}, Org exports the entry as an
 appendix.  When set to @code{note}, Org exports the entry as a note within
 the frame or between frames, depending on the entry's heading level.  When
@@ -11351,8 +11353,8 @@ not its content.  This is useful for inserting content between frames.  It is
 also useful for properly closing a @code{column} environment.
 @end itemize
 
-@cindex property, BEAMER_ACT
-@cindex property, BEAMER_OPT
+@cindex property, @code{BEAMER_ACT}
+@cindex property, @code{BEAMER_OPT}
 When @code{BEAMER_ACT} is set for a headline, Org export translates that
 headline as an overlay or action specification.  When enclosed in square
 brackets, Org export makes the overlay specification a default.  Use
@@ -11361,7 +11363,7 @@ or block.  The Beamer export back-end wraps with appropriate angular or
 square brackets.  It also adds the @code{fragile} option for any code that may
 require a verbatim block.
 
-@cindex property, BEAMER_COL
+@cindex property, @code{BEAMER_COL}
 To create a column on the Beamer slide, use the @code{BEAMER_COL} property
 for its headline in the Org file.  Set the value of @code{BEAMER_COL} to a
 decimal number representing the fraction of the total text width.  Beamer
@@ -11376,8 +11378,8 @@ needs, use the @code{BEAMER_ENV} property.
 @node Beamer specific syntax
 @subsection Beamer specific syntax
 Since Org's Beamer export back-end is an extension of the @LaTeX{} back-end,
-it recognizes other @LaTeX{} specific syntax---for example, @samp{#+LATEX:}
-or @samp{#+ATTR_LATEX:}.  @xref{@LaTeX{} export}, for details.
+it recognizes other @LaTeX{} specific syntax---for example, @code{#+LATEX:}
+or @code{#+ATTR_LATEX:}.  @xref{@LaTeX{} export}, for details.
 
 Beamer export wraps the table of contents generated with @code{toc:t}
 @code{OPTION} keyword in a @code{frame} environment.  Beamer export does not
@@ -11390,8 +11392,8 @@ contents}).  Use square brackets for specifying options.
 
 Insert Beamer-specific code using the following constructs:
 
-@cindex #+BEAMER
-@cindex #+BEGIN_EXPORT beamer
+@cindex @code{#+BEAMER}
+@cindex @code{#+BEGIN_EXPORT beamer}
 @example
 #+BEAMER: \pause
 
@@ -11412,7 +11414,7 @@ this example:
 A *@@@@beamer:<2->@@@@useful* feature
 @end example
 
-@cindex #+ATTR_BEAMER
+@cindex @code{#+ATTR_BEAMER}
 Beamer export recognizes the @code{ATTR_BEAMER} keyword with the following
 attributes from Beamer configurations: @code{:environment} for changing local
 Beamer environment, @code{:overlay} for specifying Beamer overlays in angular
@@ -11536,66 +11538,66 @@ described in @ref{Export settings}.
 
 @table @samp
 @item DESCRIPTION
-@cindex #+DESCRIPTION (HTML)
+@cindex @code{#+DESCRIPTION} (HTML)
 This is the document's description, which the HTML exporter inserts it as a
 HTML meta tag in the HTML file.  For long descriptions, use multiple
 @code{#+DESCRIPTION} lines.  The exporter takes care of wrapping the lines
 properly.
 
 @item HTML_DOCTYPE
-@cindex #+HTML_DOCTYPE
+@cindex @code{#+HTML_DOCTYPE}
 @vindex org-html-doctype
 Specify the document type, for example: HTML5 (@code{org-html-doctype}).
 
 @item HTML_CONTAINER
-@cindex #+HTML_CONTAINER
+@cindex @code{#+HTML_CONTAINER}
 @vindex org-html-container-element
 Specify the HTML container, such as @samp{div}, for wrapping sections and
 elements (@code{org-html-container-element}).
 
 @item HTML_LINK_HOME
-@cindex #+HTML_LINK_HOME
+@cindex @code{#+HTML_LINK_HOME}
 @vindex org-html-link-home
 The URL for home link (@code{org-html-link-home}).
 
 @item HTML_LINK_UP
-@cindex #+HTML_LINK_UP
+@cindex @code{#+HTML_LINK_UP}
 @vindex org-html-link-up
 The URL for the up link of exported HTML pages (@code{org-html-link-up}).
 
 @item HTML_MATHJAX
-@cindex #+HTML_MATHJAX
+@cindex @code{#+HTML_MATHJAX}
 @vindex org-html-mathjax-options
 Options for MathJax (@code{org-html-mathjax-options}).  MathJax is used to
 typeset @LaTeX{} math in HTML documents.  @xref{Math formatting in HTML
 export}, for an example.
 
 @item HTML_HEAD
-@cindex #+HTML_HEAD
+@cindex @code{#+HTML_HEAD}
 @vindex org-html-head
 Arbitrary lines for appending to the HTML document's head
 (@code{org-html-head}).
 
 @item HTML_HEAD_EXTRA
-@cindex #+HTML_HEAD_EXTRA
+@cindex @code{#+HTML_HEAD_EXTRA}
 @vindex org-html-head-extra
 More arbitrary lines for appending to the HTML document's head
 (@code{org-html-head-extra}).
 
 @item KEYWORDS
-@cindex #+KEYWORDS (HTML)
+@cindex @code{#+KEYWORDS} (HTML)
 Keywords to describe the document's content.  HTML exporter inserts these
 keywords as HTML meta tags.  For long keywords, use multiple
 @code{#+KEYWORDS} lines.
 
 @item LATEX_HEADER
-@cindex #+LATEX_HEADER (HTML)
+@cindex @code{#+LATEX_HEADER} (HTML)
 Arbitrary lines for appending to the preamble; HTML exporter appends when
 transcoding @LaTeX{} fragments to images (@pxref{Math formatting in HTML
 export}).
 
 @item SUBTITLE
-@cindex #+SUBTITLE (HTML)
+@cindex @code{#+SUBTITLE} (HTML)
 The document's subtitle.  HTML exporter formats subtitle if document type is
 @samp{HTML5} and the CSS has a @samp{subtitle} class.
 @end table
@@ -11729,14 +11731,13 @@ back-end can insert that HTML code in the output, use this inline syntax:
 text@@@@html:</b>@@@@}.  For larger raw HTML code blocks, use these HTML
 export code blocks:
 
-@cindex #+HTML
-@cindex #+BEGIN_EXPORT html
+@cindex @code{#+HTML}
 @example
 #+HTML: Literal HTML code for export
 @end example
 
 @noindent or
-@cindex #+BEGIN_EXPORT html
+@cindex @code{#+BEGIN_EXPORT html}
 
 @example
 #+BEGIN_EXPORT html
@@ -11773,7 +11774,7 @@ example, by using @code{#+ATTR_HTML} lines to specify new format attributes
 to @code{<a>} or @code{<img>} tags.  This example shows changing the link's
 @code{title} and @code{style}:
 
-@cindex #+ATTR_HTML
+@cindex @code{#+ATTR_HTML}
 @example
 #+ATTR_HTML: :title The Org mode homepage :style color:red;
 [[http://orgmode.org]]
@@ -11789,8 +11790,8 @@ exporting Org tables to HTML.  By default, the exporter does not draw frames
 and cell borders.  To change for this for a table, use the following lines
 before the table in the Org file:
 
-@cindex #+CAPTION
-@cindex #+ATTR_HTML
+@cindex @code{#+CAPTION}
+@cindex @code{#+ATTR_HTML}
 @example
 #+CAPTION: This is a table with lines around and between cells
 #+ATTR_HTML: :border 2 :rules all :frame border
@@ -11863,8 +11864,8 @@ Org file.  This example shows realignment to right, and adds @code{alt} and
 @code{title} attributes in support of text viewers and modern web accessibility
 standards.
 
-@cindex #+CAPTION
-@cindex #+ATTR_HTML
+@cindex @code{#+CAPTION}
+@cindex @code{#+ATTR_HTML}
 @example
 #+CAPTION: A black cat stalking a spider
 #+ATTR_HTML: :alt cat/spider image :title Action! :align right
@@ -11973,7 +11974,7 @@ p.creator           @r{creator info, about org mode version}
 .done               @r{the DONE keywords, all states that count as done}
 .WAITING            @r{each TODO keyword also uses a class named after itself}
 .timestamp          @r{timestamp}
-.timestamp-kwd      @r{keyword associated with a timestamp, like SCHEDULED}
+.timestamp-kwd      @r{keyword associated with a timestamp, like @code{SCHEDULED}}
 .timestamp-wrapper  @r{span around keyword plus timestamp}
 .tag                @r{tag in a headline}
 ._HOME              @r{each tag uses itself as a class, "@@" replaced by "_"}
@@ -12001,14 +12002,14 @@ p.footnote          @r{footnote definition paragraph, containing a footnote}
 @vindex org-html-head-include-default-style
 @vindex org-html-head
 @vindex org-html-head-extra
-@cindex #+HTML_INCLUDE_STYLE
+@cindex @code{#+HTML_INCLUDE_STYLE}
 The HTML export back-end includes a compact default style in each exported
 HTML file.  To override the default style with another style, use these
 keywords in the Org file.  They will replace the global defaults the HTML
 exporter uses.
 
-@cindex #+HTML_HEAD
-@cindex #+HTML_HEAD_EXTRA
+@cindex @code{#+HTML_HEAD}
+@cindex @code{#+HTML_HEAD_EXTRA}
 @example
 #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="style1.css" />
 #+HTML_HEAD_EXTRA: <link rel="alternate stylesheet" type="text/css" href="style2.css" />
@@ -12058,7 +12059,7 @@ it on your own web server.
 
 To use this program, just add this line to the Org file:
 
-@cindex #+INFOJS_OPT
+@cindex @code{#+INFOJS_OPT}
 @example
 #+INFOJS_OPT: view:info toc:nil
 @end example
@@ -12179,7 +12180,7 @@ The @LaTeX{} export back-end has several additional keywords for customizing
 
 @table @samp
 @item DESCRIPTION
-@cindex #+DESCRIPTION (@LaTeX{})
+@cindex @code{#+DESCRIPTION} (@LaTeX{})
 The document's description.  The description along with author name,
 keywords, and related file metadata are inserted in the output file by the
 @samp{hyperref} package.  See @code{org-latex-hyperref-template} for
@@ -12188,7 +12189,7 @@ typesetting description into the document's front matter.  Use multiple
 @code{#+DESCRIPTION} lines for long descriptions.
 
 @item LATEX_CLASS
-@cindex #+LATEX_CLASS
+@cindex @code{#+LATEX_CLASS}
 @vindex org-latex-default-class
 @vindex org-latex-classes
 This is @LaTeX{} document class, such as @code{article}, @code{report},
@@ -12199,32 +12200,32 @@ default class name from the @code{org-latex-default-class} variable.  Org has
 element of @code{org-latex-classes}.
 
 @item LATEX_CLASS_OPTIONS
-@cindex #+LATEX_CLASS_OPTIONS
+@cindex @code{#+LATEX_CLASS_OPTIONS}
 Options the @LaTeX{} export back-end uses when calling the @LaTeX{} document
 class.
 
 @item LATEX_COMPILER
-@cindex #+LATEX_COMPILER
+@cindex @code{#+LATEX_COMPILER}
 @vindex org-latex-compiler
 The compiler, such as @samp{pdflatex}, @samp{xelatex}, @samp{lualatex}, for
 producing the PDF (@code{org-latex-compiler}).
 
 @item LATEX_HEADER
-@cindex #+LATEX_HEADER
+@cindex @code{#+LATEX_HEADER}
 @vindex org-latex-classes
 Arbitrary lines to add to the document's preamble, before the @samp{hyperref}
 settings.  See @code{org-latex-classes} for adjusting the structure and order
 of the @LaTeX{} headers.
 
 @item LATEX_HEADER_EXTRA
-@cindex #+LATEX_HEADER_EXTRA
+@cindex @code{#+LATEX_HEADER_EXTRA}
 @vindex org-latex-classes
 Arbitrary lines to add to the document's preamble, before the @samp{hyperref}
 settings.  See @code{org-latex-classes} for adjusting the structure and order
 of the @LaTeX{} headers.
 
 @item KEYWORDS
-@cindex #+KEYWORDS (@LaTeX{})
+@cindex @code{#+KEYWORDS} (@LaTeX{})
 The keywords for the document.  The description along with author name,
 keywords, and related file metadata are inserted in the output file by the
 @samp{hyperref} package.  See @code{org-latex-hyperref-template} for
@@ -12233,7 +12234,7 @@ typesetting description into the document's front matter.  Use multiple
 @code{#+KEYWORDS} lines if necessary.
 
 @item SUBTITLE
-@cindex #+SUBTITLE (@LaTeX{})
+@cindex @code{#+SUBTITLE} (@LaTeX{})
 @vindex org-latex-subtitle-separate
 @vindex org-latex-subtitle-format
 The document's subtitle.  It is typeset as per
@@ -12275,10 +12276,10 @@ exporter splices the values of @code{org-latex-default-packages-alist} and
 @code{org-latex-packages-alist}.  Use the same three variables to define
 custom sectioning or custom classes.
 
-@cindex #+LATEX_CLASS
-@cindex #+LATEX_CLASS_OPTIONS
-@cindex property, EXPORT_LATEX_CLASS
-@cindex property, EXPORT_LATEX_CLASS_OPTIONS
+@cindex @code{#+LATEX_CLASS}
+@cindex @code{#+LATEX_CLASS_OPTIONS}
+@cindex property, @code{EXPORT_LATEX_CLASS}
+@cindex property, @code{EXPORT_LATEX_CLASS_OPTIONS}
 The @LaTeX{} export back-end sends the @code{LATEX_CLASS_OPTIONS} keyword and
 @code{EXPORT_LATEX_CLASS_OPTIONS} property as options to the @LaTeX{}
 @code{\documentclass} macro.  The options and the syntax for specifying them,
@@ -12288,8 +12289,8 @@ including enclosing them in square brackets, follow @LaTeX{} conventions.
 #+LATEX_CLASS_OPTIONS: [a4paper,11pt,twoside,twocolumn]
 @end example
 
-@cindex #+LATEX_HEADER
-@cindex #+LATEX_HEADER_EXTRA
+@cindex @code{#+LATEX_HEADER}
+@cindex @code{#+LATEX_HEADER_EXTRA}
 The @LaTeX{} export back-end appends values from @code{LATEX_HEADER} and
 @code{LATEX_HEADER_EXTRA} keywords to the @LaTeX{} header.  The docstring for
 @code{org-latex-classes} explains in more detail.  Also note that @LaTeX{}
@@ -12323,14 +12324,14 @@ Code embedded in-line @@@@latex:any arbitrary LaTeX code@@@@ in a paragraph.
 @end example
 
 Inserting as one or more keyword lines in the Org file:
-@cindex #+LATEX
+@cindex @code{#+LATEX}
 @example
 #+LATEX: any arbitrary LaTeX code
 @end example
 
 Inserting as an export block in the Org file, where the back-end exports any
 code between begin and end markers:
-@cindex #+BEGIN_EXPORT latex
+@cindex @code{#+BEGIN_EXPORT latex}
 @example
 #+BEGIN_EXPORT latex
 any arbitrary LaTeX code
@@ -12340,7 +12341,7 @@ any arbitrary LaTeX code
 @node Tables in @LaTeX{} export
 @subsection Tables in @LaTeX{} export
 @cindex tables, in @LaTeX{} export
-@cindex #+ATTR_LATEX, in tables
+@cindex @code{#+ATTR_LATEX}, in tables
 
 The @LaTeX{} export back-end can pass several @LaTeX{} attributes for table
 contents and layout.  Besides specifying label and caption (@pxref{Images and
@@ -12444,7 +12445,7 @@ Set the caption with the @LaTeX{} command
 @subsection Images in @LaTeX{} export
 @cindex images, inline in @LaTeX{}
 @cindex inlining images in @LaTeX{}
-@cindex #+ATTR_LATEX, in images
+@cindex @code{#+ATTR_LATEX}, in images
 
 The @LaTeX{} export back-end processes image links in Org files that do not
 have descriptions, such as these links @samp{[[file:img.jpg]]} or
@@ -12514,7 +12515,7 @@ Set the @code{:comment-include} attribute to non-@code{nil} value for the
 @node Plain lists in @LaTeX{} export
 @subsection Plain lists in @LaTeX{} export
 @cindex plain lists, in @LaTeX{} export
-@cindex #+ATTR_LATEX, in plain lists
+@cindex @code{#+ATTR_LATEX}, in plain lists
 
 The @LaTeX{} export back-end accepts the @code{:environment} and
 @code{:options} attributes for plain lists.  Both attributes work together
@@ -12548,7 +12549,7 @@ four:
 @node Source blocks in @LaTeX{} export
 @subsection Source blocks in @LaTeX{} export
 @cindex source blocks, in @LaTeX{} export
-@cindex #+ATTR_LATEX, in source blocks
+@cindex @code{#+ATTR_LATEX}, in source blocks
 
 The @LaTeX{} export back-end can make source code blocks into floating
 objects through the attributes @code{:float} and @code{:options}.  For
@@ -12595,7 +12596,7 @@ variables.
 @subsection Example blocks in @LaTeX{} export
 @cindex example blocks, in @LaTeX{} export
 @cindex verbatim blocks, in @LaTeX{} export
-@cindex #+ATTR_LATEX, in example blocks
+@cindex @code{#+ATTR_LATEX}, in example blocks
 
 The @LaTeX{} export back-end wraps the contents of example blocks in a
 @samp{verbatim} environment.  To change this behavior to use another
@@ -12615,7 +12616,7 @@ This sentence is false.
 @cindex special blocks, in @LaTeX{} export
 @cindex abstract, in @LaTeX{} export
 @cindex proof, in @LaTeX{} export
-@cindex #+ATTR_LATEX, in special blocks
+@cindex @code{#+ATTR_LATEX}, in special blocks
 
 
 For other special blocks in the Org file, the @LaTeX{} export back-end makes
@@ -12663,7 +12664,7 @@ example:
 @node Horizontal rules in @LaTeX{} export
 @subsection Horizontal rules in @LaTeX{} export
 @cindex horizontal rules, in @LaTeX{} export
-@cindex #+ATTR_LATEX, in horizontal rules
+@cindex @code{#+ATTR_LATEX}, in horizontal rules
 
 The @LaTeX{} export back-end converts horizontal rules by the specified
 @code{:width} and @code{:thickness} attributes.  For example:
@@ -12747,10 +12748,10 @@ executable.  Without @file{zip}, export cannot finish.
 @anchor{x-export-to-odt}
 @cindex region, active
 @cindex active region
-@cindex transient-mark-mode
+@cindex @code{transient-mark-mode}
 @table @kbd
 @orgcmd{C-c C-e o o,org-odt-export-to-odt}
-@cindex property EXPORT_FILE_NAME
+@cindex property, @code{EXPORT_FILE_NAME}
 
 Export as OpenDocument Text file.
 
@@ -12787,13 +12788,13 @@ output.  Setting these keywords works similar to the general options
 
 @table @samp
 @item DESCRIPTION
-@cindex #+DESCRIPTION (ODT)
+@cindex @code{#+DESCRIPTION} (ODT)
 This is the document's description, which the ODT export back-end inserts as
 document metadata.  For long descriptions, use multiple @code{#+DESCRIPTION}
 lines.
 
 @item KEYWORDS
-@cindex #+KEYWORDS (ODT)
+@cindex @code{#+KEYWORDS} (ODT)
 The keywords for the document.  The ODT export back-end inserts the
 description along with author name, keywords, and related file metadata as
 metadata in the output file.  Use multiple @code{#+KEYWORDS} lines if
@@ -12848,7 +12849,7 @@ generic commands:
 @vindex org-odt-convert
 @table @kbd
 
-@item M-x org-odt-convert RET
+@item M-x org-odt-convert @key{RET}
 Convert an existing document from one format to another.  With a prefix
 argument, opens the newly produced file.
 @end table
@@ -12882,7 +12883,7 @@ Open one, modify, and save as either OpenDocument Text (@file{.odt}) or
 OpenDocument Template (@file{.ott}) file.
 
 @item
-@cindex #+ODT_STYLES_FILE
+@cindex @code{#+ODT_STYLES_FILE}
 @vindex org-odt-styles-file
 Customize the variable @code{org-odt-styles-file} and point it to the
 newly created file.  For additional configuration options
@@ -12941,7 +12942,7 @@ back-end honors any table alignments and relative widths for columns
 Note that the ODT export back-end interprets column widths as weighted
 ratios, the default weight being 1.
 
-@cindex #+ATTR_ODT
+@cindex @code{#+ATTR_ODT}
 
 Specifying @code{:rel-width} property on an @code{#+ATTR_ODT} line controls
 the width of the table.  For example:
@@ -12998,7 +12999,7 @@ when clicked jumps to @uref{http://Orgmode.org} website, do the following
 
 @subsubheading Sizing and scaling of embedded images
 
-@cindex #+ATTR_ODT
+@cindex @code{#+ATTR_ODT}
 Control the size and scale of the embedded images with the @code{#+ATTR_ODT}
 attribute.
 
@@ -13054,7 +13055,7 @@ height:width ratio, do the following
 
 @subsubheading Anchoring of images
 
-@cindex #+ATTR_ODT
+@cindex @code{#+ATTR_ODT}
 The ODT export back-end can anchor images to @samp{"as-char"},
 @samp{"paragraph"}, or @samp{"page"}.  Set the preferred anchor using the
 @code{:anchor} property of the @code{#+ATTR_ODT} line.
@@ -13123,10 +13124,10 @@ To quickly verify the reliability of the @LaTeX{}-to-MathML converter, use
 the following commands:
 
 @table @kbd
-@item M-x org-odt-export-as-odf RET
+@item M-x org-odt-export-as-odf @key{RET}
 Convert a @LaTeX{} math snippet to an OpenDocument formula (@file{.odf}) file.
 
-@item M-x org-odt-export-as-odf-and-open RET
+@item M-x org-odt-export-as-odf-and-open @key{RET}
 Convert a @LaTeX{} math snippet to an OpenDocument formula (@file{.odf}) file
 and open the formula file with the system-registered application.
 @end table
@@ -13452,7 +13453,7 @@ This paragraph is specially formatted and uses bold text.
 @subsubheading Customizing tables in ODT export
 @cindex tables, in ODT export
 
-@cindex #+ATTR_ODT
+@cindex @code{#+ATTR_ODT}
 Override the default table format by specifying a custom table style with the
 @code{#+ATTR_ODT} line.  For a discussion on default formatting of tables
 @pxref{Tables in ODT export}.
@@ -13696,52 +13697,52 @@ Texinfo output.  Setting these keywords works similar to the general options
 @table @samp
 
 @item SUBTITLE
-@cindex #+SUBTITLE (Texinfo)
+@cindex @code{#+SUBTITLE} (Texinfo)
 The document subtitle.
 
 @item SUBAUTHOR
-@cindex #+SUBAUTHOR
+@cindex @code{#+SUBAUTHOR}
 The document subauthor.
 
 @item TEXINFO_FILENAME
-@cindex #+TEXINFO_FILENAME
+@cindex @code{#+TEXINFO_FILENAME}
 The Texinfo filename.
 
 @item TEXINFO_CLASS
-@cindex #+TEXINFO_CLASS
+@cindex @code{#+TEXINFO_CLASS}
 @vindex org-texinfo-default-class
 The default document class (@code{org-texinfo-default-class}), which must be
 a member of @code{org-texinfo-classes}.
 
 @item TEXINFO_HEADER
-@cindex #+TEXINFO_HEADER
+@cindex @code{#+TEXINFO_HEADER}
 Arbitrary lines inserted at the end of the header.
 
 @item TEXINFO_POST_HEADER
-@cindex #+TEXINFO_POST_HEADER
+@cindex @code{#+TEXINFO_POST_HEADER}
 Arbitrary lines inserted after the end of the header.
 
 @item TEXINFO_DIR_CATEGORY
-@cindex #+TEXINFO_DIR_CATEGORY
+@cindex @code{#+TEXINFO_DIR_CATEGORY}
 The directory category of the document.
 
 @item TEXINFO_DIR_TITLE
-@cindex #+TEXINFO_DIR_TITLE
+@cindex @code{#+TEXINFO_DIR_TITLE}
 The directory title of the document.
 
 @item TEXINFO_DIR_DESC
-@cindex #+TEXINFO_DIR_DESC
+@cindex @code{#+TEXINFO_DIR_DESC}
 The directory description of the document.
 
 @item TEXINFO_PRINTED_TITLE
-@cindex #+TEXINFO_PRINTED_TITLE
+@cindex @code{#+TEXINFO_PRINTED_TITLE}
 The printed title of the document.
 @end table
 
 @node Texinfo file header
 @subsection Texinfo file header
 
-@cindex #+TEXINFO_FILENAME
+@cindex @code{#+TEXINFO_FILENAME}
 After creating the header for a Texinfo file, the Texinfo back-end
 automatically generates a name and destination path for the Info file.  To
 override this default with a more sensible path and name, specify the
@@ -13749,8 +13750,8 @@ override this default with a more sensible path and name, specify the
 
 @vindex org-texinfo-coding-system
 @vindex org-texinfo-classes
-@cindex #+TEXINFO_HEADER
-@cindex #+TEXINFO_CLASS
+@cindex @code{#+TEXINFO_HEADER}
+@cindex @code{#+TEXINFO_CLASS}
 Along with the output's file name, the Texinfo header also contains language
 details (@pxref{Export settings}) and encoding system as set in the
 @code{org-texinfo-coding-system} variable.  Insert @code{#+TEXINFO_HEADER}
@@ -13764,14 +13765,14 @@ setting the @code{#+TEXINFO_CLASS} keyword to that class.
 @node Texinfo title and copyright page
 @subsection Texinfo title and copyright page
 
-@cindex #+TEXINFO_PRINTED_TITLE
+@cindex @code{#+TEXINFO_PRINTED_TITLE}
 The default template for hard copy output has a title page with
 @code{#+TITLE} and @code{#+AUTHOR} (@pxref{Export settings}).  To replace the
 regular @code{#+TITLE} with something different for the printed version, use
 the @code{#+TEXINFO_PRINTED_TITLE} and @code{#+SUBTITLE} keywords.  Both
 expect raw Texinfo code for setting their values.
 
-@cindex #+SUBAUTHOR
+@cindex @code{#+SUBAUTHOR}
 If one @code{#+AUTHOR} is not sufficient, add multiple @code{#+SUBAUTHOR}
 keywords.  They have to be set in raw Texinfo code.
 
@@ -13781,7 +13782,7 @@ keywords.  They have to be set in raw Texinfo code.
 #+TEXINFO_PRINTED_TITLE: This Long Title@@inlinefmt@{tex,@@*@} Is Broken in @@TeX@{@}
 @end example
 
-@cindex property, COPYING
+@cindex property, @code{COPYING}
 Copying material is defined in a dedicated headline with a non-@code{nil}
 @code{:COPYING:} property.  The back-end inserts the contents within a
 @code{@@copying} command at the beginning of the document.  The heading
@@ -13809,9 +13810,9 @@ Copyright information is printed on the back of the title page.
 @cindex @code{install-info} parameters, in Texinfo export
 @cindex Texinfo export, @code{install-info} parameters
 
-@cindex #+TEXINFO_DIR_CATEGORY
-@cindex #+TEXINFO_DIR_TITLE
-@cindex #+TEXINFO_DIR_DESC
+@cindex @code{#+TEXINFO_DIR_CATEGORY}
+@cindex @code{#+TEXINFO_DIR_TITLE}
+@cindex @code{#+TEXINFO_DIR_DESC}
 The end result of the Texinfo export process is the creation of an Info file.
 This Info file's metadata has variables for category, title, and description:
 @code{#+TEXINFO_DIR_CATEGORY}, @code{#+TEXINFO_DIR_TITLE}, and
@@ -13831,7 +13832,7 @@ Here is an example that writes to the Info directory file:
 
 @vindex org-texinfo-classes
 @vindex org-texinfo-default-class
-@cindex #+TEXINFO_CLASS
+@cindex @code{#+TEXINFO_CLASS}
 The Texinfo export back-end uses a pre-defined scheme to convert Org
 headlines to an equivalent Texinfo structuring commands.  A scheme like this
 maps top-level headlines to numbered chapters tagged as @code{@@chapter} and
@@ -13846,12 +13847,12 @@ If an Org headline's level has no associated Texinfo structuring command, or
 is below a certain threshold (@pxref{Export settings}), then the Texinfo
 export back-end makes it into a list item.
 
-@cindex property, APPENDIX
+@cindex property, @code{APPENDIX}
 The Texinfo export back-end makes any headline with a non-@code{nil}
 @code{:APPENDIX:} property into an appendix.  This happens independent of the
 Org headline level or the @code{#+TEXINFO_CLASS}.
 
-@cindex property, DESCRIPTION
+@cindex property, @code{DESCRIPTION}
 The Texinfo export back-end creates a menu entry after the Org headline for
 each regular sectioning structure.  To override this with a shorter menu
 entry, use the @code{:ALT_TITLE:} property (@pxref{Table of contents}).
@@ -13877,22 +13878,22 @@ Top Node,,texinfo}, for more information.
 @node Indices
 @subsection Indices
 
-@cindex #+CINDEX
+@cindex @code{#+CINDEX}
 @cindex concept index, in Texinfo export
 @cindex Texinfo export, index, concept
-@cindex #+FINDEX
+@cindex @code{#+FINDEX}
 @cindex function index, in Texinfo export
 @cindex Texinfo export, index, function
-@cindex #+KINDEX
+@cindex @code{#+KINDEX}
 @cindex keystroke index, in Texinfo export
 @cindex Texinfo export, keystroke index
-@cindex #+PINDEX
+@cindex @code{#+PINDEX}
 @cindex program index, in Texinfo export
 @cindex Texinfo export, program index
-@cindex #+TINDEX
+@cindex @code{#+TINDEX}
 @cindex data type index, in Texinfo export
 @cindex Texinfo export, data type index
-@cindex #+VINDEX
+@cindex @code{#+VINDEX}
 @cindex variable index, in Texinfo export
 @cindex Texinfo export, variable index
 The Texinfo export back-end recognizes these indexing keywords if used in the
@@ -13905,7 +13906,7 @@ escaped with @samp{@@} if they not belong to a Texinfo command.
 #+CINDEX: Defining indexing entries
 @end example
 
-@cindex property, INDEX
+@cindex property, @code{INDEX}
 For the back-end to generate an index entry for a headline, set the
 @code{:INDEX:} property to @samp{cp} or @samp{vr}.  These abbreviations come
 from Texinfo that stand for concept index and variable index.  The Texinfo
@@ -13925,8 +13926,8 @@ inserts the index after its contents.
 
 Use any of the following three methods to insert or escape raw Texinfo code:
 
-@cindex #+TEXINFO
-@cindex #+BEGIN_EXPORT texinfo
+@cindex @code{#+TEXINFO}
+@cindex @code{#+BEGIN_EXPORT texinfo}
 @example
 Richard @@@@texinfo:@@sc@{@@@@Stallman@@@@texinfo:@}@@@@ commence' GNU.
 
@@ -13941,10 +13942,10 @@ This paragraph is preceded by...
 
 @node Plain lists in Texinfo export
 @subsection Plain lists in Texinfo export
-@cindex #+ATTR_TEXINFO, in plain lists
+@cindex @code{#+ATTR_TEXINFO}, in plain lists
 @cindex Two-column tables, in Texinfo export
 
-@cindex :table-type attribute, in Texinfo export
+@cindex @code{:table-type} attribute, in Texinfo export
 The Texinfo export back-end by default converts description lists in the Org
 file using the default command @code{@@table}, which results in a table with
 two columns.  To change this behavior, specify @code{:table-type} with
@@ -13952,14 +13953,14 @@ two columns.  To change this behavior, specify @code{:table-type} with
 @inforef{Two-column Tables,,texinfo}.
 
 @vindex org-texinfo-table-default-markup
-@cindex :indic attribute, in Texinfo export
+@cindex @code{:indic} attribute, in Texinfo export
 The Texinfo export back-end by default also applies a text highlight based on
 the defaults stored in @code{org-texinfo-table-default-markup}.  To override
 the default highlight command, specify another one with the @code{:indic}
 attribute.
 
 @cindex Multiple entries in two-column tables, in Texinfo export
-@cindex :sep attribute, in Texinfo export
+@cindex @code{:sep} attribute, in Texinfo export
 Org syntax is limited to one entry per list item.  Nevertheless, the Texinfo
 export back-end can split that entry according to any text provided through
 the @code{:sep} attribute.  Each part then becomes a new entry in the first
@@ -13985,7 +13986,7 @@ This is the common text for variables foo and bar.
 
 @node Tables in Texinfo export
 @subsection Tables in Texinfo export
-@cindex #+ATTR_TEXINFO, in tables
+@cindex @code{#+ATTR_TEXINFO}, in tables
 
 When exporting tables, the Texinfo export back-end uses the widest cell width
 in each column.  To override this and instead specify as fractions of line
@@ -13998,7 +13999,7 @@ length, use the @code{:columns} attribute.  See example below.
 
 @node Images in Texinfo export
 @subsection Images in Texinfo export
-@cindex #+ATTR_TEXINFO, in images
+@cindex @code{#+ATTR_TEXINFO}, in images
 
 Insert a file link to the image in the Org file, and the Texinfo export
 back-end inserts the image.  These links must have the usual supported image
@@ -14013,7 +14014,7 @@ the text using Texinfo code, as shown in the example:
 
 @node Special blocks in Texinfo export
 @subsection Special blocks
-@cindex #+ATTR_TEXINFO, in special blocks
+@cindex @code{#+ATTR_TEXINFO}, in special blocks
 
 The Texinfo export back-end converts special blocks to commands with the same
 name.  It also adds any @code{:options} attributes to the end of the command,
@@ -14136,7 +14137,7 @@ configure the variable @code{org-icalendar-categories}.  To assign clock
 alarms based on time, configure the @code{org-icalendar-alarm-time} variable.
 
 @vindex org-icalendar-store-UID
-@cindex property, ID
+@cindex property, @code{ID}
 The iCalendar format standard requires globally unique identifier---UID---for
 each entry.  The iCalendar export back-end creates UIDs during export.  To
 save a copy of the UID in the Org file set the variable
@@ -14165,26 +14166,27 @@ and write it to @code{org-icalendar-combined-agenda-file} file name.
 
 @vindex org-use-property-inheritance
 @vindex org-icalendar-include-body
-@cindex property, SUMMARY
-@cindex property, DESCRIPTION
-@cindex property, LOCATION
-@cindex property, TIMEZONE
-The iCalendar export back-end includes SUMMARY, DESCRIPTION, LOCATION and
-TIMEZONE properties from the Org entries when exporting.  To force the
-back-end to inherit the LOCATION and TIMEZONE properties, configure the
-@code{org-use-property-inheritance} variable.
-
-When Org entries do not have SUMMARY, DESCRIPTION and LOCATION properties,
-the iCalendar export back-end derives the summary from the headline, and
-derives the description from the body of the Org item.  The
-@code{org-icalendar-include-body} variable limits the maximum number of
+@cindex property, @code{SUMMARY}
+@cindex property, @code{DESCRIPTION}
+@cindex property, @code{LOCATION}
+@cindex property, @code{TIMEZONE}
+The iCalendar export back-end includes @code{SUMMARY}, @code{DESCRIPTION},
+@code{LOCATION} and @code{TIMEZONE} properties from the Org entries when
+exporting.  To force the back-end to inherit the @code{LOCATION} and
+@code{TIMEZONE} properties, configure the @code{org-use-property-inheritance}
+variable.
+
+When Org entries do not have @code{SUMMARY}, @code{DESCRIPTION} and
+@code{LOCATION} properties, the iCalendar export back-end derives the summary
+from the headline, and derives the description from the body of the Org item.
+The @code{org-icalendar-include-body} variable limits the maximum number of
 characters of the content are turned into its description.
 
-The TIMEZONE property can be used to specify a per-entry time zone, and will
-be applied to any entry with timestamp information.  Time zones should be
-specified as per the IANA time zone database format, e.g.@: ``Asia/Almaty''.
-Alternately, the property value can be ``UTC'', to force UTC time for this
-entry only.
+The @code{TIMEZONE} property can be used to specify a per-entry time zone,
+and will be applied to any entry with timestamp information.  Time zones
+should be specified as per the IANA time zone database format, e.g.@:
+``Asia/Almaty''.  Alternately, the property value can be ``UTC'', to force
+UTC time for this entry only.
 
 Exporting to iCalendar format depends in large part on the capabilities of
 the destination application.  Some are more lenient than others.  Consult the
@@ -14429,7 +14431,7 @@ In-place conversions are particularly handy for quick conversion of tables
 and lists in foreign buffers.  For example, turn on the minor mode @code{M-x
 orgstruct-mode} in an HTML buffer, then use the convenient Org keyboard
 commands to create a list, select it, and covert it to HTML with @code{M-x
-org-html-convert-region-to-html RET}.
+org-html-convert-region-to-html @key{RET}}.
 
 
 @node Publishing
@@ -14473,7 +14475,7 @@ and many other properties of a project.
 
 @node Project alist
 @subsection The variable @code{org-publish-project-alist}
-@cindex org-publish-project-alist
+@cindex @code{org-publish-project-alist}
 @cindex projects, for publishing
 
 @vindex org-publish-project-alist
@@ -14929,7 +14931,7 @@ The file will be created when first publishing a project with the
 "theindex.inc"}.  You can then build around this include statement by adding
 a title, style information, etc.
 
-@cindex #+INDEX
+@cindex @code{#+INDEX}
 Index entries are specified with @code{#+INDEX} keyword.  An entry that
 contains an exclamation mark will create a sub item.
 
@@ -15100,8 +15102,8 @@ such as not inside comments and fixed width areas.  Here's a sample
 #+END_SRC
 @end example
 
-Org can take the code in the block between the @samp{#+BEGIN_SRC} and
-@samp{#+END_SRC} tags, and format, compile, execute, and show the results.
+Org can take the code in the block between the @code{#+BEGIN_SRC} and
+@code{#+END_SRC} tags, and format, compile, execute, and show the results.
 Org can simplify many housekeeping tasks essential to modern code
 maintenance.  That's why these blocks in Org mode literature are sometimes
 referred to as @samp{live code} blocks (as compared to the static text and
@@ -15110,7 +15112,7 @@ block by tweaking the headers for compiling, execution, extraction.
 
 Org's @samp{src} code block type is one of many block types, such as quote,
 export, verse, latex, example, and verbatim.  This section pertains to
-@samp{src} code blocks between @samp{#+BEGIN_SRC} and @samp{#+END_SRC}
+@code{src} code blocks between @code{#+BEGIN_SRC} and @code{#+END_SRC}
 
 For editing @samp{src} code blocks, Org provides native Emacs major-modes.
 That leverages the latest Emacs features for that source code language mode.
@@ -15172,8 +15174,8 @@ Details of Org's facilities for working with source code are shown next.
 @section Structure of code blocks
 @cindex code block, structure
 @cindex source code, block structure
-@cindex #+NAME
-@cindex #+BEGIN_SRC
+@cindex @code{#+NAME}
+@cindex @code{#+BEGIN_SRC}
 
 Org offers two ways to structure source code in Org documents: in a
 @samp{src} block, and directly inline.  Both specifications are shown below.
@@ -15215,7 +15217,7 @@ results.  Code from other blocks, other files, and from table formulas
 (@pxref{The spreadsheet}) can use the name to reference a @samp{src} block.
 This naming serves the same purpose as naming Org tables.  Org mode requires
 unique names.  For duplicate names, Org mode's behavior is undefined.
-@cindex #+NAME
+@cindex @code{#+NAME}
 @item #+BEGIN_SRC
 @item #+END_SRC
 Mandatory.  They mark the start and end of a block that Org requires.  The
@@ -15426,7 +15428,7 @@ block header arguments: One, set @code{padline} (@pxref{padline}) to true
 @section Evaluating code blocks
 @cindex code block, evaluating
 @cindex source code, evaluating
-@cindex #+RESULTS
+@cindex @code{#+RESULTS}
 
 A note about security: With code evaluation comes the risk of harm.  Org
 safeguards by prompting for user's permission before executing any code in
@@ -15449,7 +15451,7 @@ evaluation from the @kbd{C-c C-c} key binding.} calls the
 @code{org-babel-execute-src-block} function, which executes the code in the
 block, collects the results, and inserts them in the buffer.
 
-@cindex #+CALL
+@cindex @code{#+CALL}
 By calling a named code block@footnote{Actually, the constructs call_<name>()
 and src_<lang>@{@} are not evaluated when they appear in a keyword line
 (i.e. lines starting with @code{#+KEYWORD:}, @pxref{In-buffer settings}).}
@@ -15732,7 +15734,7 @@ each line.  Note that Org currently accepts the plural spelling of
 @code{#+HEADER:} only as a convenience for backward-compatibility.  It may be
 removed at some point.
 
-@cindex #+HEADER:
+@cindex @code{#+HEADER:}
 
 Multi-line header arguments on an unnamed @samp{src} code block:
 
@@ -16146,7 +16148,7 @@ Interpreted as raw Org mode.  Inserted directly into the buffer.  Aligned if
 it is a table.  Usage example: @code{:results value raw}.
 @item @code{org}
 Results enclosed in a @code{BEGIN_SRC org} block.  For comma-escape, either
-@kbd{TAB} in the block, or export the file.  Usage example: @code{:results
+@key{TAB} in the block, or export the file.  Usage example: @code{:results
 value org}.
 @item @code{html}
 Results enclosed in a @code{BEGIN_EXPORT html} block.  Usage example:
@@ -16233,7 +16235,7 @@ output file, @code{:dir} specifies the default directory during @samp{src}
 code block execution.  If it is absent, then the directory associated with
 the current buffer is used.  In other words, supplying @code{:dir path}
 temporarily has the same effect as changing the current directory with
-@kbd{M-x cd path RET}, and then not supplying @code{:dir}.  Under the
+@kbd{M-x cd path @key{RET}}, and then not supplying @code{:dir}.  Under the
 surface, @code{:dir} simply sets the value of the Emacs variable
 @code{default-directory}.
 
@@ -17127,10 +17129,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-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}
 @end multitable
 
 Active key bindings in Org mode buffer:
@@ -17247,12 +17249,12 @@ emacs -Q --batch --eval "
 @chapter Miscellaneous
 
 @menu
-* Completion::                  M-TAB guesses completions
+* Completion::                  M-@key{TAB} guesses completions
 * Easy templates::              Quick insertion of structural elements
 * Speed keys::                  Electric commands at the beginning of a headline
 * Code evaluation security::    Org mode files evaluate inline code
 * Customization::               Adapting Org to changing tastes
-* In-buffer settings::          Overview of the #+KEYWORDS
+* In-buffer settings::          Overview of the @code{#+KEYWORDS}
 * The very busy C-c C-c key::   When in doubt, press C-c C-c
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org on a tty
@@ -17286,7 +17288,7 @@ is involved.  Such mode-specific hot keys have become an integral part of
 Emacs and Org provides several shortcuts.
 
 @table @kbd
-@kindex M-@key{TAB}
+@kindex M-TAB
 @item M-@key{TAB}
 Complete word at point
 @itemize @bullet
@@ -17300,7 +17302,7 @@ can be used in search links like @samp{[[*find this headline]]}.
 @item
 After @samp{:} in a headline, complete tags.  The list of tags is taken
 from the variable @code{org-tag-alist} (possibly set through the
-@samp{#+TAGS} in-buffer option, @pxref{Setting tags}), or it is created
+@code{#+TAGS} in-buffer option, @pxref{Setting tags}), or it is created
 dynamically from all tags used in the current buffer.
 @item
 After @samp{:} and not in a headline, complete property keys.  The list
@@ -17313,7 +17315,7 @@ After @samp{#+}, complete the special keywords like @samp{TYP_TODO} or
 file-specific @samp{OPTIONS}.  After option keyword is complete, pressing
 @kbd{M-@key{TAB}} again will insert example settings for that option.
 @item
-After @samp{#+STARTUP: }, complete startup keywords.
+After @code{#+STARTUP:}, complete startup keywords.
 @item
 When the point is anywhere else, complete dictionary words using Ispell.
 @end itemize
@@ -17457,8 +17459,8 @@ Org executes formulas in tables (@pxref{The spreadsheet}) either through the
 @cindex variables, for customization
 
 Org has more than 500 variables for customization.  They can be accessed
-through the usual @kbd{M-x org-customize RET} command.  Or through the Org
-menu, @code{Org->Customization->Browse Org Group}.  Org also has per-file
+through the usual @kbd{M-x org-customize @key{RET}} command.  Or through the
+Org menu, @code{Org->Customization->Browse Org Group}.  Org also has per-file
 settings for some variables (@pxref{In-buffer settings}).
 
 @node In-buffer settings
@@ -17477,13 +17479,13 @@ reopening the Org file in Emacs also activates the changes.
 @table @kbd
 @item #+ARCHIVE: %s_done::
 Sets the archive location of the agenda file.  This location applies to the
-lines until the next @samp{#+ARCHIVE} line, if any, in the Org file.  The
+lines until the next @code{#+ARCHIVE} line, if any, in the Org file.  The
 first archive location in the Org file also applies to any entries before it.
 The corresponding variable is @code{org-archive-location}.
 @item #+CATEGORY:
 Sets the category of the agenda file, which applies to the entire document.
 @item #+COLUMNS: %25ITEM ...
-@cindex property, COLUMNS
+@cindex property, @code{COLUMNS}
 Sets the default format for columns view.  Org uses this format for column
 views where there is no @code{COLUMNS} property.
 @item #+CONSTANTS: name1=value1 ...
@@ -17510,7 +17512,7 @@ have a lower ASCII number than the lowest priority.
 @item #+PROPERTY: Property_Name Value
 This line sets a default inheritance value for entries in the current
 buffer, most useful for specifying the allowed values of a property.
-@cindex #+SETUPFILE
+@cindex @code{#+SETUPFILE}
 @item #+SETUPFILE: file or URL
 The setup file or a URL pointing to such file is for additional in-buffer
 settings.  Org loads this file and parses it for any settings in it only when
@@ -17522,7 +17524,7 @@ parses the contents of this document as if it was included in the buffer.  It
 can be another Org file.  To visit the file (not a URL), @kbd{C-c '} while
 the cursor is on the line with the file name.
 @item #+STARTUP:
-@cindex #+STARTUP
+@cindex @code{#+STARTUP}
 Startup options Org uses when first visiting a file.
 
 The first set of options deals with the initial visibility of the outline
@@ -17703,7 +17705,7 @@ fnadjust    @r{automatically renumber and sort footnotes}
 nofnadjust  @r{do not renumber and sort automatically}
 @end example
 
-@cindex org-hide-block-startup
+@cindex @code{org-hide-block-startup}
 To hide blocks on startup, use these keywords.  The corresponding variable is
 @code{org-hide-block-startup}.
 @cindex @code{hideblocks}, STARTUP keyword
@@ -17713,7 +17715,7 @@ hideblocks   @r{Hide all begin/end blocks on startup}
 nohideblocks @r{Do not hide blocks on startup}
 @end example
 
-@cindex org-pretty-entities
+@cindex @code{org-pretty-entities}
 The display of entities as UTF-8 characters is governed by the variable
 @code{org-pretty-entities} and the keywords
 @cindex @code{entitiespretty}, STARTUP keyword
@@ -17728,11 +17730,11 @@ entitiesplain   @r{Leave entities plain}
 These lines specify valid tags for this file.  Org accepts multiple tags
 lines.  Tags could correspond to the @emph{fast tag selection} keys.  The
 corresponding variable is @code{org-tag-alist}.
-@cindex #+TBLFM
+@cindex @code{#+TBLFM}
 @item #+TBLFM:
 This line is for formulas for the table directly above.  A table can have
-multiple @samp{#+TBLFM:} lines.  On table recalculation, Org applies only the
-first @samp{#+TBLFM:} line.  For details see @ref{Using multiple #+TBLFM
+multiple @code{#+TBLFM:} lines.  On table recalculation, Org applies only the
+first @code{#+TBLFM:} line.  For details see @ref{Using multiple #+TBLFM
 lines} in @ref{Editing and debugging formulas}.
 @item #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+DATE:,
 @itemx #+OPTIONS:, #+BIND:,
@@ -17748,7 +17750,7 @@ The corresponding variable is @code{org-todo-keywords}.
 @node The very busy C-c C-c key
 @section The very busy C-c C-c key
 @kindex C-c C-c
-@cindex C-c C-c, overview
+@cindex @kbd{C-c C-c}, overview
 
 The @kbd{C-c C-c} key in Org serves many purposes depending on the context.
 It is probably the most over-worked, multi-purpose key combination in Org.
@@ -17912,7 +17914,8 @@ one of the following lines:
 @end example
 
 To switch between single and double stars layouts, use @kbd{M-x
-org-convert-to-odd-levels RET} and @kbd{M-x org-convert-to-oddeven-levels}.
+org-convert-to-odd-levels @key{RET}} and @kbd{M-x
+org-convert-to-oddeven-levels @key{RET}}.
 @end enumerate
 
 @node TTY keys
@@ -17929,23 +17932,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
 
 
@@ -18058,9 +18061,9 @@ bindings in Org files, and in the agenda buffer (but not during date
 selection).
 
 @example
-S-UP      @result{}  M-p             S-DOWN     @result{}  M-n
-S-LEFT    @result{}  M--             S-RIGHT    @result{}  M-+
-C-S-LEFT  @result{}  M-S--           C-S-RIGHT  @result{}  M-S-+
+S-@key{UP}      @result{}  M-p             S-@key{DOWN}     @result{}  M-n
+S-@key{LEFT}    @result{}  M--             S-@key{RIGHT}    @result{}  M-+
+C-S-@key{LEFT}  @result{}  M-S--           C-S-@key{RIGHT}  @result{}  M-S-+
 @end example
 
 @vindex org-disputed-keys
@@ -18427,7 +18430,7 @@ the mode is C, then:
 At the location of source, Org needs a special line to direct Orgtbl to
 translate and to find the target for inserting the translated table.  For
 example:
-@cindex #+ORGTBL
+@cindex @code{#+ORGTBL}
 @example
 #+ORGTBL: SEND table_name translation_function arguments...
 @end example
@@ -18465,7 +18468,7 @@ Put the table after an @samp{END} statement.  For example @samp{\bye} in
 @TeX{} and @samp{\end@{document@}} in @LaTeX{}.
 @item
 Comment and uncomment each line of the table during edits.  The @kbd{M-x
-orgtbl-toggle-comment RET} command makes toggling easy.
+orgtbl-toggle-comment @key{RET}} command makes toggling easy.
 @end itemize
 
 @node A @LaTeX{} example
@@ -18478,10 +18481,10 @@ provided by @file{comment.sty}.  To activate it, put
 radio table skeleton@footnote{By default this works only for @LaTeX{}, HTML,
 and Texinfo.  Configure the variable @code{orgtbl-radio-table-templates} to
 install templates for other export formats.}  with the command @kbd{M-x
-orgtbl-insert-radio-table RET}, which prompts for a table name.  For example,
-if @samp{salesfigures} is the name, the template inserts:
+orgtbl-insert-radio-table @key{RET}}, which prompts for a table name.  For
+example, if @samp{salesfigures} is the name, the template inserts:
 
-@cindex #+ORGTBL, SEND
+@cindex @code{#+ORGTBL}, @samp{SEND}
 @example
 % BEGIN RECEIVE ORGTBL salesfigures
 % END RECEIVE ORGTBL salesfigures
@@ -18497,7 +18500,7 @@ The line @code{#+ORGTBL: SEND} tells Orgtbl mode to use the function
 @code{orgtbl-to-latex} to convert the table to @LaTeX{} format, then insert
 the table at the target (receive) location named @code{salesfigures}.  Now
 the table is ready for data entry.  It can even use spreadsheet
-features@footnote{If the @samp{#+TBLFM} line contains an odd number of dollar
+features@footnote{If the @code{#+TBLFM} line contains an odd number of dollar
 characters, this may cause problems with font-lock in @LaTeX{} mode.  As
 shown in the example you can fix this by adding an extra line inside the
 @code{comment} environment that is used to balance the dollar expressions.
@@ -18628,14 +18631,14 @@ translator functions by posting them to the Org users mailing list,
 @node Radio lists
 @subsection Radio lists
 @cindex radio lists
-@cindex org-list-insert-radio-list
+@cindex @code{org-list-insert-radio-list}
 
 Call the @code{org-list-insert-radio-list} function to insert a radio list
 template in HTML, @LaTeX{}, and Texinfo mode documents.  Sending and
 receiving radio lists works is the same as for radio tables (@pxref{Radio
 tables}) except for these differences:
 
-@cindex #+ORGLST
+@cindex @code{#+ORGLST}
 @itemize @minus
 @item
 Orgstruct mode must be active.
@@ -18679,7 +18682,7 @@ time}).
 Dynamic blocks can have names and function parameters.  The syntax is similar
 to @samp{src} code block specifications:
 
-@cindex #+BEGIN:dynamic block
+@cindex @code{#+BEGIN}, dynamic block
 @example
 #+BEGIN: myblock :parameter1 value1 :parameter2 value2 ...
 
@@ -18941,7 +18944,7 @@ priority-n   @r{The computed numerical priority}
 
 @noindent
 If the selection of the agenda item was based on a timestamp, including those
-items with @samp{DEADLINE} and @samp{SCHEDULED} keywords, then Org includes
+items with @code{DEADLINE} and @code{SCHEDULED} keywords, then Org includes
 date and time in the output.
 
 If the selection of the agenda item was based on a timestamp  (or
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 1163530e7a2..4c61aed5b3e 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -63,10 +63,11 @@ modify this GNU manual.''
 @node Top
 @top PCL-CVS
 
-This manual describes PCL-CVS, the GNU Emacs front-end to CVS@.  It
-is nowhere near complete, so you are advised to use @kbd{M-x
-customize-group RET pcl-cvs @key{RET}} and to look at the documentation strings
-of the various commands and major modes for further information.
+This manual describes PCL-CVS, the GNU Emacs front-end to CVS@.  It is
+nowhere near complete, so you are advised to use @kbd{M-x
+customize-group @key{RET} pcl-cvs @key{RET}} and to look at the
+documentation strings of the various commands and major modes for
+further information.
 @c This manual is updated to release 2.5 of PCL-CVS.
 
 @insertcopying
@@ -1109,7 +1110,7 @@ Tag all selected files by running @samp{cvs tag} on
 them (@code{cvs-mode-tag}).  It's usually preferable to tag a directory
 at a time.  Rather than selecting all files (which too often doesn't
 select all files but only the few that are displayed), clear the
-selection with @kbd{M-DEL} (@code{cvs-mode-unmark-all-files}), position
+selection with @kbd{M-@key{DEL}} (@code{cvs-mode-unmark-all-files}), position
 the cursor on the directory you want to tag and hit @kbd{t}.
 @end table
 
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 55060d09b8c..3803cb0eb7a 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -3335,7 +3335,7 @@ have to rescan the buffer in order to see it.
 @findex reftex-arg-index
 @findex TeX-arg-index@r{, AUCTeX function}
 @findex TeX-insert-macro@r{, AUCTeX function}
-@kindex C-c @key{RET}
+@kindex C-c RET
 @b{@RefTeX{} supplies macro arguments}@* When you insert a macro
 interactively with @kbd{C-c @key{RET}}, @AUCTeX{} normally prompts for
 macro arguments.  Internally, it uses the functions
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index e82162621bd..8484a7bfe23 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -1145,7 +1145,7 @@ Typing @kbd{RET} on a reference line jumps to that reference.
 
 @node MRU Bookmarks
 @section MRU Bookmarks mode
-@cindex semantic-mru-bookmark-mode
+@cindex @code{semantic-mru-bookmark-mode}
 
 Semantic MRU Bookmarks mode is a minor mode that keeps track of the
 tags you have edited, allowing you to quickly return to them later
@@ -1193,7 +1193,7 @@ declarations.  Other possible tag classes are @code{variable},
 
 @node Highlight Func Mode
 @section Highlight Func Mode
-@cindex semantic-highlight-func-mode
+@cindex @code{semantic-highlight-func-mode}
 
 Semantic Highlight Function minor mode highlights the declaration line
 of the current function or tag (that is to say, the first line that
@@ -1220,7 +1220,7 @@ Func mode.
 
 @node Tag Decoration Mode
 @section Tag Decoration Mode
-@cindex semantic-decoration-mode
+@cindex @code{semantic-decoration-mode}
 
 Semantic Tag Decoration mode ``decorates'' each tag based on certain
 arbitrary features of that tag.  Decorations are specified using the
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index 60963adcb21..aa4fe81ba52 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -209,7 +209,7 @@ remove blank cells from the returned list, which allows to use
 @findex keyboard-quit
 
 To create a new spreadsheet, visit a nonexistent file whose name ends
-  with ".ses".  For example, @kbd{C-x C-f test.ses RET}.
+with ".ses".  For example, @kbd{C-x C-f test.ses @key{RET}}.
 
 
 A @dfn{cell identifier} is a symbol with a column letter and a row
@@ -310,7 +310,7 @@ To enter something else (e.g., a vector), begin with a digit, then
 erase the digit and type whatever you want.
 
 @table @kbd
-@item RET
+@item @key{RET}
 Edit the existing formula in the current cell (@code{ses-edit-cell}).
 
 @item C-c C-c
@@ -357,7 +357,7 @@ Basic commands:
 @item w
 (@code{ses-set-column-width})
 
-@item TAB
+@item @key{TAB}
 Moves point to the next rightward cell, or inserts a new column if
 already at last cell on line, or inserts a new row if at endline
 (@code{ses-forward-or-insert}).
@@ -639,7 +639,7 @@ or a non-string is displayed as an error by using @code{#} filling.
 These commands set both formula and printer to @code{nil}:
 
 @table @kbd
-@item DEL
+@item @key{DEL}
 Clear cell and move left (@code{ses-clear-cell-backward}).
 
 @item C-d
@@ -1282,10 +1282,10 @@ avoid virus warnings, each function used in a formula needs
 
 @node Uses of defadvice in @acronym{SES}
 @section Uses of defadvice in @acronym{SES}
-@cindex defadvice
-@cindex undo-more
-@cindex copy-region-as-kill
-@cindex yank
+@findex defadvice
+@findex undo-more
+@findex copy-region-as-kill
+@findex yank
 
 @table @code
 @item undo-more
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 37bb707f63a..2d290b36885 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -123,7 +123,7 @@ bindings to manage Sieve scripts remotely. @xref{Managing Sieve}.
 
 @table @kbd
 
-@item C-c RET
+@item C-c @key{RET}
 @kindex C-c RET
 @findex sieve-manage
 @cindex manage remote sieve script
@@ -160,8 +160,8 @@ press RET on <new script> to create a new script.
 @end example
 
 One of the scripts are highlighted, and standard point navigation
-commands (@kbd{<up>}, @kbd{<down>} etc.)@: can be used to navigate the
-list.
+commands (@kbd{@key{UP}}, @kbd{@key{DOWN}} etc.)@: can be used to
+navigate the list.
 
 The following commands are available in the Manage Sieve buffer:
 
@@ -187,7 +187,7 @@ Deactivates all scripts.
 @findex sieve-remove
 Remove currently highlighted script.
 
-@item RET
+@item @key{RET}
 @item mouse-2
 @item f
 @kindex RET
@@ -272,7 +272,7 @@ The @file{sieve-manage.el} library contains low-level functionality
 for talking to a server with the @sc{managesieve} protocol.
 
 A number of user-visible variables exist, which all can be customized
-in the @code{sieve} group (@kbd{M-x customize-group RET sieve RET}):
+in the @code{sieve} group (@kbd{M-x customize-group @key{RET} sieve @key{RET}}):
 
 @table @code
 
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 6da51f798d6..c3387054baf 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -354,7 +354,7 @@ directory to hold queued messages.  It defaults to
   The function @code{smtpmail-send-queued-mail} can be used to send
 any queued mail when @code{smtpmail-queue-mail} is enabled.  It is
 typically invoked interactively with @kbd{M-x
-smtpmail-send-queued-mail RET} when you are connected to the internet.
+smtpmail-send-queued-mail @key{RET}} when you are connected to the internet.
 
 @node Server workarounds
 @chapter Server workarounds
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 6286ac12a9e..1c1b014f54e 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -87,7 +87,7 @@ on.  @xref{Basic Navigation}.
 @chapter Introduction
 @cindex introduction
 
-To start using speedbar use the command @kbd{M-x speedbar RET} or
+To start using speedbar use the command @kbd{M-x speedbar @key{RET}} or
 select it from the @samp{Options->Show/Hide} sub-menu.  This command
 will open a new frame to summarize the local files.  On X Window
 systems or on MS-Windows, speedbar's frame is twenty characters wide,
@@ -188,7 +188,7 @@ these are available, some additional common bindings are available.
 
 @cindex common keys
 @table @kbd
-@item RET
+@item @key{RET}
 @itemx e
 Edit/Open the current group or tag.  This behavior is dependent on the
 mode.  In general, files or buffers are opened in the attached frame,
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index afa3af10352..2987f629747 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -105,11 +105,11 @@ item should appear.
 To toggle @srecode{} minor mode on and off use:
 
 @example
-M-x srecode-minor-mode RET
+M-x srecode-minor-mode @key{RET}
 @end example
 or
 @example
-M-x global-srecode-minor-mode RET
+M-x global-srecode-minor-mode @key{RET}
 @end example
 
 or add
@@ -276,7 +276,8 @@ If the variable @code{srecode-insert-ask-variable-method} is set to
 instead create ``fields'' in the buffer.  A field-editing layer
 provides simple interaction through the fields.  Typing in a field
 will cause all variable locations that are the same to edit at the
-same time.  Pressing TAB on a field will move you to the next field.
+same time.  Pressing @kbd{@key{TAB}} on a field will move you to the
+next field.
 
 @node SRecode Minor Mode
 @chapter SRecode Minor Mode
@@ -284,17 +285,17 @@ same time.  Pressing TAB on a field will move you to the next field.
 The Semantic Recode minor mode enables a keymap and menu that provides
 simple access to different templates or template applications.
 
-The key prefix is @key{C-c /}.
+The key prefix is @kbd{C-c /}.
 
 If the variable @code{srecode-takeover-INS-key} is set, then the key
-@key{<insert>} can also be used.
+@kbd{@key{INSERT}} can also be used.
 
 The most important key is bound to @code{srecode-insert} which is
-@key{C-c / /}, or @key{insert insert}.  @ref{Quick Start}.
+@kbd{C-c / /}, or @kbd{@key{INSERT} @key{INSERT}}.  @ref{Quick Start}.
 
 Major keybindings are:
 
-@table @key
+@table @kbd
 @item C-c / /
 Insert a template whose name is typed into the minibuffer.
 @item C-c / <lower case letter>
@@ -338,7 +339,7 @@ will not be prompted to fill in values while the template is
 inserted.  Instead, short regions will be highlighted, and the cursor
 placed in a field.  Typing in the field will then fill in the value.
 Several fields might be linked together.  In that case, typing in one
-area will modify the other linked areas.  Pressing TAB will move
+area will modify the other linked areas.  Pressing @key{TAB} will move
 between editable fields in the template.
 
 Once the cursor moves out of the are inserted by the template, all the
diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi
index e94fba6fc6d..8fc75106d52 100644
--- a/doc/misc/vhdl-mode.texi
+++ b/doc/misc/vhdl-mode.texi
@@ -100,7 +100,7 @@ How to customize the indentation engine.
 The major version number was incremented to 3 with the addition of
 many new features for editing VHDL code to the new indentation engine,
 which was introduced in major version 2. To find the minor revision
-number of this release, use @kbd{M-x vhdl-version RET}.
+number of this release, use @kbd{M-x vhdl-version @key{RET}}.
 
 A special word of thanks goes to Rod Whitby, who wrote the
 VHDL Mode indentation engine, and to Barry Warsaw, who wrote
@@ -119,7 +119,7 @@ makes everything highly self-explaining.
 @cindex   Getting Connected
 
 To get started, simply visit a @file{.vhd} file in Emacs; or type
-@kbd{M-x vhdl-mode RET}.
+@kbd{M-x vhdl-mode @key{RET}}.
 
 @node     New Indentation Engine
 @chapter  New Indentation Engine
@@ -302,11 +302,11 @@ being used.
 
 @vindex vhdl-echo-syntactic-information-p
 @vindex echo-syntactic-information-p @r{(vhdl-)}
-@cindex TAB
+@cindex @key{TAB}
 To help you configure VHDL Mode, you can set the variable
 @code{vhdl-echo-syntactic-information-p} to non-@code{nil} so that the
 syntactic component list and calculated offset will always be echoed in
-the minibuffer when you hit @kbd{TAB}.
+the minibuffer when you hit @kbd{@key{TAB}}.
 
 
 @ignore
@@ -322,7 +322,7 @@ the minibuffer when you hit @kbd{TAB}.
 @chapter  Customizing Indentation
 @cindex   Customizing Indentation
 
-@cindex vhdl-set-offset
+@cindex @code{vhdl-set-offset}
 @cindex set-offset (vhdl-)
 The @code{vhdl-offsets-alist} variable is where you customize all your
 indentations.  You simply need to decide what additional offset you want
@@ -334,7 +334,7 @@ pre-defined styles will suit your needs, but if not, this section will
 describe how to set up basic editing configurations.  @xref{Styles}, for
 an explanation of how to set up named styles.
 
-@cindex vhdl-basic-offset
+@cindex @code{vhdl-basic-offset}
 @cindex basic-offset (vhdl-)
 As mentioned previously, the variable @code{vhdl-offsets-alist} is an
 association list between syntactic symbols and the offsets to be applied
@@ -548,7 +548,7 @@ already built-in.  These include:
 @findex vhdl-set-style
 @findex set-style @r{(vhdl-)}
 If you'd like to experiment with these built-in styles you can simply
-type @kbd{M-x vhdl-set-style RET} in a VHDL Mode buffer.
+type @kbd{M-x vhdl-set-style @key{RET}} in a VHDL Mode buffer.
 
 You will be prompted for one of the above styles (with completion).
 Enter one of the styles and hit @kbd{RET}.  Note however that setting a
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index af4c05d8e48..59df7492315 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 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 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 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
+@item @key{SPC}
 @itemx @key{RET}
-@kindex 040 @kbd{SPC} (@code{vip-scroll})
-@kindex 015 @kbd{RET} (@code{vip-scroll-back})
+@kindex 040 SPC @r{(}@code{vip-scroll}@r{)}
+@kindex 015 RET @r{(}@code{vip-scroll-back}@r{)}
 Now these keys will scroll up and down the text of current window.
 Convenient for viewing the text.
 @item s
 @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 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 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 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 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})
+@item R @var{string} @key{RET} @var{newstring}
+@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
@@ -1269,13 +1269,13 @@ vanilla, this command replaces every occurrence of @var{string} with
 @var{newstring}.  If the mode is regular expression, @var{string} is
 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})
+@item Q @var{string} @key{RET} @var{newstring}
+@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 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})
+@item @key{TAB}
+@kindex 011 TAB @r{(}@code{indent-for-tab-command}@r{)}
 Indent line for current major mode (@code{indent-for-tab-command}).
 @item C-j
-@kindex 012 @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 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..2b300f6493c 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 @key{ESC}
-@kindex @kbd{i}
+@kindex C-z
+@kindex ESC
+@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
@@ -1083,7 +1083,7 @@ remembered (This is called ``learn mode'' in some editors.)
 where @samp{register} is any character from @samp{a} through @samp{z}.  Then
 you can execute this macro using @kbd{@@register}.  It is, of course,
 possible to yank some text into a register and execute it using
-@kbd{@@register}.  Typing @kbd{@@@@}, @kbd{@@RET}, or @kbd{@@C-j} will
+@kbd{@@register}.  Typing @kbd{@@@@}, @kbd{@@@key{RET}}, or @kbd{@@C-j} will
 execute the last macro that was executed using @kbd{@@register}.
 
 Viper will automatically lowercase the register, so that pressing the
@@ -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 META SHIFT button1up
+@kindex META 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 CR
+@kindex +
+@kindex -
+@kindex ^
+@kindex $
+@kindex C-p
+@kindex LF
+@kindex 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 META button1up
+@kindex META button2up
 
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
diff --git a/etc/NEWS.26 b/etc/NEWS.26
index a8880d0f323..cb4048dee4a 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -1219,7 +1219,7 @@ backend", which has been updated to benefit from the new UI features.
 ** Term
 
 ---
-*** `term-char-mode' now makes its buffer read-only.
+*** 'term-char-mode' now makes its buffer read-only.
 
 The buffer is made read-only to prevent changes from being made by
 anything other than the process filter; and movements of point away
@@ -1228,8 +1228,8 @@ correct position after each command.  This is needed to avoid states
 which are inconsistent with the state of the terminal understood by
 the inferior process.
 
-New user options `term-char-mode-buffer-read-only' and
-`term-char-mode-point-at-process-mark' control these behaviors, and
+New user options 'term-char-mode-buffer-read-only' and
+'term-char-mode-point-at-process-mark' control these behaviors, and
 are non-nil by default.  Customize these options to nil if you want
 the previous behavior.
 
@@ -1747,6 +1747,10 @@ when a symbol's value is changed.  This is used to implement the new
 debugger command 'debug-on-variable-change'.
 
 +++
+** New variable 'print-escape-control-characters' causes 'prin1' and
+'print' to output control characters as backslash sequences.
+
++++
 ** Time conversion functions that accept a time zone rule argument now
 allow it to be OFFSET or a list (OFFSET ABBR), where the integer
 OFFSET is a count of seconds east of Universal Time, and the string
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 7292fd58c1f..13a88ad11fa 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -300,6 +300,8 @@
 
 ;;; Code:
 
+(require 'cl-lib)
+
 ;; compiler pacifier
 (defvar mark-even-if-inactive)
 (defvar quail-mode)
diff --git a/src/fns.c b/src/fns.c
index 47457e44c8e..ff1c0495693 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4953,6 +4953,9 @@ extract_data_from_object (Lisp_Object spec,
 #endif
     }
 
+  if (!STRINGP (object))
+    signal_error ("Invalid object argument",
+                  NILP (object) ? build_string ("nil") : object);
   return SSDATA (object);
 }