Replace some colons in Texinfo index entries

* doc/lispintro/emacs-lisp-intro.texi (Recursive Patterns):
* doc/misc/mh-e.texi, doc/misc/viper.texi:
Do not use colons in index entries.

Fixes: debbugs:16652

5 files changed, 195 insertions, 186 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 26493cb59ce..53fe1c85022 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-06  Glenn Morris  <rgm@gnu.org>
+
+	* emacs-lisp-intro.texi (Recursive Patterns):
+	Do not use colons in index entries.
+
 2014-01-23  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp-intro.texi (lengths-list-file): Fix textual parentheses.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 84452513a76..74ea8e26e63 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -11610,7 +11610,7 @@ and this provides a sense of its primal capabilities.
 @node Every
 @unnumberedsubsubsec Recursive Pattern: @emph{every}
 @cindex Every, type of recursive pattern
-@cindex Recursive pattern: every
+@cindex Recursive pattern - every
 
 In the @code{every} recursive pattern, an action is performed on every
 element of a list.
@@ -11709,7 +11709,7 @@ But when the list has at least one element,
 @node Accumulate
 @unnumberedsubsubsec Recursive Pattern: @emph{accumulate}
 @cindex Accumulate, type of recursive pattern
-@cindex Recursive pattern: accumulate
+@cindex Recursive pattern - accumulate
 
 Another recursive pattern is called the @code{accumulate} pattern.  In
 the @code{accumulate} recursive pattern, an action is performed on
@@ -11760,7 +11760,7 @@ accumulate pattern.
 @node Keep
 @unnumberedsubsubsec Recursive Pattern: @emph{keep}
 @cindex Keep, type of recursive pattern
-@cindex Recursive pattern: keep
+@cindex Recursive pattern - keep
 
 A third recursive pattern is called the @code{keep} pattern.
 In the @code{keep} recursive pattern, each element of a list is tested;
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index f1d06e0b1be..739d6938f0c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-06  Glenn Morris  <rgm@gnu.org>
+
+	* mh-e.texi, viper.texi: Do not use colons in index entries.
+
 2014-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* texinfo.tex: Update from gnulib.
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index fe86f8ed1c5..7c254f35771 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -572,10 +572,10 @@ you need to know about MH to use MH-E, but the more you know about MH,
 the more you can leverage its power. See the
 @uref{@value{MH-BOOK-HOME}/../, MH book} to learn more about MH.
 
-@cindex @samp{Path:} MH profile component
+@cindex @samp{Path} MH profile component
 @cindex MH profile
 @cindex MH profile component
-@cindex MH profile component, @samp{Path:}
+@cindex MH profile component, @samp{Path}
 
 Your MH environment includes your @dfn{MH profile} which is found in
 the file @file{~/.mh_profile}, or the file named in the environment
@@ -628,14 +628,14 @@ actually cause problems.
 @end quotation
 @sp 1
 
-@cindex MH profile component, @samp{Draft-Folder:}
-@cindex MH profile component, @samp{Path:}
-@cindex MH profile component, @samp{Previous-Sequence:}
-@cindex MH profile component, @samp{Unseen-Sequence:}
-@cindex @samp{Draft-Folder:} MH profile component
-@cindex @samp{Path:} MH profile component
-@cindex @samp{Previous-Sequence:} MH profile component
-@cindex @samp{Unseen-Sequence:} MH profile component
+@cindex MH profile component, @samp{Draft-Folder}
+@cindex MH profile component, @samp{Path}
+@cindex MH profile component, @samp{Previous-Sequence}
+@cindex MH profile component, @samp{Unseen-Sequence}
+@cindex @samp{Draft-Folder} MH profile component
+@cindex @samp{Path} MH profile component
+@cindex @samp{Previous-Sequence} MH profile component
+@cindex @samp{Unseen-Sequence} MH profile component
 @findex mh-find-path
 @vindex mh-draft-folder
 @vindex mh-find-path-hook
@@ -2077,12 +2077,12 @@ entire class of fields that start with the same prefix. If you think a
 header field should be generally ignored, please update
 @uref{https://sourceforge.net/p/mh-e/bugs/245/, SF #245}.
 
-@cindex header field, @samp{Face:}
-@cindex header field, @samp{X-Face:}
-@cindex header field, @samp{X-Image-URL:}
-@cindex @samp{Face:} header field
-@cindex @samp{X-Face:} header field
-@cindex @samp{X-Image-URL:} header field
+@cindex header field, @samp{Face}
+@cindex header field, @samp{X-Face}
+@cindex header field, @samp{X-Image-URL}
+@cindex @samp{Face} header field
+@cindex @samp{X-Face} header field
+@cindex @samp{X-Image-URL} header field
 @vindex mh-show-use-xface-flag
 
 MH-E can display the content of @samp{Face:}, @samp{X-Face:}, and
@@ -2453,9 +2453,9 @@ permanently by turning on the option
 MH-E cannot display all attachments inline however. It can display
 text (including @sc{html}) and images.
 
-@cindex header field, @samp{Content-Disposition:}
+@cindex header field, @samp{Content-Disposition}
 @cindex inline images
-@cindex @samp{Content-Disposition:} header field
+@cindex @samp{Content-Disposition} header field
 @vindex mh-max-inline-image-height
 @vindex mh-max-inline-image-width
 
@@ -3758,8 +3758,8 @@ Use this hook with care. If there is a bug in your hook which returns
 @cindex @file{.mh_profile}
 @cindex files, @file{.mh_profile}
 @cindex MH commands, @command{sortm}
-@cindex MH profile component, @samp{sortm:}
-@cindex @samp{sortm:} MH profile component
+@cindex MH profile component, @samp{sortm}
+@cindex @samp{sortm} MH profile component
 @kindex F S
 @vindex mh-sortm-args
 
@@ -4045,8 +4045,8 @@ If you prefer to be prompted for the recipient and subject fields
 before the MH-Letter buffer appears, turn on the option
 @code{mh-compose-prompt-flag}.
 
-@cindex header field, @samp{X-Mailer:}
-@cindex @samp{X-Mailer:} header field
+@cindex header field, @samp{X-Mailer}
+@cindex @samp{X-Mailer} header field
 @vindex mh-insert-x-mailer-flag
 
 MH-E adds an @samp{X-Mailer:} header field to the header that includes
@@ -4174,8 +4174,8 @@ reply to a message, you can change the option
 @samp{Prompt} to one of the choices listed above. You can always edit
 the recipients in the draft.
 
-@cindex @samp{repl:} MH profile component
-@cindex MH profile component, @samp{repl:}
+@cindex @samp{repl} MH profile component
+@cindex MH profile component, @samp{repl}
 @cindex MH-Letter mode
 @cindex MH-Show mode
 @cindex draft
@@ -4237,8 +4237,8 @@ hook @code{mh-forward-hook} is called on the draft.
 
 @cindex @file{.mh_profile}
 @cindex files, @file{.mh_profile}
-@cindex MH profile component, @samp{forw:}
-@cindex @samp{forw:} MH profile component
+@cindex MH profile component, @samp{forw}
+@cindex @samp{forw} MH profile component
 @vindex mh-compose-forward-as-mime-flag
 
 By default, the option @code{mh-compose-forward-as-mime-flag} is on
@@ -4750,25 +4750,25 @@ detail in the following sections.
 @node Editing Message, Inserting Letter, Editing Drafts, Editing Drafts
 @section Editing the Message
 
-@cindex @samp{Bcc:} header field
-@cindex @samp{Cc:} header field
-@cindex @samp{Dcc:} header field
-@cindex @samp{From:} header field
-@cindex @samp{Mail-Followup-To:} header field
-@cindex @samp{Mail-Reply-To:} header field
-@cindex @samp{Reply-To:} header field
-@cindex @samp{Subject:} header field
-@cindex @samp{To:} header field
+@cindex @samp{Bcc} header field
+@cindex @samp{Cc} header field
+@cindex @samp{Dcc} header field
+@cindex @samp{From} header field
+@cindex @samp{Mail-Followup-To} header field
+@cindex @samp{Mail-Reply-To} header field
+@cindex @samp{Reply-To} header field
+@cindex @samp{Subject} header field
+@cindex @samp{To} header field
 @cindex editing header
-@cindex header field, @samp{Bcc:}
-@cindex header field, @samp{Cc:}
-@cindex header field, @samp{Dcc:}
-@cindex header field, @samp{From:}
-@cindex header field, @samp{Mail-Followup-To:}
-@cindex header field, @samp{Mail-Reply-To:}
-@cindex header field, @samp{Reply-To:}
-@cindex header field, @samp{Subject:}
-@cindex header field, @samp{To:}
+@cindex header field, @samp{Bcc}
+@cindex header field, @samp{Cc}
+@cindex header field, @samp{Dcc}
+@cindex header field, @samp{From}
+@cindex header field, @samp{Mail-Followup-To}
+@cindex header field, @samp{Mail-Reply-To}
+@cindex header field, @samp{Reply-To}
+@cindex header field, @samp{Subject}
+@cindex header field, @samp{To}
 @findex mh-to-field
 @kindex C-c C-f C-t
 @kindex C-c C-f t
@@ -5142,12 +5142,12 @@ mail user agent is sophisticated enough. In MH-E, this is done by
 placing your image in the file named by the option
 @code{mh-x-face-file} which is @file{~/.face} by default.
 
-@cindex @samp{Face:} header field
-@cindex @samp{X-Face:} header field
-@cindex @samp{X-Image-URL:} header field
-@cindex header field, @samp{Face:}
-@cindex header field, @samp{X-Face:}
-@cindex header field, @samp{X-Image-URL:}
+@cindex @samp{Face} header field
+@cindex @samp{X-Face} header field
+@cindex @samp{X-Image-URL} header field
+@cindex header field, @samp{Face}
+@cindex header field, @samp{X-Face}
+@cindex header field, @samp{X-Image-URL}
 
 If the file starts with either of the strings @samp{X-Face:},
 @samp{Face:} or @samp{X-Image-URL:} then the contents are added to the
@@ -5605,8 +5605,8 @@ See
 @cite{The PGG Manual}}.
 @end ifhtml
 
-@cindex header field, @samp{Fcc:}
-@cindex @samp{Fcc:} header field
+@cindex header field, @samp{Fcc}
+@cindex @samp{Fcc} header field
 @vindex pgg-encrypt-for-me
 
 In particular, I turn on the option @code{pgg-encrypt-for-me} so that
@@ -5841,9 +5841,9 @@ Recipients}.
 
 @cindex @command{ali}
 @cindex @file{/etc/nmh/MailAliases}
-@cindex @samp{Aliasfile:} MH profile component
+@cindex @samp{Aliasfile} MH profile component
 @cindex MH commands, @command{ali}
-@cindex MH profile component, @samp{Aliasfile:}
+@cindex MH profile component, @samp{Aliasfile}
 @cindex files, @file{/etc/nmh/MailAliases}
 
 MH-E loads aliases for completion and folder name hints from various
@@ -6085,8 +6085,8 @@ the @samp{INS} button with the label @samp{Add at least one item
 below}. The @samp{Value Menu} has the following menu items:
 
 @table @samp
-@cindex header field, @samp{From:}
-@cindex @samp{From:} header field
+@cindex header field, @samp{From}
+@cindex @samp{From} header field
 @item From Field
 Specify an alternate @samp{From:} header field. You must include a
 valid email address. A standard format is @samp{First Last
@@ -6094,8 +6094,8 @@ valid email address. A standard format is @samp{First Last
 must quote your name as in @samp{"First I. Last"
 <login@@host.domain>}.
 @c -------------------------
-@cindex header field, @samp{Organization:}
-@cindex @samp{Organization:} header field
+@cindex header field, @samp{Organization}
+@cindex @samp{Organization} header field
 @item Organization Field
 People usually list the name of the company where they work here.
 @c -------------------------
@@ -6173,15 +6173,15 @@ Select an identity from those configured in @code{mh-identity-list}.
 All of the information for that identity will be added if the
 recipient matches.
 @c -------------------------
-@cindex @samp{Fcc:} header field
-@cindex header field, @samp{Fcc:}
+@cindex @samp{Fcc} header field
+@cindex header field, @samp{Fcc}
 @item Fcc Field
 Insert an @samp{Fcc:} header field with the folder you provide. When
 you send the message, MH will put a copy of your message in this
 folder.
 @c -------------------------
-@cindex @samp{Mail-Followup-To:} header field
-@cindex header field, @samp{Mail-Followup-To:}
+@cindex @samp{Mail-Followup-To} header field
+@cindex header field, @samp{Mail-Followup-To}
 @item Mail-Followup-To Field
 Insert an @samp{Mail-Followup-To:} header field with the recipients
 you provide. If the recipient's mail user agent supports this header
@@ -6793,8 +6793,8 @@ argument.
 
 @cindex @command{procmail}
 @cindex Unix commands, @command{procmail}
-@cindex @samp{X-MHE-Checksum:} header field
-@cindex header field, @samp{X-MHE-Checksum:}
+@cindex @samp{X-MHE-Checksum} header field
+@cindex header field, @samp{X-MHE-Checksum}
 
 Note: This command uses an @samp{X-MHE-Checksum:} header field to
 cache the MD5 checksum of a message. This means that if an incoming
@@ -7457,9 +7457,9 @@ folder (default is current folder) with @kbd{S l}
 (@code{mh-list-sequences}). The list appears in a buffer named
 @samp{*MH-E Sequences*} (@pxref{Miscellaneous}).
 
-@cindex MH profile component, @samp{Previous-Sequence:}
+@cindex MH profile component, @samp{Previous-Sequence}
 @cindex @samp{cur} sequence
-@cindex @samp{Previous-Sequence:} MH profile component
+@cindex @samp{Previous-Sequence} MH profile component
 @cindex sequence, @samp{cur}
 @cindex sequence, @samp{Previous-Sequence}
 @vindex mh-refile-preserves-sequences-flag
@@ -7484,10 +7484,10 @@ this deletes only the sequence, not the messages in the sequence. If
 you want to delete the messages, use @kbd{C-u d} (@pxref{Reading
 Mail}).
 
-@cindex @samp{Unseen-Sequence:} MH profile component
+@cindex @samp{Unseen-Sequence} MH profile component
 @cindex @samp{cur} sequence
 @cindex @samp{tick} sequence
-@cindex MH profile component, @samp{Unseen-Sequence:}
+@cindex MH profile component, @samp{Unseen-Sequence}
 @cindex sequence, @samp{Unseen-Sequence}
 @cindex sequence, @samp{cur}
 @cindex sequence, @samp{tick}
@@ -7663,9 +7663,9 @@ reclassifies a range of messages (@pxref{Ranges}) as ham if it were
 incorrectly classified as spam. It then refiles the message into the
 @file{+inbox} folder.
 
-@cindex MH profile component, @samp{Previous-Sequence:}
+@cindex MH profile component, @samp{Previous-Sequence}
 @cindex @samp{cur} sequence
-@cindex @samp{Previous-Sequence:} MH profile component
+@cindex @samp{Previous-Sequence} MH profile component
 @cindex sequence, @samp{cur}
 @cindex sequence, @samp{Previous-Sequence}
 @vindex mh-whitelist-preserves-sequences-flag
@@ -7708,10 +7708,10 @@ it from your local distribution or from the
 To use SpamAssassin, add the following recipes to @file{~/.procmailrc}:
 
 @cindex @command{spamc}
-@cindex @samp{X-Spam-Level:} header field
-@cindex @samp{X-Spam-Status:} header field
-@cindex header field, @samp{X-Spam-Level:}
-@cindex header field, @samp{X-Spam-Status:}
+@cindex @samp{X-Spam-Level} header field
+@cindex @samp{X-Spam-Status} header field
+@cindex header field, @samp{X-Spam-Level}
+@cindex header field, @samp{X-Spam-Status}
 
 @smallexample
 PATH=$PATH:/usr/bin/mh
@@ -7833,8 +7833,8 @@ each type of message to start doing a good job.
 
 To use bogofilter, add the following recipes to @file{~/.procmailrc}:
 
-@cindex @samp{X-Bogosity:} header field
-@cindex header field, @samp{X-Bogosity:}
+@cindex @samp{X-Bogosity} header field
+@cindex header field, @samp{X-Bogosity}
 
 @smallexample
 PATH=$PATH:/usr/bin/mh
@@ -7886,8 +7886,8 @@ SpamProbe web site}.
 To use SpamProbe, add the following recipes to @file{~/.procmailrc}:
 
 @cindex @command{formail}
-@cindex @samp{X-SpamProbe:} header field
-@cindex header field, @samp{X-SpamProbe:}
+@cindex @samp{X-SpamProbe} header field
+@cindex header field, @samp{X-SpamProbe}
 
 @smallexample
 PATH=$PATH:/usr/bin/mh
@@ -7922,12 +7922,12 @@ eliminate any message with a Windows executable (which is most likely
 a virus). The second is to eliminate mail in character sets that you
 can't read.
 
-@cindex @samp{Content-Transfer-Encoding:} header field
-@cindex @samp{Content-Type:} header field
-@cindex @samp{Subject:} header field
-@cindex header field, @samp{Content-Transfer-Encoding:}
-@cindex header field, @samp{Content-Type:}
-@cindex header field, @samp{Subject:}
+@cindex @samp{Content-Transfer-Encoding} header field
+@cindex @samp{Content-Type} header field
+@cindex @samp{Subject} header field
+@cindex header field, @samp{Content-Transfer-Encoding}
+@cindex header field, @samp{Content-Type}
+@cindex header field, @samp{Subject}
 
 @smallexample
 PATH=$PATH:/usr/bin/mh
@@ -8579,8 +8579,8 @@ anything to my knowledge@footnote{See
 Savannah issue #4361} to see if @command{rcvstore} locking is still an
 issue.}.
 
-@cindex @samp{Unseen-Sequence:} MH profile component
-@cindex MH profile component, @samp{Unseen-Sequence:}
+@cindex @samp{Unseen-Sequence} MH profile component
+@cindex MH profile component, @samp{Unseen-Sequence}
 
 Line 16 uses the following script, @code{myrcvstore}, to massage the
 message as described in the comment and file the message in the given
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index ee3a4d057ee..3195bfa807d 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -1465,10 +1465,10 @@ appropriate function to a function key on the keyboard and use that key.
 @xref{Viper Specials}, for details.
 
 @item Ex commands
-@findex  @kbd{:args}
-@findex  @kbd{:n}
-@findex  @kbd{:pwd}
-@findex  @kbd{:pre}
+@findex  @kbd{Ex args}
+@findex  @kbd{Ex n}
+@findex  @kbd{Ex pwd}
+@findex  @kbd{Ex pre}
 The commands @kbd{:args}, @kbd{:next}, @kbd{:pre} behave
 differently.  @kbd{:pwd} exists to get current directory.
 The commands @kbd{:b} and @kbd{:B} switch buffers around.  @xref{File and
@@ -1476,8 +1476,8 @@ Buffer Handling}, for details.
 There are also the new commands @kbd{:RelatedFile} and
 @kbd{PreviousRelatedFile} (which abbreviate to @kbd{R} and @kbd{P},
 respectively.  @xref{Viper Specials}, for details.
-@findex @kbd{:RelatedFile}
-@findex @kbd{:PreviousRelatedFile}
+@findex @kbd{Ex RelatedFile}
+@findex @kbd{Ex PreviousRelatedFile}
 @end table
 
 Apart from the new commands, many old commands have been enhanced.  Most
@@ -1587,7 +1587,7 @@ you are doing.  Only two variables, @code{viper-mode} and
 @code{viper-custom-file-name}, are supposed to be customized in @file{.emacs},
 prior to loading Viper (i.e., prior to @code{(require 'viper)} command.
 @item
-@cindex :customize
+@cindex Ex customize
 By executing the @kbd{:customize} Ex command. This takes you to the Emacs
 customization widget, which lets you change the values of Viper
 customizable variables easily. This method is good for novice and
@@ -1616,7 +1616,7 @@ cases, examples are provided that you can use directly.
 
 @cindex setting variables
 @cindex variables for customization
-@findex @kbd{:set}
+@findex @kbd{Ex set}
 
 An easy way to customize Viper is to change the values of constants used in
 Viper.  Here is the list of the constants used in Viper and their default
@@ -2111,7 +2111,7 @@ bound to, unless these keys are typed in quick succession.  So, with macros,
 one can use the normal keys alongside with the macros.  If per-mode
 modifications are needed, the user can try both ways and see which one is
 more convenient.
-@findex @kbd{:map}
+@findex @kbd{Ex map}
 @xref{Vi Macros}, for details.
 
 Note: in major modes that come up in @emph{Emacs state} by default, the
@@ -2551,8 +2551,8 @@ be associated with the master file.  Then, the new Ex command
 another, so you can edit them.  If a file is not in any Emacs buffer, it
 will be visited.  The command @kbd{PreviousRelatedFile} (abbr., @kbd{:P})
 goes through the file list in the opposite direction.
-@findex @kbd{:RelatedFile}
-@findex @kbd{:PreviousRelatedFile}
+@findex @kbd{Ex RelatedFile}
+@findex @kbd{Ex PreviousRelatedFile}
 
 These commands are akin to @kbd{:n} and @kbd{:N}, but they allow the user to
 focus on relevant files only.
@@ -3480,8 +3480,8 @@ Go to specified Viper mark and go to the first CHAR on line.
 @kindex @kbd{m<}
 @kindex @kbd{m,}
 @kindex @kbd{m^}
-@findex @kbd{:mark}
-@findex @kbd{:k}
+@findex @kbd{Ex mark}
+@findex @kbd{Ex k}
 @kindex @kbd{''}
 @kindex @kbd{``}
 @kindex @kbd{`<a-z>}
@@ -3730,11 +3730,11 @@ destructive Vi commands.
 @kindex @kbd{#c<move>}
 @kindex @kbd{&}
 @kindex @kbd{\&}
-@findex @kbd{:substitute/<pat>/<repl>/<f>}
-@findex @kbd{:s/<pat>/<repl>/<f>}
-@findex @kbd{:copy [z]}
-@findex @kbd{:t [z]}
-@findex @kbd{:move [z]}
+@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>}
@@ -3814,14 +3814,14 @@ Execute <ex-command> on all lines that match <pattern>.
 Execute <ex-command> on all lines that do not match <pattern>.
 @end table
 @kindex @kbd{&}
-@findex @kbd{:substitute/<pat>/<repl>/<f>}
+@findex @kbd{Ex substitute/<pat>/<repl>/<f>}
 @kindex @kbd{Q}
 @kindex @kbd{#g<move>}
-@findex @kbd{:v}
-@findex @kbd{:g}
-@findex @kbd{:global}
-@findex @kbd{:vglobal}
-@findex @kbd{:tag <name>}
+@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}
@@ -3874,7 +3874,7 @@ Put the contents of the (default undo) buffer
 @kindex @kbd{"<a-z>y<move>}
 @kindex @kbd{y<move>}
 @kindex @kbd{yank}
-@findex @kbd{:yank}
+@findex @kbd{Ex yank}
 
 @node Undoing
 @subsection Undoing
@@ -3895,9 +3895,9 @@ Re-edit a messed-up file.
 Recover file from autosave.  Viper also creates backup files
 that have a @samp{~} appended to them.
 @end table
-@findex @kbd{:rec}
-@findex @kbd{:e!}
-@findex @kbd{:q!}
+@findex @kbd{Ex rec}
+@findex @kbd{Ex e!}
+@findex @kbd{Ex q!}
 @kindex @kbd{.}
 @kindex @kbd{U}
 @kindex @kbd{u}
@@ -4076,42 +4076,42 @@ is typed in minibuffer.  File completion and history are supported.
 @end table
 @kindex @kbd{v}
 @kindex @kbd{V}
-@findex @kbd{:args}
-@findex @kbd{:rew}
+@findex @kbd{Ex args}
+@findex @kbd{Ex rew}
 @kindex @kbd{C-^}
-@findex @kbd{:e!@: [<files>]}
-@findex @kbd{:e [<files>]}
-@findex @kbd{:edit [<files>]}
-@findex @kbd{:edit!@: [<files>]}
-@findex @kbd{:q!}
-@findex @kbd{:q}
-@findex @kbd{:quit}
-@findex @kbd{:quit!}
-@findex @kbd{:f}
-@findex @kbd{:rec}
-@findex @kbd{:r}
-@findex @kbd{:read}
-@findex @kbd{:pre}
+@findex @kbd{Ex e!@: [<files>]}
+@findex @kbd{Ex e [<files>]}
+@findex @kbd{Ex edit [<files>]}
+@findex @kbd{Ex edit!@: [<files>]}
+@findex @kbd{Ex q!}
+@findex @kbd{Ex q}
+@findex @kbd{Ex quit}
+@findex @kbd{Ex quit!}
+@findex @kbd{Ex f}
+@findex @kbd{Ex rec}
+@findex @kbd{Ex r}
+@findex @kbd{Ex read}
+@findex @kbd{Ex pre}
 @kindex @kbd{ZZ}
-@findex @kbd{:wq}
-@findex @kbd{:w <file>}
-@findex @kbd{:w!@: <file>}
-@findex @kbd{:w >> <file>}
-@findex @kbd{:write <file>}
-@findex @kbd{:write!@: <file>}
-@findex @kbd{:write >> <file>}
-@findex @kbd{:W}
-@findex @kbd{:WW}
-@findex @kbd{:Write}
-@findex @kbd{:WWrite}
-@findex @kbd{:WWrite}
-@findex @kbd{:x}
-@findex @kbd{:x!}
-@findex @kbd{:suspend}
-@findex @kbd{:stop}
-@findex @kbd{:n [<count> | <file>]}
-@findex @kbd{:cd [<dir>]}
-@findex @kbd{:pwd}
+@findex @kbd{Ex wq}
+@findex @kbd{Ex w <file>}
+@findex @kbd{Ex w!@: <file>}
+@findex @kbd{Ex w >> <file>}
+@findex @kbd{Ex write <file>}
+@findex @kbd{Ex write!@: <file>}
+@findex @kbd{Ex write >> <file>}
+@findex @kbd{Ex W}
+@findex @kbd{Ex WW}
+@findex @kbd{Ex Write}
+@findex @kbd{Ex WWrite}
+@findex @kbd{Ex WWrite}
+@findex @kbd{Ex x}
+@findex @kbd{Ex x!}
+@findex @kbd{Ex suspend}
+@findex @kbd{Ex stop}
+@findex @kbd{Ex n [<count> | <file>]}
+@findex @kbd{Ex cd [<dir>]}
+@findex @kbd{Ex pwd}
 
 @node Mapping
 @section Mapping
@@ -4175,10 +4175,10 @@ Show contents of register.
 @kindex @kbd{@@#}
 @kindex @kbd{@@@@}
 @kindex @kbd{@@<a-z>}
-@findex @kbd{:unmap <char>}
-@findex @kbd{:map <char> <seq>}
-@findex @kbd{:unmap!@: <char>}
-@findex @kbd{:map!@: <char> <seq>}
+@findex @kbd{Ex unmap <char>}
+@findex @kbd{Ex map <char> <seq>}
+@findex @kbd{Ex unmap!@: <char>}
+@findex @kbd{Ex map!@: <char> <seq>}
 
 @node Shell Commands
 @section Shell Commands
@@ -4234,17 +4234,17 @@ current).
 @item :make
 Run the make command in the current directory.
 @end table
-@findex @kbd{:<address>r <name>}
-@findex @kbd{:<address>r !<cmd>}
+@findex @kbd{Ex <address>r <name>}
+@findex @kbd{Ex <address>r !<cmd>}
 @findex @kbd{!<cmd>}
 @findex @kbd{!!<cmd>}
 @findex @kbd{!<move><cmd>}
-@findex @kbd{:w !<cmd>}
-@findex @kbd{:x,y w !<cmd>}
-@findex @kbd{:!!@: <args>}
-@findex @kbd{:!<cmd>}
-@findex @kbd{:sh}
-@findex @kbd{:make}
+@findex @kbd{Ex w !<cmd>}
+@findex @kbd{Ex x,y w !<cmd>}
+@findex @kbd{Ex !!@: <args>}
+@findex @kbd{Ex !<cmd>}
+@findex @kbd{Ex sh}
+@findex @kbd{Ex make}
 
 @node Options
 @section Options
@@ -4343,29 +4343,29 @@ Turn <option> off.
 @item :set <option>=<value>
 Set <option> to <value>.
 @end table
-@findex @kbd{:set <option>=<value>}
-@findex @kbd{:set no<option>}
-@findex @kbd{:set <option>}
-@findex @kbd{:set ws}
-@findex @kbd{:set wrapscan}
-@findex @kbd{:set wm=<count>}
-@findex @kbd{:set wrapmargin=<count>}
-@findex @kbd{:set ts=<count>}
-@findex @kbd{:set tabstop=<count>}
-@findex @kbd{:set tab-stop-local=<count>}
-@findex @kbd{:set sm}
-@findex @kbd{:set showmatch}
-@findex @kbd{:set sw=<count>}
-@findex @kbd{:set shiftwidth=<count>}
-@findex @kbd{:set sh=<string>}
-@findex @kbd{:set shell=<string>}
-@findex @kbd{:set ro}
-@findex @kbd{:set readonly}
-@findex @kbd{:set magic}
-@findex @kbd{:set ic}
-@findex @kbd{:set ignorecase}
-@findex @kbd{:set ai}
-@findex @kbd{:set autoindent}
+@findex @kbd{Ex set <option>=<value>}
+@findex @kbd{Ex set no<option>}
+@findex @kbd{Ex set <option>}
+@findex @kbd{Ex set ws}
+@findex @kbd{Ex set wrapscan}
+@findex @kbd{Ex set wm=<count>}
+@findex @kbd{Ex set wrapmargin=<count>}
+@findex @kbd{Ex set ts=<count>}
+@findex @kbd{Ex set tabstop=<count>}
+@findex @kbd{Ex set tab-stop-local=<count>}
+@findex @kbd{Ex set sm}
+@findex @kbd{Ex set showmatch}
+@findex @kbd{Ex set sw=<count>}
+@findex @kbd{Ex set shiftwidth=<count>}
+@findex @kbd{Ex set sh=<string>}
+@findex @kbd{Ex set shell=<string>}
+@findex @kbd{Ex set ro}
+@findex @kbd{Ex set readonly}
+@findex @kbd{Ex set magic}
+@findex @kbd{Ex set ic}
+@findex @kbd{Ex set ignorecase}
+@findex @kbd{Ex set ai}
+@findex @kbd{Ex set autoindent}
 
 @node Emacs Related Commands
 @section Emacs Related Commands