2 files changed, 10 insertions, 6 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6fa1941c53e..edd66bddfdf 100644
--- 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-11  Eli Zaretskii  <eliz@gnu.org>
 
         * msdog.texi (Windows HOME): Fix the wording to clarify how Emacs sets
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index aad061b33d9..5df8401d918 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -195,15 +195,15 @@ how aggressively it scrolls by setting the variables
 The value of @code{scroll-up-aggressively} should be either
 @code{nil}, or a fraction @var{f} between 0 and 1.  A fraction
 specifies where on the screen to put point when scrolling upward: when
-a window scrolls up because point is above the window start, the new
-start position is chosen to put point @var{f} parts of the window
-height from the top.  Thus, larger @var{f} means more aggressive
+a window scrolls up because point below the window end, the new start
+position is chosen to put point @var{f} parts of the window height
+from the bottom.  Thus, larger @var{f} means more aggressive
 scrolling.  The default value, @code{nil}, is equivalent to 0.5.
 
   Likewise, @code{scroll-down-aggressively} is used for scrolling
-down.  The value specifies how far point should be placed from the
-bottom of the window; thus, as with @code{scroll-up-aggressively}, a
-larger value is more aggressive.
+down.  The value specifies how far point should be placed from the top
+of the window; thus, as with @code{scroll-up-aggressively}, a larger
+value is more aggressive.
 
 @vindex scroll-margin
   The variable @code{scroll-margin} restricts how close point can come