Merge from emacs-23 branch, up to 2010-05-20T21:33:58Z!juri@jurta.org.

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index fa7b38e8bcb89726c925e6ec5d696564ac72ce27..84fa7f875c443aad5d3da63b0ebe2d154ef3733d 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,11 @@
 2011-01-15  Chong Yidong  <cyd@stupidchicken.com>
 
+       * building.texi (Compilation): Improve instructions for running two
+       compilations (Bug#7573).
+
+       * files.texi (Backup Names): Document the new location of the
+       last-resort backup file.
+
        * files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp
        manual.  Explain why directory-abbrev-alist elements should be anchored
        (Bug#7777).