Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 8 insertions, 10 deletions

diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index 170c87a1a4..29d6177213 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -40,9 +40,6 @@ CTRL-D			Scroll window Downwards in the buffer.  The number of
 			difference).  When the cursor is on the last line of
 			the buffer nothing happens and a beep is produced.
 			See also 'startofline' option.
-			{difference from vi: Vim scrolls 'scroll' screen
-			lines, instead of file lines; makes a difference when
-			lines wrap}
 
 <S-Down>	or				*<S-Down>* *<kPageDown>*
 <PageDown>	or				*<PageDown>* *CTRL-F*
@@ -189,16 +186,16 @@ windows can be given this behavior by setting the (window-specific)
 other 'scrollbind' windows are scrolled the same amount, if possible.  The
 behavior of 'scrollbind' can be modified by the 'scrollopt' option.
 
-When using the scrollbars, the binding only happens when scrolling the window
-with focus (where the cursor is).  You can use this to avoid scroll-binding
-for a moment without resetting options.
+When using the scrollbars or the mouse wheel, the binding only happens when
+scrolling the window with focus (where the cursor is).  You can use this to
+avoid scroll-binding for a moment without resetting options.
 
 When a window also has the 'diff' option set, the scroll-binding uses the
 differences between the two buffers to synchronize the position precisely.
 Otherwise the following method is used.
 
 							*scrollbind-relative*
-Each 'scrollbind' window keeps track of its "relative offset," which can be
+Each 'scrollbind' window keeps track of its "relative offset", which can be
 thought of as the difference between the current window's vertical scroll
 position and the other window's vertical scroll position.  When one of the
 'scrollbind' windows is asked to vertically scroll past the beginning or end
@@ -222,9 +219,10 @@ option.
 
 							*scrollbind-quickadj*
 The 'scrollbind' flag is meaningful when using keyboard commands to vertically
-scroll a window, and also meaningful when using the vertical scrollbar of the
-window which has the cursor focus.  However, when using the vertical scrollbar
-of a window which doesn't have the cursor focus, 'scrollbind' is ignored.
+scroll a window, and is also meaningful when using the vertical scrollbar or
+the mouse wheel in the window which has the cursor focus.  However, when using
+the vertical scrollbar or the mouse wheel in a window which doesn't have the
+cursor focus, 'scrollbind' is ignored.
 This allows quick adjustment of the relative offset of 'scrollbind' windows.
 
 ==============================================================================