Merge from trunk.

1 files changed, 32 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6d6ddf4da9a..8c1a863371b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,35 @@
+2012-11-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Choosing Window): Rewrite description of
+        display-buffer-alist (Bug#12167).
+        (Display Action Functions): Mention inhibit-switch-frame.  Fix
+        description of display-buffer-below-selected.  Reorder actions.
+        Add example (Bug#12848).
+
+2012-11-16  Glenn Morris  <rgm@gnu.org>
+
+        * display.texi (Face Attributes): Fix :underline COLOR description.
+        (Attribute Functions): Update for set-face-underline rename.
+        Tweak descriptions of face-underline-p, face-inverse-video-p.
+
+        * keymaps.texi (Searching Keymaps, Tool Bar): Untabify examples,
+        so they align better in info.
+        (Active Keymaps, Searching Keymaps, Controlling Active Maps):
+        Document set-temporary-overlay-map.
+
+2012-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymaps.texi (Translation Keymaps): Add a subsection "Interaction
+        with normal keymaps".
+
+2012-11-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * internals.texi (Garbage Collection): Update descriptions
+        of vectorlike_header, garbage-collect and gc-cons-threshold.
+        (Object Internals): Explain Lisp_Object layout and the basics
+        of an internal type system.
+        (Buffer Internals): Update description of struct buffer.
+
 2012-11-13  Glenn Morris  <rgm@gnu.org>
 
         * variables.texi (Adding Generalized Variables):