Merge changes from emacs-23 branch

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b25e6ce219f19ad5579efe1a493e2a0f3d5495fb..47aa395c73024d60e42cd5319514fd2492a26d12 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-26  Chong Yidong  <cyd@stupidchicken.com>
+
+       * display.texi (Auto Scrolling): Fix scroll-up/scroll-down confusion.
+
 2011-03-30  Eli Zaretskii  <eliz@gnu.org>
 
        * display.texi (Auto Scrolling): Document the limit of 100 lines