[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107923: Tweak page break in display.texi

[Glenn Morris]

------------------------------------------------------------
revno: 107923
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-04-29 23:51:44 -0700
message:
  Tweak page break in display.texi
  
  * doc/emacs/display.texi (Auto Scrolling):
  Reword to avoid repetition and improve page break.
modified:
  doc/emacs/ChangeLog
  doc/emacs/display.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-04-28 07:45:03 +0000
+++ b/doc/emacs/ChangeLog       2012-04-30 06:51:44 +0000
@@ -1,3 +1,8 @@
+2012-04-30  Glenn Morris  <address@hidden>
+
+       * display.texi (Auto Scrolling):
+       Reword to avoid repetition and improve page break.
+
 2012-04-28  Glenn Morris  <address@hidden>
 
        * xresources.texi (Resources):
@@ -9225,7 +9230,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

=== modified file 'doc/emacs/display.texi'
--- a/doc/emacs/display.texi    2012-04-26 00:31:47 +0000
+++ b/doc/emacs/display.texi    2012-04-30 06:51:44 +0000
@@ -260,14 +260,11 @@
   These two variables are ignored if either @code{scroll-step} or
 @code{scroll-conservatively} are set to a non-zero value.
 
-  Note that @code{scroll-margin}, described below, limits the amount
-of scrolling so as to put point outside of the top or bottom margin,
-even if aggressive scrolling specifies a fraction @var{f} that is
-larger than the window portion between the top and the bottom margins.
-
 @vindex scroll-margin
   The variable @code{scroll-margin} restricts how close point can come
-to the top or bottom of a window.  Its value is a number of screen
+to the top or bottom of a window (even if aggressive scrolling
+specifies a fraction @var{f} that is larger than the window portion
+between the top and the bottom margins).  Its value is a number of screen
 lines; if point comes within that many lines of the top or bottom of
 the window, Emacs performs automatic scrolling.  By default,
 @code{scroll-margin} is 0.