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

1 files changed, 20 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 0f1f0425478..90eed004d39 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * elisp.texi: Sync @dircategory with ../../info/dir.
+
+        * files.texi (Visiting Functions): Document find-file-literally,
+        both the command and the variable.
+
+        * variables.texi (Creating Buffer-Local): Explain the meaning of
+        permanent local variables.
+
+        * files.texi (Visiting Functions): Document find-file-literally,
+        both the command and the variable.
+
+        * variables.texi (Creating Buffer-Local): Explain the meaning of
+        permanent local variables.
+
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+        * keymaps.texi (Remapping Commands): Mention how to undo it.
+
 2011-02-09  Reuben Thomas  <rrt@sc3d.org>
 
         * loading.texi (Hooks for Loading): Remove unnecessary advice