Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 355d0b57be5ee6195ddd708194dd87f9c40231c6..42f5b5f5536834314164c7df68ece9ffb11eaa58 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-28  Bastien Guerry  <bzg@gnu.org>
+
+       * variables.texi (File Local Variables): Fix reference.
+
+2013-02-24  Eli Zaretskii  <eliz@gnu.org>
+
+       * files.texi (Magic File Names): Improve wording and indexing.
+
 2013-02-21  Glenn Morris  <rgm@gnu.org>
 
        * display.texi (Multi-Frame Images): Minor rephrasing.