Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.

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

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 84fa7f8..d04c032 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,44 @@
+2011-02-05  Chong Yidong  <cyd@stupidchicken.com>
+
+       * rmail.texi (Rmail Display): Document Rmail MIME support more
+       accurately.
+
+       * maintaining.texi (VC Change Log): Document vc-log-incoming and
+       vc-log-outgoing.
+       (Merging): Document vc-find-conflicted-file.
+
+2011-02-05  Glenn Morris  <rgm@gnu.org>
+
+       * custom.texi (Variables): Fix typo.
+
+2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
+
+       * search.texi (Regexps): Copyedits.  Mention character classes
+       (Bug#7809).
+
+       * files.texi (File Aliases): Restore explanatory text from Eli
+       Zaretskii, accidentally removed in 2011-01-08 commit.
+
+2011-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (MAKEINFO): Remove options, leave only program name.
+       (MAKEINFO_OPTS): New variable.
+       (ENVADD, $(infodir)/emacs): Use $(MAKEINFO_OPTS).
+       (emacs.html): New target.
+       (clean): Remove emacs.html.
+
+2011-01-23  Werner Lemberg  <wl@gnu.org>
+
+       * Makefile.in (MAKEINFO): Now controlled by `configure'.
+       (MAKEINFO_OPTS): New variable.  Use it where appropriate.
+       (ENVADD): Updated.
+
+2011-01-18  Glenn Morris  <rgm@gnu.org>
+
+       * ack.texi, emacs.texi (Acknowledgments): Update for ERT addition.
+
+       * ack.texi (Acknowledgments): Remove mention of replaced prolog.el.
+
 2011-01-15  Chong Yidong  <cyd@stupidchicken.com>
 
        * building.texi (Compilation): Improve instructions for running two
@@ -7556,9 +7597,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-    Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.