(Getting Started): Rename variant mu-mh to gnu-mh and be explicit

about GNU mailutils MH elsewhere (with thanks to Darel Henman) (closes
SF #1768928).

1 files changed, 23 insertions, 21 deletions

diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 9f781b55f5f..0fe28cf845e 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -533,15 +533,15 @@ to install MH or tell MH-E where to find MH.
 
 @cindex Debian
 @cindex nmh
-@cindex GNU mailutils
+@cindex GNU mailutils MH
 
 If you don't have MH on your system already, you must install a
 variant of MH. The Debian mh-e package does this for you automatically
 (@pxref{Getting MH-E}). Most people use
 @uref{http://www.nongnu.org/nmh/, nmh}, but you may be interested in
-trying out @uref{http://www.gnu.org/software/mailutils/, GNU
-mailutils}, which supports IMAP. Your GNU/Linux distribution probably
-has packages for both of these.
+trying out @uref{http://www.gnu.org/software/mailutils/, GNU mailutils
+MH}, which supports IMAP. Your GNU/Linux distribution probably has
+packages for both of these.
 
 @cindex @command{install-mh}
 @cindex MH commands, @command{install-mh}
@@ -580,14 +580,15 @@ There are several options MH-E uses to interact with your MH
 installation. The option @code{mh-variant} specifies the variant used
 by MH-E (@pxref{Options}). The default setting of this option is
 @samp{Auto-detect} which means that MH-E will automatically choose the
-first of nmh, MH, or GNU mailutils that it finds in the directories
+first of nmh, MH, or GNU mailutils MH that it finds in the directories
 listed in @code{mh-path} (which you can customize),
 @code{mh-sys-path}, and @code{exec-path}. If MH-E can't find MH at
 all, you may have to customize @code{mh-path} and add the directory in
 which the command @command{mhparam} is located. If, on the other hand,
-you have both nmh and mailutils installed (for example) and
+you have both nmh and GNU mailutils MH installed (for example) and
 @code{mh-variant-in-use} was initialized to nmh but you want to use
-mailutils, then you can set @code{mh-variant} to @samp{mailutils}.
+GNU mailutils MH, then you can set @code{mh-variant} to
+@samp{gnu-mh}.
 
 @vindex mh-flists-present-flag
 @vindex mh-lib
@@ -8050,13 +8051,14 @@ width is 4, so you would use @samp{(mh-set-cmd-note 4)}.
 The default setting for @code{mh-scan-format-file} is @samp{Use MH-E
 scan Format}. This means that the format string will be taken from the
 either @code{mh-scan-format-mh} or @code{mh-scan-format-nmh} depending
-on whether MH or nmh (or GNU mailutils) is in use. This setting also
-enables you to turn on the option @code{mh-adaptive-cmd-note-flag}.
-You can also set this option to @samp{Use Default scan Format} to get
-the same output as you would get if you ran @command{scan} from the
-shell. If you have a format file that you want MH-E to use but not MH,
-you can set this option to @samp{Specify a scan Format File} and enter
-the name of your format file.
+on whether MH or nmh (or GNU mailutils MH) is in use. This setting
+also enables you to turn on the option
+@code{mh-adaptive-cmd-note-flag}. You can also set this option to
+@samp{Use Default scan Format} to get the same output as you would get
+if you ran @command{scan} from the shell. If you have a format file
+that you want MH-E to use but not MH, you can set this option to
+@samp{Specify a scan Format File} and enter the name of your format
+file.
 
 @vindex mh-scan-format-file
 @vindex mh-scan-format-mh
@@ -8065,7 +8067,7 @@ the name of your format file.
 The scan format that MH-E uses when @code{mh-scan-format-file} is set
 to its default of @samp{Use MH-E scan Format} is held in the variables
 @code{mh-scan-format-nmh} and @code{mh-scan-format-mh} depending on
-whether you are using nmh (or GNU mailutils) or not. Typically, you
+whether you are using nmh (or GNU mailutils MH) or not. Typically, you
 create your own format files rather than modifying these variables.
 The value of @code{mh-scan-format-nmh} is:
 
@@ -8913,12 +8915,12 @@ introduced in the version 7 series around the time of Emacs 21.4
 in 1994.
 
 Version 8 development was mostly driven by the rewrite of the manual.
-It also brought mailutils support, S/MIME support, picon support, and
-an improved interface for hiding header fields. The CVS repository was
-migrated from SourceForge to Savannah (only for those files that were
-already part of Emacs) and the software was completely reorganized to
-push back two decades of entropy. Version 8 will appear in Emacs 22.1,
-expected to be released in 2006.
+It also brought GNU mailutils MH support, S/MIME support, picon
+support, and an improved interface for hiding header fields. The CVS
+repository was migrated from SourceForge to Savannah (only for those
+files that were already part of Emacs) and the software was completely
+reorganized to push back two decades of entropy. Version 8 will appear
+in Emacs 22.1, expected to be released in 2006.
 
 Bill Wohler, February 2006