1 files changed, 35 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index cbe016ac96d..0fa50492481 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,36 @@
+2011-11-17  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Resizing Windows, Splitting Windows)
+        (Deleting Windows): Use term window-combination-resize instead
+        of window-splits.
+
+2011-11-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Resizing Windows, Splitting Windows): Rename
+        occurrences of window-nest to window-combination-limit.
+
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * intro.texi (Lisp History): Fix typo.
+
+2011-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Splitting Windows, Deleting Windows): Remove
+        references to splits status of windows.
+
+2011-11-10  Glenn Morris  <rgm@gnu.org>
+
+        * buffers.texi (Read Only Buffers): Expand a bit on why
+        toggle-read-only should only be used interactively.  (Bug#7292)
+
+2011-11-09  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Window Sizes): Document window-pixel-edges,
+        window-inside-pixel-edges, window-absolute-pixel-edges, and
+        window-inside-absolute-pixel-edges.
+        (Resizing Windows): shrink-window-if-larger-than-buffer works on
+        non-full-width windows.
+
 2011-11-09  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Resizing Windows): Rewrite documentation of
@@ -1094,9 +1127,9 @@
         * commands.texi (Misc Events): Add cross-references to where
         POSITION of a mouse event is described in detail.
 
-2010-08-08  Christoph  <cschol2112@googlemail.com>
+2010-08-08  Christoph Scholtes  <cschol2112@googlemail.com>
 
-        * control.texi (Handling Errors) <error-message-string>: Fix arg name.
+        * control.texi (Handling Errors)  <error-message-string>: Fix arg name.
 
 2010-08-08  Juanma Barranquero  <lekktu@gmail.com>