merge trunkdkf_alias_encoding

1 files changed, 13 insertions, 13 deletions

diff --git a/win/README b/win/README
index 98ba19f..8b257b1 100644
--- a/win/README
+++ b/win/README
@@ -24,28 +24,28 @@ In order to compile Tcl for Windows, you need the following:
 
 	or
 
-	Linux + MinGW-w64 (any distribution e.g. Ubuntu)
-	    (for either 32-bit or 64-bit executables)
+	Linux + MinGW-w64 [http://mingw-w64.sourceforge.net/]
+	    (win32 or win64)
 
 	or
 
 	Cygwin + MinGW-w64 [http://cygwin.com/install.html]
-	    (for either 32-bit or 64-bit executables)
+	    (win32 or win64)
 
 	or
 
 	Darwin + MinGW-w64 [http://mingw-w64.sourceforge.net/]
-	    (for either 32-bit or 64-bit executables)
+	    (win32 or win64)
 
 	or
 
 	Msys + MinGW-w64 [http://mingw-w64.sourceforge.net/]
-	    (for either 32-bit or 64-bit executables)
+	    (win32 or win64)
 
 	or
 
-	Msys + Mingw [http://www.mingw.org/download.shtml]
-	    (32-bit executables only)
+	Msys + MinGW [http://www.mingw.org/download.shtml]
+	    (win32 only)
 
 
 In practice, this release is built with Visual C++ 6.0 and the TEA
@@ -67,20 +67,20 @@ configure/build process works just like the UNIX one, so you will want
 to refer to ../unix/README for available configure options.
 
 If you want 64-bit executables (x86_64), you need to configure using
-the --enable-64bit option. Then make sure that the x86_64-w64-mingw32
+the --enable-64bit option. Make sure that the x86_64-w64-mingw32
 compiler is present. For Cygwin this compiler can be found in the
 "mingw64-x86_64-gcc-core" package, which can be installed through
 the normal Cygwin install process. If you only want 32-bit executables,
-the "mingw64-i686-gcc-core" package is what you need. If your Linux
-distribution does not have a MinGW-w64 package, you can download one
-from [https://sourceforge.net/projects/mingw-w64/files/]
+the "mingw64-i686-gcc-core" package is what you need. For Linux, Darwin
+and Msys, you can download a suitable win32 or win64 compiler from
+[https://sourceforge.net/projects/mingw-w64/files/]
 
 Use the Makefile "install" target to install Tcl.  It will install it
 according to the prefix options you provided in the correct directory
 structure.
 
-Note that in order to run tclsh86.exe, you must ensure that tcl86.dll is on
-your path, in the system directory, or in the directory containing
+Note that in order to run tclsh85.exe, you must ensure that tcl85.dll is
+on your path, in the system directory, or in the directory containing
 tclsh86.exe.
 
 Note: Tcl no longer provides support for Win32s.