From ecdbd5b0374d4771f2b011cb65978fb8f8a5cce5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 22 Jul 2010 12:08:54 +0000
Subject: [PATCH] Don't mention non-existent setup.exe in wxMSW installation
 notes.

Also expand setup.h section.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/msw/install.txt | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 7654a461bc..bcb980f780 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -25,33 +25,31 @@ addressed sooner.
 
 
 Unarchiving
-============================================================
+===========
 
-A setup program is provided (wxMSW-x.x.x-setup.exe) to automatically copy
-files to a directory on your hard disk. Do not install into a
-path that contains spaces.
+Please simply uncompress the .zip file manually into any directory.
+However we advise avoiding using directories with spaces in their
+names (notably "C:\Program Files") as this risks creating problems
+with makefiles and other command-line tools.
 
-The setup program contains the following:
 
-- All common, generic and MSW-specific wxWidgets source;
-- samples and demos;
-- documentation in MS HTML Help format;
-- makefiles for most Windows compilers, plus CodeWarrior
-  and VC++ IDE files;
-- JPEG, TIFF, PNG, ZLIB, wxSTC, REGEX, EXPAT library sources.
+Configuration
+=============
 
-Alternatively, you may unarchive the .zip form by hand:
-wxMSW-x.y.z.zip where x.y.z is the version number.
+In the majority of cases, you don't need to change the default
+library build configuration. If you wish to change some of the build
+options you need to edit the include/wx/msw/setup.h file enabling or
+disabling the features you would like to compile wxWidgets with[out].
 
-Unarchive the required files plus any optional documentation
-files into a suitable directory such as c:\wx.
+NB: If you checked your sources from version control repository and
+    didn't obtain them from a release file, the file above doesn't
+    exist and you will need to copy include/wx/msw/setup0.h to
+    include/wx/msw/setup.h.
 
-General installation notes
-==========================
+Notice that this file is later copied into a directory under lib for
+each of the build configurations which allows to have different
+build options for different configurations too.
 
-If installing from the SVN server, copy include/wx/msw/setup0.h to
-include/wx/msw/setup.h and edit the resulting file to choose
-the features you would like to compile wxWidgets with[out].
 
 Compilation
 ===========