doc/misc minor stylistic changes.

* doc/misc/edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi:
Standardize some Emacs/XEmacs terminology.

6 files changed, 27 insertions, 22 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d2ba81618b3..1f153db305f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+	* edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi:
+	Standardize some Emacs/XEmacs terminology.
+
 2011-02-19  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index d5a28481352..68c2db73361 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -88,7 +88,7 @@ informing you that the emulation has been enabled: ``Default EDT keymap
 active''.
 
    You can have the EDT Emulation start up automatically, each time you
-initiate a GNU Emacs session, by adding the following line to your
+initiate an Emacs session, by adding the following line to your
 @file{.emacs} file:
 
 @example
@@ -219,7 +219,7 @@ user quits without saving those buffers.
 
 @item
 Emulate EDT Keypad Mode commands closely so that current EDT users will
-find that it easy and comfortable to use GNU Emacs with a small learning
+find that it easy and comfortable to use Emacs with a small learning
 curve.
 
 @item
@@ -238,7 +238,7 @@ Provide an easy way to restore @strong{all} original Emacs key bindings,
 just as they existed before the EDT emulation was first invoked.
 
 @item
-Support GNU Emacs 19 and higher.  XEmacs 19, and above, is also supported.
+Support Emacs and XEmacs 19 and higher.
 
 @item
 Supports highlighting of marked text within the EDT emulation on all
@@ -286,13 +286,13 @@ apply to you.
 @node Starting emulation
 @chapter How to Get Started
 
-Start up GNU Emacs and enter @kbd{M-x edt-emulation-on} to begin the
+Start up Emacs and enter @kbd{M-x edt-emulation-on} to begin the
 emulation.  After initialization is complete, the following message will
 appear below the status line informing you that the emulation has been
 enabled: ``Default EDT keymap active''.
 
 You can have the EDT Emulation start up automatically, each time you
-initiate a GNU Emacs session, by adding the following line to your
+initiate an Emacs session, by adding the following line to your
 @file{.emacs} file:
 
 @example
@@ -307,7 +307,7 @@ in the EDT Default Mode).
 It is easy to customize key bindings in the EDT Emulation
 (@pxref{Customizing}).  Customizations are placed in a file called
 @file{edt-user.el}.  The Emacs @file{etc/} directory contains an
-example.  If @file{edt-user.el} is found in your GNU Emacs load path
+example.  If @file{edt-user.el} is found in your Emacs load path
 during EDT Emulation initialization, then the following message will
 appear below the status line indicating that the emulation has been
 enabled, enhanced by your own customizations: ``User EDT custom keymap
@@ -322,8 +322,8 @@ restores the original key bindings in effect just prior to invoking the
 emulation.
 
 Emacs binds keys to @acronym{ASCII} control characters and so does the
-real EDT.  Where EDT key bindings and GNU Emacs key bindings conflict,
-the default GNU Emacs key bindings are retained by the EDT emulation by
+real EDT.  Where EDT key bindings and Emacs key bindings conflict,
+the default Emacs key bindings are retained by the EDT emulation by
 default.  If you are a diehard EDT user you may not like this.  The
 @ref{Control keys} section explains how to change this so that the EDT
 bindings to @acronym{ASCII} control characters override the default
@@ -365,7 +365,7 @@ older SunOS release configured with a Sun Type 5 keyboard:
 @example
 ! File:  .xmodmaprc
 !
-! Set up Sun Type 5 keypad for use with the GNU Emacs EDT Emulation
+! Set up Sun Type 5 keypad for use with the Emacs EDT Emulation
 !
 keycode  53 = KP_Divide
 keycode  54 = KP_Multiply
@@ -437,7 +437,7 @@ things up nicely.
 @example
 ! File:  .xmodmaprc
 !
-! Set up PC keypad under GNU/Linux for the GNU Emacs EDT Emulation
+! Set up PC keypad under GNU/Linux for the Emacs EDT Emulation
 !
 clear  mod2
 keycode  77 = F12
@@ -519,7 +519,7 @@ assign Num_Lock back to mod2.
 @example
 ! File:  .xmodmaprc
 !
-! Set up PC keypad under GNU/Linux for the GNU Emacs EDT Emulation
+! Set up PC keypad under GNU/Linux for the Emacs EDT Emulation
 !
 clear  mod2
 keycode  77 = F12
@@ -542,7 +542,7 @@ In general, you will find that this emulation of EDT replicates most,
 but not all, of EDT's most used Keypad Mode editing functions and
 behavior.  It is not perfect, but most EDT users who have tried the
 emulation agree that it is quite good enough to make it easy for
-die-hard EDT users to move over to using GNU Emacs.
+die-hard EDT users to move over to using Emacs.
 
 Here's a list of the most important differences between EDT and this GNU
 Emacs EDT Emulation.  The list is short but you must be aware of these
@@ -784,7 +784,7 @@ terminals on the same system, you need not look at @file{edt-user.el2}.
 @end ignore
 
 First, you need to have your own private lisp directory, say
-@file{~/lisp}, and you should add it to the GNU Emacs load path.
+@file{~/lisp}, and you should add it to the Emacs load path.
 
 @strong{Please note:} A few sites have different load-path requirements,
 so the above directions may need some modification if your site has such
@@ -899,8 +899,8 @@ Here are some examples:
 @node Control keys
 @section Enabling EDT Control Key Sequence Bindings
 
-Where EDT key bindings and GNU Emacs key bindings conflict, the default
-GNU Emacs key bindings are retained by default.  Some diehard EDT users
+Where EDT key bindings and Emacs key bindings conflict, the default
+Emacs key bindings are retained by default.  Some diehard EDT users
 may not like this.  So, if the variable
 @code{edt-use-EDT-control-key-bindings} is set to true in a user's
 @file{.emacs} file, then the default EDT Emulation mode will enable most
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 8056845e4d3..aa7cb893fd7 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -36,7 +36,7 @@ and modified without restriction.
 @titlepage
 @title ERC manual
 @subtitle a full-featured IRC client
-@subtitle for GNU Emacs and XEmacs
+@subtitle for Emacs and XEmacs
 
 @c The following two commands
 @c start the copyright page.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 6cd603d9d0a..a3b5ddde4a1 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -23156,7 +23156,7 @@ variables should be either strings or symbols naming functions that
 return a string.  When the mouse passes over text with this property
 set, a balloon window will appear and display the string.  Please
 refer to @ref{Tooltips, ,Tooltips, emacs, The Emacs Manual},
-(in GNU Emacs) or the doc string of @code{balloon-help-mode} (in
+(in Emacs) or the doc string of @code{balloon-help-mode} (in
 XEmacs) for more information on this.  (For technical reasons, the
 guillemets have been approximated as @samp{<<} and @samp{>>} in this
 paragraph.)
@@ -28476,7 +28476,7 @@ to install Gnus after compiling it, give @file{make.bat} @code{/copy} as
 the second parameter.
 
 @file{make.bat} has been rewritten from scratch, it now features
-automatic recognition of XEmacs and GNU Emacs, generates
+automatic recognition of XEmacs and Emacs, generates
 @file{gnus-load.el}, checks if errors occur while compilation and
 generation of info files and reports them at the end of the build
 process.  It now uses @code{makeinfo} if it is available and falls
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 02924d7472f..54088cef210 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -4275,7 +4275,7 @@ browse-url-browser-function} or similar when attempting to load IDLWAVE
 under XEmacs.}
 
 You don't have the @samp{browse-url} (or other required) XEmacs package.
-Unlike GNU Emacs, XEmacs distributes many packages separately from the
+Unlike Emacs, XEmacs distributes many packages separately from the
 main program.  IDLWAVE is actually among these, but is not always the
 most up to date.  When installing IDLWAVE as an XEmacs package, it
 should prompt you for required additional packages.  When installing it
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index a0ab0d7a4f9..17594701997 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -212,9 +212,9 @@ However, MH-E was the tip of the iceberg, and I discovered more and
 more niceties about GNU Emacs and MH@. Now I'm fully hooked on both of
 them.
 
-The MH-E package is distributed with GNU Emacs@footnote{Version
-@value{VERSION} of MH-E appeared in GNU Emacs 23.1. It is supported
-in GNU Emacs 21 and 22, as well as XEmacs 21 (except for versions
+The MH-E package is distributed with Emacs@footnote{Version
+@value{VERSION} of MH-E appeared in Emacs 23.1. It is supported
+in Emacs 21 and 22, as well as XEmacs 21 (except for versions
 21.5.9-21.5.16). It is compatible with MH versions 6.8.4 and higher,
 all versions of nmh, and GNU mailutils 1.0 and higher.}, so you
 shouldn't have to do anything special to use it. Gnus is also