upstream

1 files changed, 24 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d714d1b26e5..cbe016ac96d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,27 @@
+2011-11-09  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Resizing Windows): Rewrite documentation of
+        window-resizable.
+
+2011-11-09  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Splitting Windows): Simplify example.
+
+2011-11-08  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Window Sizes): Copyedits.  Document
+        window-text-height.  Remove window-min-height and window-min-width
+        discussion, referring instead to Emacs manual.
+        (Splitting Windows, Resizing Windows): Add xref to Emacs manual.
+        (Resizing Windows): Simplify introduction.  Don't document
+        enlarge-window, shrink-window, enlarge-window-horizontally, and
+        shrink-window-horizontally; they are no longer preferred for
+        calling from Lisp, and are already documented in the Emacs manual.
+
+2011-11-07  Glenn Morris  <rgm@gnu.org>
+
+        * windows.texi (Choosing Window): Fix keybinding typo.
+
 2011-11-07  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Resizing Windows, Splitting Windows)