patch 8.2.0122: readme files still mention MS-DOS

Problem:    Readme files still mention MS-DOS.
Solution:   Update readme files. (Ken Takata, closes #5486)

diff --git a/README.md b/README.md
index c74eac926bb7e8f34a572b9dc26525adaf539d08..c87a26558bf86a9f3f81f4b281259a8a5019f100 100644 (file)
--- a/README.md
+++ b/README.md
@@ -26,10 +26,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.
 
-Vim runs under MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh, VMS and
-almost all flavours of UNIX.  Porting to other systems should not be very
-difficult.  Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me, Amiga
-DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
+Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, VMS and almost all
+flavours of UNIX.  Porting to other systems should not be very difficult.
+Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
+Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
 
 ## Distribution ##
 

diff --git a/README.txt b/README.txt
index 71a38271ce3eb9784d5b5b5f52560403e8cb9b80..ead022b42b7eac0234e9f1e1769d93e3f1d56c22 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -16,10 +16,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.
 
-Vim runs under MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh, VMS and
-almost all flavours of UNIX.  Porting to other systems should not be very
-difficult.  Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me, Amiga
-DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
+Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, VMS and almost all
+flavours of UNIX.  Porting to other systems should not be very difficult.
+Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
+Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
 
 
 DISTRIBUTION

diff --git a/READMEdir/README_dos.txt b/READMEdir/README_dos.txt
index 260dbee1b4a098654dbb60f214fb85e6ffeb3a21..3f086121bcbbf22edd95e51aed60c4e9cad5660a 100644 (file)
--- a/READMEdir/README_dos.txt
+++ b/READMEdir/README_dos.txt
@@ -1,6 +1,6 @@
 README_dos.txt for version 8.2 of Vim: Vi IMproved.
 
-This file explains the installation of Vim on MS-DOS and MS-Windows systems.
+This file explains the installation of Vim on MS-Windows systems.
 See "README.txt" for general information about Vim.
 
 There are two ways to install Vim:
@@ -64,10 +64,6 @@ These are the normal steps to install Vim from the .zip archives:
    to another location.  That is where they will stay, the install program
    won't move or copy the runtime files.
 
-   Only for the 32 bit DOS version on MS-DOS without DPMI support (trying to
-   run install.exe will produce an error message): Unpack the CSDPMI4B.ZIP
-   archive and follow the instructions in the documentation.
-
 3. Change to the new directory:
        cd vim\vim82
    Run the "install.exe" program.  It will ask you a number of questions about
@@ -121,7 +117,7 @@ Remarks:
        set VIM=d:\editors\vim
 
 - If you have told the "install.exe" program to add the "Edit with Vim" menu
-  entry, you can remove it by running the "uninstal.exe".  See
+  entry, you can remove it by running the "uninstall.exe".  See
   ":help win32-popup-menu".
 
 - In Windows 95/98/NT you can create a shortcut to Vim.  This works for all
@@ -150,5 +146,4 @@ Remarks:
 
 For further information, type one of these inside Vim:
        :help dos
-       :help msdos
        :help win32

diff --git a/READMEdir/README_srcdos.txt b/READMEdir/README_srcdos.txt
index 2904fda21e235c6ef81b423b6a8402b42fbbc0f5..ca016bd72955acd9d1ab4da87b061b6b6db39a96 100644 (file)
--- a/READMEdir/README_srcdos.txt
+++ b/READMEdir/README_srcdos.txt
@@ -1,12 +1,12 @@
 README_srcdos.txt for version 8.2 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
-See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
+See "README_dos.txt" for installation instructions for MS-Windows.
 These files are in the runtime archive (vim82rt.zip).
 
 
-The DOS source archive contains the files needed to compile Vim on MS-DOS or
-MS-Windows.  It is packed for DOS systems, with CR-LF.  It also includes the
-VisVim sources.
+The DOS source archive contains the files needed to compile Vim on MS-Windows.
+It is packed for MS-Windows systems, with CR-LF.  It also includes the VisVim
+sources.
 
 See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC.

diff --git a/READMEdir/README_w32s.txt b/READMEdir/README_w32s.txt
index 9bf0a672ce11df917d6ce8a2c406c27649c5d8bc..742a6551baf3a8a45c8e5f1671e884b398118920 100644 (file)
--- a/READMEdir/README_w32s.txt
+++ b/READMEdir/README_w32s.txt
@@ -1,15 +1,6 @@
 README_w32s.txt for version 8.2 of Vim: Vi IMproved.
 
-This archive contains the gvim.exe that was specifically compiled for use in
-the Win32s subsystem in MS-Windows 3.1 and 3.11.
-
-Also see the README_bindos.txt, README_dos.txt and README.txt files.
-
-Be careful not to overwrite the Win32s gvim.exe with the another gvim.exe when
-unpacking another binary archive!  Check the output of ":version":
-       Win32s - "MS-Windows 16/32 bit GUI version"
-        Win32 - "MS-Windows 32 bit GUI version"
-Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
-
-For further information, type this inside Vim:
-       :help win32s
+This file used to explain the installation of Vim on MS-Windows 3.1 and 3.11
+systems.  However, support for MS-Windows 3.1 and 3.11 has been removed in
+patch 7.4.1364.
+See "README.txt" for general information about Vim.

diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index 194abfad950dcecfe3360d5148b37feb8a6f9cbc..7f378457d7de621d1c3f9cb5e4f85ff7ddb56211 100644 (file)
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -171,7 +171,7 @@ you will need to get a version older than that.
 
                                *win32s* *windows-3.1* *gui-w32s* *win16*
 There was a special version of gvim that runs under Windows 3.1 and 3.11.
-Support was removed in patch 7.4.1363.
+Support was removed in patch 7.4.1364.
 
 ==============================================================================
 7. Win32 mini FAQ                                      *win32-faq*

diff --git a/src/version.c b/src/version.c
index e26d15ec503258877dfa8d8e602977d404e61680..737b5747a4a4116063da0f6a59930f3895dba98d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    122,
 /**/
     121,
 /**/