X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..368bb6629314982118d25b79aeeddd4a82a36d44:/docs/msw/install.txt?ds=sidebyside

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 1aca7b46b1..96826c12ea 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -1,10 +1,8 @@
-Installing wxWidgets 2.5.2
+Installing wxWidgets 2.6.0
 --------------------------
 
-This is wxWidgets 2.5.2 for Microsoft Windows 9x/ME, Windows NT, Windows 2000
-and Windows XP. This is an unstable development release. Note that unstable in
-this context doesn't mean that it crashes a lot, just that the library API may
-change in backwards incompatible way during the 2.5 branch lifetime.
+This is wxWidgets 2.6.0 for Microsoft Windows 9x/ME, Windows NT, Windows 2000
+and Windows XP.
 
 IMPORTANT NOTE: If you experience problems installing, please
 re-read this instructions and other related files (changes.txt,
@@ -61,7 +59,7 @@ All makefiles and project are located in build\msw directory.
 Where compiled files are stored
 -------------------------------
 
-After succesful compilation you'll find the libraries in a subdirectory
+After successful compilation you'll find the libraries in a subdirectory
 of lib directory named after the compiler and DLL/static settings.
 A couple of examples:
 
@@ -263,7 +261,7 @@ Metrowerks CodeWarrior compilation
 ----------------------------------
 
 1. CodeWarrior Pro7 project files in XML format are already
-   included in wxMSW-2.5.2.zip and the setup version.
+   included in wxMSW-2.6.0.zip and the setup version.
 
 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
    you are working from the CVS version) to make sure the settings reflect
@@ -326,7 +324,7 @@ Metrowerks CodeWarrior compilation
 Cygwin/MinGW compilation
 ------------------------
 
-wxWidgets 2 supports Cygwin (formerly GnuWin32) betas and
+wxWidgets supports Cygwin (formerly GnuWin32) betas and
 releases, and MinGW. Cygwin can be downloaded from:
 
     http://sources.redhat.com/cygwin/
@@ -355,10 +353,10 @@ provide Unix-like tools that you'll need to build wxWidgets using configure.
 Using makefiles directly
 ------------------------
 
-NOTE: The makefile are for compilation under Cygwin, or
-      command.com/cmd.exe, they won't work in other environments
-      (such as UNIX or Unix-like, e.g. MSYS, you have to use configure
-      instead)
+NOTE: The makefile.gcc makefiles are for compilation under MinGW using
+      native make and Windows command interpreter (command.com/cmd.exe), they
+      won't work in other environments (such as UNIX or Unix-like, e.g. MSYS;
+      you have to use configure instead)
 
 Here are the steps required using the provided makefiles:
 
@@ -557,14 +555,15 @@ build\msw\config.* file; more detailed description follows.
 Basic options
 -------------
 
-BUILD=debug
-  Builds debug version of the library (default is 'release'). This affects
-  name of the library ('d' is appended), __WXDEBUG__ is defined and debug
-  information compiled into object files and the executable.
+BUILD=release
+  Builds release version of the library. It differs from default 'debug' 
+  in lack of appended 'd' in name of library, does not define __WXDEBUG__
+  and not include debug information compiled into object files and the 
+  executable.
 
-SHARED=0
-  Build static libraries instead of DLLs. By default, DLLs are built
-  (SHARED=1).
+SHARED=1
+  Build shared libraries (DLLs). By default, DLLs are not built
+  (SHARED=0).
 
 UNICODE=1
   To build Unicode versions of the libraries, add UNICODE=1 to make invocation
@@ -609,6 +608,10 @@ USE_HTML=0
   Do not build wxHTML library. If MONOLITHIC=1, then you must also
   #define wxUSE_HTML 1 in setup.h.
 
+USE_XRC=0
+  Do not build XRC resources library. If MONOLITHIC=1, then you must also
+  #define wxUSE_HTML 1 in setup.h.
+
 RUNTIME_LIBS=static
   Links static version of C and C++ runtime libraries into the executable, so
   that the program does not depend on DLLs provided with the compiler (e.g.