summaryrefslogtreecommitdiff
path: root/doc/emacs/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'doc/emacs/ChangeLog')
-rw-r--r--doc/emacs/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d7bcb28b500..5c3699a8098 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-03 Eli Zaretskii <eliz@gnu.org>
+
+ * display.texi (Auto Scrolling): More accurate description of what
+ scroll-*-aggressively does, including the effect of non-zero
+ margin. Fix "i.e." markup.
+
2011-12-02 Chong Yidong <cyd@gnu.org>
* text.texi (Pages): Mention how formfeed chars are displayed.