Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

48 files changed, 99 insertions, 49 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index cbe4fbbeb1b..164fdc4ed65 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,53 @@
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * ada-mode.texi: Sync @dircategory with ../../info/dir.
+        * auth.texi: Sync @dircategory with ../../info/dir.
+        * autotype.texi: Sync @dircategory with ../../info/dir.
+        * calc.texi: Sync @dircategory with ../../info/dir.
+        * cc-mode.texi: Sync @dircategory with ../../info/dir.
+        * cl.texi: Sync @dircategory with ../../info/dir.
+        * dbus.texi: Sync @dircategory with ../../info/dir.
+        * dired-x.texi: Sync @dircategory with ../../info/dir.
+        * ebrowse.texi: Sync @dircategory with ../../info/dir.
+        * ede.texi: Sync @dircategory with ../../info/dir.
+        * ediff.texi: Sync @dircategory with ../../info/dir.
+        * edt.texi: Sync @dircategory with ../../info/dir.
+        * eieio.texi: Sync @dircategory with ../../info/dir.
+        * emacs-mime.texi: Sync @dircategory with ../../info/dir.
+        * epa.texi: Sync @dircategory with ../../info/dir.
+        * erc.texi: Sync @dircategory with ../../info/dir.
+        * eshell.texi: Sync @dircategory with ../../info/dir.
+        * eudc.texi: Sync @dircategory with ../../info/dir.
+        * flymake.texi: Sync @dircategory with ../../info/dir.
+        * forms.texi: Sync @dircategory with ../../info/dir.
+        * gnus.texi: Sync @dircategory with ../../info/dir.
+        * idlwave.texi: Sync @dircategory with ../../info/dir.
+        * mairix-el.texi: Sync @dircategory with ../../info/dir.
+        * message.texi: Sync @dircategory with ../../info/dir.
+        * mh-e.texi: Sync @dircategory with ../../info/dir.
+        * newsticker.texi: Sync @dircategory with ../../info/dir.
+        * nxml-mode.texi: Sync @dircategory with ../../info/dir.
+        * org.texi: Sync @dircategory with ../../info/dir.
+        * pcl-cvs.texi: Sync @dircategory with ../../info/dir.
+        * pgg.texi: Sync @dircategory with ../../info/dir.
+        * rcirc.texi: Sync @dircategory with ../../info/dir.
+        * reftex.texi: Sync @dircategory with ../../info/dir.
+        * remember.texi: Sync @dircategory with ../../info/dir.
+        * sasl.texi: Sync @dircategory with ../../info/dir.
+        * sc.texi: Sync @dircategory with ../../info/dir.
+        * semantic.texi: Sync @dircategory with ../../info/dir.
+        * ses.texi: Sync @dircategory with ../../info/dir.
+        * sieve.texi: Sync @dircategory with ../../info/dir.
+        * smtpmail.texi: Sync @dircategory with ../../info/dir.
+        * speedbar.texi: Sync @dircategory with ../../info/dir.
+        * trampver.texi [emacs]: Set emacsname to "Emacs".
+        * tramp.texi: Sync @dircategory with ../../info/dir.
+        * url.texi: Sync @dircategory with ../../info/dir.
+        * vip.texi: Sync @dircategory with ../../info/dir.
+        * viper.texi: Sync @dircategory with ../../info/dir.
+        * widget.texi: Sync @dircategory with ../../info/dir.
+        * woman.texi: Sync @dircategory with ../../info/dir.
+
 2011-02-19  Glenn Morris  <rgm@gnu.org>
 
         * dired-x.texi (Technical Details): No longer redefines dired-add-entry,
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index 4be88b40361..66cdb200111 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -19,7 +19,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * Ada mode: (ada-mode).         Emacs mode for editing and compiling Ada code.
 @end direntry
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 67f5b52b694..27c6691dfa8 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -32,7 +32,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * Auth-source: (auth).          The Emacs auth-source library.
 @end direntry
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index bdf9ae7ab17..2e66c78a3cb 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Autotype: (autotype).         Convenient features for text that you
                                   enter frequently in Emacs.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index e98ea807f63..b9d4f8c4a23 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -111,7 +111,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Calc: (calc).                 Advanced desk calculator and mathematical tool.
 @end direntry
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index d4a870346ce..9ae9abd5e1a 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -177,7 +177,7 @@ developing GNU and promoting software freedom.''
 
 @comment Info directory entry for use by install-info. The indentation
 @comment here is by request from the FSF folks.
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * CC Mode: (ccmode).            Emacs mode for editing C, C++, Objective-C,
                                 Java, Pike, AWK, and CORBA IDL code.
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 13fe9b570e2..afe7c94f447 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -21,7 +21,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * CL: (cl).                     Partial Common Lisp support for Emacs Lisp.
 @end direntry
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 64d577f4387..ad202f963aa 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * D-Bus: (dbus).                Using D-Bus in Emacs.
 @end direntry
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 4a542d9841b..c4e474f0943 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -36,7 +36,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Dired-X: (dired-x).           Dired Extra Features.
 @end direntry
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index 81a1ab0d29d..19ee9705484 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Ebrowse: (ebrowse).           A C++ class browser for Emacs.
 @end direntry
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 86228a24d06..bc097a87150 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -21,9 +21,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
-* ede: (ede).                   Project management for Emacs.
+* EDE: (ede).                   The Emacs Development Environment.
 @end direntry
 
 @titlepage
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 743a3460f9b..3ba0796e636 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -41,7 +41,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Ediff: (ediff).       A visual interface for comparing and merging programs.
 @end direntry
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index e3117d65699..377bb6ee8c5 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * EDT: (edt).                   An Emacs emulation of the EDT editor.
 @end direntry
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 1a22a15afba..8ee40288fe0 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -27,9 +27,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
-* eieio: (eieio).               Objects for Emacs.
+* EIEIO: (eieio).               An objects system for Emacs Lisp.
 @end direntry
 
 @titlepage
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index ef6db1c3606..a9d80d868b6 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -30,7 +30,7 @@ developing GNU and promoting software freedom.''
 @c Node ``Interface Functions'' uses Latin-1 characters
 @documentencoding ISO-8859-1
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * Emacs MIME: (emacs-mime).     Emacs MIME de/composition library.
 @end direntry
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index ae194356c3f..b4137a7dac6 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * EasyPG Assistant: (epa).      An Emacs user interface to GNU Privacy Guard.
 @end direntry
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 1ce6e949da5..463a14f08d2 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -28,7 +28,7 @@ and modified without restriction.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * ERC: (erc).                   Powerful and extensible IRC client for Emacs.
 @end direntry
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 51031e219ff..0ae6a0e7fae 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -24,7 +24,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Eshell: (eshell).             A command shell implemented in Emacs Lisp.
 @end direntry
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index e21abcdb137..a68eda50025 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -28,7 +28,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * EUDC: (eudc).                 Emacs client for directory servers (LDAP, PH).
 @end direntry
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 7f0cd77de59..74cf3d630da 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -28,7 +28,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Flymake: (flymake).           A universal on-the-fly syntax checker.
 @end direntry
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index f58e8d8f969..17c1d7feaf0 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -34,7 +34,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Forms: (forms).               Emacs package for editing data bases
                                   by filling in forms.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 16273d21c46..5aa66deb946 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -321,7 +321,7 @@ developing GNU and promoting software freedom.''
 @end iflatex
 @end iftex
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Gnus: (gnus).                 The newsreader Gnus.
 @end direntry
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 98da23768ec..94aeb612df7 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -38,7 +38,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * IDLWAVE: (idlwave).           Major mode and shell for IDL files.
 @end direntry
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 4235e825fb6..d64f316cb7b 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Mairix: (mairix-el).          Emacs interface to the Mairix mail indexer.
 @end direntry
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 4f0c09f4117..b28639907ed 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Message: (message).           Mail and news composition mode that
                                   goes with Gnus.
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 546f9e629fe..59da631c6ea 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -55,7 +55,7 @@ Public License.''
 @end copying
 
 @c Info Directory Entry
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * MH-E: (mh-e).                 Emacs interface to the MH mail system.
 @end direntry
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index fadcf1ea17b..c7d82245973 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -30,7 +30,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Newsticker: (newsticker).     A Newsticker for Emacs.
 @end direntry
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index b2003a139d0..27603440413 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * nXML Mode: (nxml-mode).       XML editing mode with RELAX NG support.
 @end direntry
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 7618bad1f73..a0ec20c4034 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -286,7 +286,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs editing modes
 @direntry
 * Org Mode: (org).      Outline-based notes management and organizer
 @end direntry
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 7301bf3747a..f12942da2d3 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -23,7 +23,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * PCL-CVS: (pcl-cvs).           Emacs front-end to CVS.
 @end direntry
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 6efa3e6bb72..9cb7a637a05 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * PGG: (pgg).                   Emacs interface to various PGP implementations.
 @end direntry
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 6402c91c57a..c2b6867c419 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Rcirc: (rcirc).               Internet Relay Chat (IRC) client.
 @end direntry
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 8c1ab92032f..3944b712338 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -43,7 +43,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * RefTeX: (reftex).             Emacs support for LaTeX cross-references
                                   and citations.
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index cdb45140093..e67d6155bbe 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Remember: (remember).         Simple information manager for Emacs.
 @end direntry
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index ec33f0525d3..a75b237519c 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -33,7 +33,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * SASL: (sasl).                 The Emacs SASL library.
 @end direntry
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index fbeadb6a522..8853192af04 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -32,7 +32,7 @@ developing GNU and promoting software freedom.''
 
 @c      @smallbook
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * SC: (sc).                     Supercite lets you cite parts of messages
                                   you're replying to, in flexible ways.
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 89e83df5bc3..52434f4a6e4 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -40,7 +40,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Semantic: (semantic).         Source code parser library and utilities.
 @end direntry
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index 45e5e9efc0e..d9739b93925 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * SES: (ses).                   Simple Emacs Spreadsheet.
 @end direntry
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 754ee15fecc..64fd92f40ca 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Sieve: (sieve).               Managing Sieve scripts in Emacs.
 @end direntry
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index abd7d8974dc..1d4bbbff4ac 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -20,7 +20,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * SMTP: (smtpmail).             Emacs library for sending mail via SMTP.
 @end direntry
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 280438195b5..9dc47e4574c 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -20,7 +20,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * Speedbar: (speedbar).         File/Tag summarizing utility.
 @end direntry
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 994a8f99676..346354b3170 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -54,7 +54,7 @@ supports it in developing GNU and promoting software freedom.''
 @end copying
 
 @c Entries for @command{install-info} to use
-@dircategory @value{emacsname}
+@dircategory @value{emacsname} network features
 @direntry
 * TRAMP: (tramp).               Transparent Remote Access, Multiple Protocol
                                 @value{emacsname} remote file access via rsh and rcp.
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 2968642bcc2..ff5641fb4b4 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -38,7 +38,7 @@
 
 @c Emacs values.
 @ifset emacs
-@set emacsname          GNU Emacs
+@set emacsname          Emacs
 @set emacsdir           emacs
 @set ftppackagename     Ange-FTP
 @set prefix             /
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index d337c82494c..2bde54a8dea 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -12,7 +12,7 @@
 \overfullrule=0pt
 %\global\baselineskip 30pt      % for printing in double space
 @end tex
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * URL: (url).                   URL loading package.
 @end direntry
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index fe1098c49ff..03ca65882e5 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -35,7 +35,7 @@ developing GNU and promoting software freedom.''
 @finalout
 @contents
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * VIP: (vip).                   An older VI-emulation for Emacs.
 @end direntry
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 9e55e08242f..1f0dffee5b4 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -23,7 +23,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * VIPER: (viper).               The newest Emacs VI-emulation mode.
                                   (also, A VI Plan for Emacs Rescue
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 667dab55221..c4f5317e5a7 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -24,7 +24,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
 * Widget: (widget).             The "widget" package used by the Emacs
                                   Customization facility.
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 9f77a077703..c869d1a46c7 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -34,7 +34,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
 * WoMan: (woman).               Browse UN*X Manual Pages "W.O. (without) Man".
 @end direntry