Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 784f62dc4ccb7b4ad0f935d0b3d6a35d3e27b3bc..0c0583c06abcf1eec01cd8d7cfa75c85dab65f0b 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
+
+       * windows.texi (Choosing Window): Fix typo.
+
+2011-04-23  Chong Yidong  <cyd@stupidchicken.com>
+
+       * frames.texi (Layout Parameters): Note the difference between
+       querying and setting parameters for left-fringe and right-fringe
+       (Bug#6930).
+
 2011-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * minibuf.texi (Basic Completion): Be a bit more precise about the