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

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index a6897fc4ec9..d2e6954025a 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir.
+
 2011-01-23  Werner Lemberg  <wl@gnu.org>
 
         * Makefile.in (MAKEINFO): Now controlled by `configure'.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 7b9ec75446b..11ceea19eef 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -216,7 +216,7 @@
 
 @c ----------------------------------------------------
 
-@dircategory Emacs
+@dircategory GNU Emacs Lisp
 @direntry
 * Emacs Lisp Intro: (eintr).
                           A simple introduction to Emacs Lisp programming.