--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.2.  Last change: 2019 Dec 07
+*editing.txt*   For Vim version 8.2.  Last change: 2019 Dec 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -131,7 +131,7 @@ You can use this file if you discover th
 also the 'patchmode' option.  The name of the backup file is normally the same
 as the original file with 'backupext' appended.  The default "~" is a bit
 strange to avoid accidentally overwriting existing files.  If you prefer ".bak"
-change the 'backupext' option.  Extra dots are replaced with '_' on MS-DOS
+change the 'backupext' option.  Extra dots are replaced with '_' on MS-Windows
 machines, when Vim has detected that an MS-DOS-like filesystem is being used
 (e.g., messydos or crossdos) or when the 'shortname' option is on.  The
 backup file can be placed in another directory by setting 'backupdir'.
@@ -331,10 +331,13 @@ CTRL-^			Edit the alternate file.  Mostl
 							*gF*
 [count]gF		Same as "gf", except if a number follows the file
 			name, then the cursor is positioned on that line in
-			the file. The file name and the number must be
-			separated by a non-filename (see 'isfname') and
-			non-numeric character. White space between the
-			filename, the separator and the number are ignored.
+			the file.
+			The file name and the number must be separated by a
+			non-filename (see 'isfname') and non-numeric
+			character. " line " is also recognized, like it is
+			used in the output of `:verbose command UserCmd`
+			White space between the filename, the separator and
+			the number are ignored.
 			Examples:
 				eval.c:10 ~
 				eval.c @ 20 ~
@@ -542,15 +545,16 @@ If you start editing a new file and the 
 (which is the default), Vim will try to detect whether the lines in the file
 are separated by the specified formats.  When set to "unix,dos", Vim will
 check for lines with a single <NL> (as used on Unix and Amiga) or by a <CR>
-<NL> pair (MS-DOS).  Only when ALL lines end in <CR><NL>, 'fileformat' is set
-to "dos", otherwise it is set to "unix".  When 'fileformats' includes "mac",
-and no <NL> characters are found in the file, 'fileformat' is set to "mac".
+<NL> pair (MS-Windows).  Only when ALL lines end in <CR><NL>, 'fileformat' is
+set to "dos", otherwise it is set to "unix".  When 'fileformats' includes
+"mac", and no <NL> characters are found in the file, 'fileformat' is set to
+"mac".
 
-If the 'fileformat' option is set to "dos" on non-MS-DOS systems the message
-"[dos format]" is shown to remind you that something unusual is happening.  On
-MS-DOS systems you get the message "[unix format]" if 'fileformat' is set to
-"unix".  On all systems but the Macintosh you get the message "[mac format]"
-if 'fileformat' is set to "mac".
+If the 'fileformat' option is set to "dos" on non-MS-Windows systems the
+message "[dos format]" is shown to remind you that something unusual is
+happening.  On MS-Windows systems you get the message "[unix format]" if
+'fileformat' is set to "unix".  On all systems but the Macintosh you get the
+message "[mac format]" if 'fileformat' is set to "mac".
 
 If the 'fileformats' option is empty and DOS format is used, but while reading
 a file some lines did not end in <CR><NL>, "[CR missing]" will be included in
@@ -1056,11 +1060,11 @@ When the file name is actually a device 
 would be impossible).  You need to use "!", since the device already exists.
 Example for Unix: >
 	:w! /dev/lpt0
-and for MS-DOS or MS-Windows: >
+and for MS-Windows: >
 	:w! lpt0
 For Unix a device is detected when the name doesn't refer to a normal file or
 a directory.  A fifo or named pipe also looks like a device to Vim.
-For MS-DOS and MS-Windows the device is detected by its name:
+For MS-Windows the device is detected by its name:
 	AUX
 	CON
 	CLOCK$
@@ -1294,7 +1298,7 @@ present in 'cpoptions' and "!" is not us
 			Does not change the meaning of an already opened file,
 			because its full path name is remembered.  Files from
 			the |arglist| may change though!
-			On MS-DOS this also changes the active drive.
+			On MS-Windows this also changes the active drive.
 			To change to the directory of the current file: >
 				:cd %:h
 <