Fix some info/dir entries

* doc/misc/emacs-gnutls.texi, doc/misc/ert.texi, doc/misc/org.texi:
Fix dircategory, direntry to match info/dir.

* doc/misc/viper.texi: Make direntry shorter (also it is no longer "newest").

* info/dir: Make some entries consistent with the source texi files.

5 files changed, 13 insertions, 8 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0064deb02fa..fb40c033216 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+        * viper.texi: Make direntry shorter (also it is no longer "newest").
+
+        * emacs-gnutls.texi, ert.texi, org.texi:
+        Fix dircategory, direntry to match info/dir.
+
 2012-04-28  Glenn Morris  <rgm@gnu.org>
 
         * faq.texi: Convert @inforefs to @xrefs.
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index d429f21fbf6..12e65c9e8dd 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -30,9 +30,9 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@dircategory Emacs lisp libraries
+@dircategory Emacs network features
 @direntry
-* GnuTLS: (gnutls).          The Emacs GnuTLS Integration.
+* GnuTLS: (emacs-gnutls).       The Emacs GnuTLS integration.
 @end direntry
 
 @titlepage
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 6002e678ff1..b357b3d5e67 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -4,9 +4,9 @@
 @settitle Emacs Lisp Regression Testing
 @c %**end of header
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
-* ERT: (ert).        Emacs Lisp Regression Testing.
+* ERT: (ert).        Emacs Lisp regression testing tool.
 @end direntry
 
 @copying
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 67633e1acac..775ff638eef 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/viper.texi b/doc/misc/viper.texi
index 86455524b1f..94f7e53ce8c 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -25,9 +25,7 @@ developing GNU and promoting software freedom.''
 
 @dircategory Emacs misc features
 @direntry
-* VIPER: (viper).               The newest Emacs VI-emulation mode.
-                                  (also, A VI Plan for Emacs Rescue
-                                  or the VI PERil.)
+* VIPER: (viper).               A VI-emulation mode for Emacs.
 @end direntry
 
 @finalout