winbuild: Aligned BUILD.WINDOWS.txt and Makefile.vc usage help

diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index 7d68110..53030cb 100644 (file)
--- a/winbuild/BUILD.WINDOWS.txt
+++ b/winbuild/BUILD.WINDOWS.txt
@@ -45,24 +45,26 @@ Once you are in the console, go to the winbuild directory in the Curl
 sources:\r
     cd curl-src\winbuild\r
 \r
-Then you can call nmake /f makefile with the desired options (see below).\r
+Then you can call nmake /f Makefile.vc with the desired options (see below).\r
 The builds will be in the top src directory, builds\ directory, in \r
 a directory named using the options given to the nmake call.\r
 \r
-nmake /f makefile.vc mode=<static or dll> <options>\r
+nmake /f Makefile.vc mode=<static or dll> <options>\r
+\r
 where <options> is one or many of:\r
   VC=<6,7,8,9,10>              - VC versions\r
   WITH_DEVEL=<path>            - Paths for the development files (SSL, zlib, etc.)\r
-                                 Default to sibbling directory deps: ../deps\r
+                                 Defaults to sibbling directory deps: ../deps\r
                                  Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/\r
                                  Uncompress them into the deps folder.\r
   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static\r
-  WITH_ZLIB=<dll or static>    - Enable ZLib support, DLL or static\r
-  WITH_SSH2=<dll or static>    - Enable LIbSSH2 support, DLL or static\r
-  USE_SSSPI=<yes or no>        - Enable SSPI support, default to yes\r
-  USE_IPV6=<yes or no>         - Enable IPV6, default to yes\r
+  WITH_ZLIB=<dll or static>    - Enable zlib support, DLL or static\r
+  WITH_SSH2=<dll or static>    - Enable libSSH2 support, DLL or static\r
+  ENABLE_SSPI=<yes or no>      - Enable SSPI support, defaults to yes\r
+  ENABLE_IPV6=<yes or no>      - Enable IPv6, defaults to yes\r
+  ENABLE_IDN=<yes or no>       - Enable use of Windows IDN APIs, defaults to yes\r
+                                 Requires Windows Vista or later, or installation from:\r
+                                 http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815\r
+  ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes\r
+  GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
   DEBUG=<yes or no>            - Debug builds\r
-  USE_IDN=<yes or no>          - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.\r
-                                 or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815\r
-  GEN_PDB=<yes or no>          - Generate Program Database (debug symbols release build)\r
-\r

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index a757478..be93381 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -13,22 +13,23 @@ CFGSET=true
 # Usage\r
 #\r
 \r
-!MESSAGE Usage: nmake /f makefile.vc mode=<static or dll> <options>\r
+!MESSAGE Usage: nmake /f Makefile.vc mode=<static or dll> <options>\r
 !MESSAGE where <options> is one or many of:\r
 !MESSAGE   VC=<6,7,8,9,10>              - VC versions\r
 !MESSAGE   WITH_DEVEL=<path>            - Paths for the development files (SSL, zlib, etc.)\r
-!MESSAGE                                  Default to sibbling directory deps: ../deps\r
+!MESSAGE                                  Defaults to sibbling directory deps: ../deps\r
 !MESSAGE                                  Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/\r
 !MESSAGE                                  Uncompress them into the deps folder.\r
 !MESSAGE   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static\r
-!MESSAGE   WITH_ZLIB=<dll or static>    - Enable ZLib support, DLL or static\r
-!MESSAGE   WITH_SSH2=<dll or static>    - Enable LIbSSH2 support, DLL or static\r
-!MESSAGE   ENABLE_SSPI=<yes or no>      - Enable SSPI support, default to yes\r
-!MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPV6, default to yes\r
-!MESSAGE   ENABLE_IDN=<yes or no>       - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.\r
-!MESSAGE                                  or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815\r
-!MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, default to yes\r
-!MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols release build)\r
+!MESSAGE   WITH_ZLIB=<dll or static>    - Enable zlib support, DLL or static\r
+!MESSAGE   WITH_SSH2=<dll or static>    - Enable libSSH2 support, DLL or static\r
+!MESSAGE   ENABLE_SSPI=<yes or no>      - Enable SSPI support, defaults to yes\r
+!MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPv6, defaults to yes\r
+!MESSAGE   ENABLE_IDN=<yes or no>       - Enable use of Windows IDN APIs, defaults to yes\r
+!MESSAGE                                  Requires Windows Vista or later, or installation from:\r
+!MESSAGE                                  http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815\r
+!MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes\r
+!MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
 !MESSAGE   DEBUG=<yes or no>            - Debug builds\r
 !ERROR please choose a valid mode\r
 \r