upstream i think

1 files changed, 23 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 293f253c545..37de62be976 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,26 @@
+2011-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Truncation):
+        * text.texi (Special Properties): Describe what a stretch-glyph is
+        instead of using that term without explanation.  Make the
+        cross-references more accurate.
+
+        * display.texi (Usual Display): Update the description,
+        cross-references, and indexing related to display of control
+        characters and raw bytes.
+
+2011-11-25  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Splitting Windows): Fix description of
+        window-combination-limit.  Suggested by Eli Zaretskii.
+
+2011-11-23  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Window Sizes): Move window-top-line,
+        window-left-column, and window-*-pixel-edges to Coordinates and
+        Windows node.
+        (Coordinates and Windows): Restore window-edges doc.
+
 2011-11-21  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Windows and Frames, Splitting Windows): Fix