2 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 55b4796edc5..07fbab11854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-11  Kim F. Storm  <storm@cua.dk>
+
+        * Makefile.in (info): Undo 2004-12-05 change.
+
 2004-12-08  Luc Teirlinck  <teirllm@auburn.edu>
 
         * info/dir (File): Add URL and Org Mode manuals.
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 2760174636b..a474f828ae4 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,18 @@
+2004-12-11  Kim F. Storm  <storm@cua.dk>
+
+        * display.texi (Display): Add node "Line Height" to menu.
+        (Line Height): New node.  Move full description of line-spacing
+        and line-height text properties here from text.texi.
+        (Scroll Bars): Add vertical-scroll-bar variable.
+
+        * frames.texi (Window Frame Parameters): Remove line-height defvar.
+
+        * locals.texi (Standard Buffer-Local Variables): Fix xref for
+        line-spacing and vertical-scroll-bar.
+
+        * text.texi (Special Properties): Just mention line-spacing and
+        line-height here, add xref to new "Line Height" node.
+
 2004-12-09  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * frames.texi (Window Frame Parameters): New @defvar for `line-spacing'.