PR:

Obtained from:
Submitted by:
Reviewed by:

  Just a bit of cleanup to the 2.0 language before I crash here.

  This is exactly the reason the mpm service update isn't going into the
  alpha - big chunks of this must be rewritten first.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85391 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/platform/win_compiling.html b/docs/manual/platform/win_compiling.html
index 939aa3449daa14c7707d6a9eab710821b2651880..a415747e41e8c92cfe8a4492789ed4642838fc22 100644 (file)
--- a/docs/manual/platform/win_compiling.html
+++ b/docs/manual/platform/win_compiling.html
@@ -51,15 +51,25 @@
    the projects to assure that they are built in the appropriate order.</P>
 
 <P><STRONG>Notice: The Apache/VisualStudio project files are distributed
-   in VisualStudio 6.0 (98) format.  In fact you may use VisualStudio
-   5.0 (97) but you must first use the perl script command:<BR>
+   in VisualStudio 6.0 (98) format.</STRONG>  In fact you may build with
+   VisualStudio 5.0 (97) but you must first use the perl script command:</P>
+
 <PRE>
-<BR>
-    CD src\helpers<BR>
-    cvstodsp5.pl<BR>
-<BR>
+    cd src\helpers
+    cvstodsp5.pl
 </PRE>
 
+<P>Without running the script you will be able to load and build Apache,
+   however VisualStudio 97 in particular will not recognize the /ZI flag
+   to the C compiler for the debugging mode.  This script toggles the
+   new /ZI flag back to /Zi for Debug builds, among other adjustments.
+   The converse script in <CODE>src/helpers/dsp5tocvs.pl</CODE> will 
+   reverse the adjustments, and we ask you to do so before submitting 
+   patches against any .dsp project files.</P>
+
+<P>The Apache.dsw workspace and makefile.win nmake script both build the
+   .dsp projects of the Apache server in the following sequence:</P>
+
 <OL>
    <LI><CODE>lib\apr\aprlib.dsp</CODE>
    <LI><CODE>lib\apr\aprlibdll.dsp <EM>requires aprlib</EM></CODE>
@@ -157,9 +167,9 @@
 <P>Only the .dsp files are distributed between release builds.  The
    .mak files are NOT regenerated, due to the tremendous waste of
    reviewer's time.  Therefore, you cannot rely on the NMAKE commands 
-   above unless you -frequently- export all .mak files yourself from 
-   the project.  This is unnecessary if you build from withing the
-   Microsoft DeveloperStudio environment.</P>   
+   above to build revised .dsp project files unless you then export
+   all .mak files yourself from the project.  This is unnecessary if 
+   you build from withing the Microsoft DeveloperStudio environment.</P>   
 
 <P>Before running the server you must fill out the conf directory.
    Copy the *.conf-dist-win from the distribution conf directory

diff --git a/docs/manual/platform/windows.html b/docs/manual/platform/windows.html
index 5b7763361dd6fb8594ee222b9e0828fa1bc27782..f7d5d6f884d047aa816a918aa8801c6521a7e1bd 100644 (file)
--- a/docs/manual/platform/windows.html
+++ b/docs/manual/platform/windows.html
@@ -55,11 +55,11 @@
    "Winsock2" for Windows 95 is available 
    <A HREF="http://www.microsoft.com/windows95/downloads/">here</A>.</P>
 
-<P>If running on NT 4.0, installing Service Pack 3 or 6 is recommended, and
-   Service Pack 4 created known issues with Tcpip/winsock integrety that
-   were resolved in Service Pack 5.</P>
+<P>If running on NT 4.0, installing Service Pack 3 or 6 is recommended, as
+   Service Pack 4 created known issues with TCPIP/WinSock integrety that
+   were resolved in later Service Packs.</P>
 
-<P><STRONG>Warning, as of alpha 2.0a4 Windows 95 (and possibly 98) do not
+<P><STRONG>Warning: as of alpha 2.0a4 Windows 95 (and possibly 98) do not
    run at all.  Please don't let that stop you, however, from contributing
    the fixes required to make that platform run successfully.</STRONG></P>
 
@@ -83,7 +83,7 @@
 
 <P><STRONG>Notice: alpha versions are not distributed in binary form (as
    an .exe ready-to-run version).  You must use the Microsoft Visual C++
-   compiler version 5 or 6 (bundled in VisualStudio 97 or 2000).  Read 
+   compiler version 5 or 6 (bundled in VisualStudio 97 and 98).  Read 
    <A HREF="win_compiling.html">Compiling Apache for Microsoft Windows</A>
    for compilation/installation instructions.</STRONG></P>
 
@@ -144,8 +144,8 @@ There are two ways you can run Apache:
     This is the best option if you want Apache to automatically start when you 
     machine boots, and to keep Apache running when you log-off.
  <LI>From a <A HREF="#cmdline">console window</A>. This is the only option
-    available for Windows 95/98 users, and MUST be testedby Windows NT/2000
-    users before to attempting to install...
+    available for Windows 95/98 users, and MUST be used by Windows NT/2000
+    users before to attempting to run as a service.
 </UL>
 
 <P>To run Apache from a console window, select the "Start Apache as