(Textual Scrolling): Exchange meanings of scroll-up-aggressively and

scroll-down-aggressively.
Delete text erroneously added for scroll-conservatively.

diff --git a/lispref/windows.texi b/lispref/windows.texi
index b1f18fa785773c983a7875d4d9f4cf2793c142be..2e35b78db590f469669aa24bdb04f1f0a75e240e 100644 (file)
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -1359,28 +1359,26 @@ window.  If the value is a positive integer @var{n}, then redisplay
 scrolls the window up to @var{n} lines in either direction, if that will
 bring point back into view.  Otherwise, it centers point.  The default
 value is zero.
-
-A value of @code{nil} is equivalent to .5, since it centers point.  This
-variable automatically becomes buffer-local when set in any fashion.
 @end defopt
 
-@defopt scroll-up-aggressively
-@tindex scroll-up-aggressively
+@defopt scroll-down-aggressively
+@tindex scroll-down-aggressively
 The value of this variable should be either @code{nil} or a fraction
 @var{f} between 0 and 1.  If it is a fraction, that specifies where on
-the screen to put point when scrolling upward.  More precisely, when a
-window scrolls up because point is above the window start, the new start
-position is chosen to put point @var{f} part of the window height from
-the top.  The larger @var{f}, the more aggressive the scrolling.
+the screen to put point when scrolling down.  More precisely, when a
+window scrolls down because point is above the window start, the new
+start position is chosen to put point @var{f} part of the window
+height from the top.  The larger @var{f}, the more aggressive the
+scrolling.
 
 A value of @code{nil} is equivalent to .5, since its effect is to center
 point.  This variable automatically becomes buffer-local when set in any
 fashion.
 @end defopt
 
-@defopt scroll-down-aggressively
-@tindex scroll-down-aggressively
-Likewise, for scrolling down.  The value, @var{f}, specifies how far
+@defopt scroll-up-aggressively
+@tindex scroll-up-aggressively
+Likewise, for scrolling up.  The value, @var{f}, specifies how far
 point should be placed from the bottom of the window; thus, as with
 @code{scroll-up-aggressively}, a larger value scrolls more aggressively.
 @end defopt