Update runtime files.

1 files changed, 13 insertions, 14 deletions

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 9c972fd25..203276f64 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -760,7 +760,7 @@ accordingly.  Vim proceeds in this order:
 
 1. Set the 'shell' and 'term' option		*SHELL* *COMSPEC* *TERM*
 	The environment variable SHELL, if it exists, is used to set the
-	'shell' option.  On MS-DOS and Win32, the COMSPEC variable is used
+	'shell' option.  On Win32, the COMSPEC variable is used
 	if SHELL is not set.
 	The environment variable TERM, if it exists, is used to set the 'term'
 	option.  However, 'term' will change later when starting the GUI (step
@@ -809,13 +809,12 @@ accordingly.  Vim proceeds in this order:
      a. If vim was started as |evim| or |eview| or with the |-y| argument, the
 	script $VIMRUNTIME/evim.vim will be loaded.
 							*system-vimrc*
-     b. For Unix, MS-Windows, VMS, Macintosh, RISC-OS and Amiga
-	the system vimrc file is read for initializations.  The path of this
-	file is shown with the ":version" command.  Mostly it's "$VIM/vimrc".
-	Note that this file is ALWAYS read in 'compatible' mode, since the
-	automatic resetting of 'compatible' is only done later.  Add a ":set
-	nocp" command if you like.
-	For the Macintosh the $VIMRUNTIME/macmap.vim is read.
+     b. For Unix, MS-Windows, VMS, Macintosh and Amiga the system vimrc file
+	is read for initializations.  The path of this file is shown with the
+	":version" command.  Mostly it's "$VIM/vimrc".  Note that this file is
+	ALWAYS read in 'compatible' mode, since the automatic resetting of
+	'compatible' is only done later.  Add a ":set nocp" command if you
+	like.  For the Macintosh the $VIMRUNTIME/macmap.vim is read.
 
 	  *VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc* *$MYVIMRC*
      c. Five places are searched for initializations.  The first that exists
@@ -955,8 +954,8 @@ by default.  See |compatible-default|.
 Local setup:
 Put all commands that you need for editing a specific directory only into a
 vimrc file and place it in that directory under the name ".vimrc" ("_vimrc"
-for MS-DOS and Win32).  NOTE: To make Vim look for these special files you
-have to turn on the option 'exrc'.  See |trojan-horse| too.
+for Win32).  NOTE: To make Vim look for these special files you have to turn
+on the option 'exrc'.  See |trojan-horse| too.
 
 System setup:
 This only applies if you are managing a Unix system with several users and
@@ -986,7 +985,7 @@ manual.  The environment variables set with the old Manx Set command (before
 version 5.0) are not recognized.
 
 
-MS-DOS line separators ~
+MS-Windows line separators ~
 
 On MS-Windows, Vim assumes that all the vimrc files have <CR> <NL> pairs as
 line separators.  This will give problems if you have a file with only <NL>s
@@ -1277,7 +1276,7 @@ with ":map" and ":set" commands and write the modified file.  First read the
 default ".vimrc" in with a command like ":source ~piet/.vimrc.Cprogs", change
 the settings and then save them in the current directory with ":mkvimrc!".  If
 you want to make this file your default .vimrc, move it to your home directory
-(on Unix), s: (Amiga) or $VIM directory (MS-DOS).  You could also use
+(on Unix), s: (Amiga) or $VIM directory (MS-Windows).  You could also use
 autocommands |autocommand| and/or modelines |modeline|.
 
 						*vimrc-option-example*
@@ -1538,8 +1537,8 @@ about to abandon with ":bdel", use ":wv".  The '[' and ']' marks are not
 stored, but the '"' mark is.  The '"' mark is very useful for jumping to the
 cursor position when the file was last exited.  No marks are saved for files
 that start with any string given with the "r" flag in 'viminfo'.  This can be
-used to avoid saving marks for files on removable media (for MS-DOS you would
-use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:").
+used to avoid saving marks for files on removable media (for MS-Windows you
+would use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:").
 The |v:oldfiles| variable is filled with the file names that the viminfo file
 has marks for.