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

1 files changed, 10 insertions, 38 deletions

diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
index 8084d13b5d..da9a404420 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -63,10 +63,10 @@ Vim will set the title to show the name of the current file.  First comes the
 name of the file.  Then some special characters and the directory of the file
 in parens.  These special characters can be present:
 
-	-	The file cannot be modified (e.g., a help file)
-	+	The file contains changes
-	=	The file is read-only
-	=+	The file is read-only, contains changes anyway
+	• -	The file cannot be modified (e.g., a help file)
+	• +	The file contains changes
+	• =	The file is read-only
+	• =+	The file is read-only, contains changes anyway
 
 If nothing is shown you have an ordinary, unchanged file.
 
@@ -124,41 +124,13 @@ This adds the 'l' flag to 'guioptions'.
 Standards are wonderful.  In Microsoft Windows, you can use the mouse to
 select text in a standard manner.  The X Window system also has a standard
 system for using the mouse.  Unfortunately, these two standards are not the
-same.
-   Fortunately, you can customize Vim.  You can make the behavior of the mouse
-work like an X Window system mouse or a Microsoft Windows mouse.  The following
-command makes the mouse behave like an X Window mouse: >
+same. Fortunately, you can customize Vim.
 
-	:behave xterm
-
-The following command makes the mouse work like a Microsoft Windows mouse: >
-
-	:behave mswin
-
-The default behavior of the mouse on Unix systems is xterm.  The default
-behavior on Windows systems is selected during the installation process.  For
-details about what the two behaviors are, see |:behave|.  Here follows a
-summary.
-
-
-XTERM MOUSE BEHAVIOR
-
-Left mouse click		position the cursor
-Left mouse drag			select text in Visual mode
-Middle mouse click		paste text from the clipboard
-Right mouse click		extend the selected text until the mouse
-				pointer
-
-
-MSWIN MOUSE BEHAVIOR
-
-Left mouse click		position the cursor
-Left mouse drag			select text in Select mode (see |09.4|)
-Left mouse click, with Shift	extend the selected text until the mouse
-				pointer
-Middle mouse click		paste text from the clipboard
-Right mouse click		display a pop-up menu
+The following commands makes the mouse work more like a Microsoft Windows mouse: >
 
+	set selection=exclusive
+	set selectmode=mouse,key
+	set keymodel=startsel,stopsel
 
 The mouse can be further tuned.  Check out these options if you want to change
 the way how the mouse works:
@@ -251,7 +223,7 @@ Remember, "y" is yank, which is Vim's copy command.
 	"+P
 
 It's the same as for the current selection, but uses the plus (+) register
-instead of the star (*) register.
+instead of the star "*" register.
 
 ==============================================================================
 *09.4*	Select mode