Merge changes from emacs-23 branch

[bpt/emacs.git] / doc / lispintro / ChangeLog

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 101e5b1..d2e6954 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,18 @@
+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'.
+       (MAKEINFO_OPTS): New variable.  Use it where appropriate.
+       (ENVADD): New variable to control texi2dvi and texi2pdf.
+
+2010-11-13  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi: Rename the `count-words-region' example,
+       since there is now a standard command of that name.
+
 2010-10-11  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (.dvi.ps): Remove unnecessary suffix rule.
@@ -444,8 +459,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-    2010  Free Software Foundation, Inc.
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.