New changes to win32 docs, regenerated

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

diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en
index 7a6bd5e2cc6cd393e702568c41b935f95dc2c0e3..ff1766404b69315f8774b8a930d6ead8dca9abb5 100644 (file)
--- a/docs/manual/platform/win_compiling.html.en
+++ b/docs/manual/platform/win_compiling.html.en
@@ -132,29 +132,38 @@
         <code>openssl</code>, obtained from <a href="http://www.openssl.org/source/">http://www.openssl.org/source/</a>, in order to compile <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>
         or the abs project (<code>ab.exe</code> with SSL support.) To prepare OpenSSL
         for both <code>release</code> and <code>debug</code> builds of Apache, and
-        disable the patent protected features in 0.9.7,  you might use the following
+        disable the patent protected features in OpenSSL,  you might use the following
         build commands:</p>
 
         <div class="example"><p><code>
           perl Configure VC-WIN32<br />
           perl util\mkfiles.pl &gt;MINFO<br />
-          perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile<br />
+          perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile.rel<br />
           perl util\mk1mf.pl dll debug no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile.dbg<br />
           perl util\mkdef.pl 32 libeay no-asm no-mdc2 no-rc5 no-idea &gt;ms\libeay32.def<br />
           perl util\mkdef.pl 32 ssleay no-asm no-mdc2 no-rc5 no-idea &gt;ms\ssleay32.def<br />
-          nmake<br />
+          nmake -f makefile.rel<br />
           nmake -f makefile.dbg
         </code></p></div>
 
+        <p>Note; you can use the scripts in the <code>ms\</code> subdirectory, however,
+        it's rather tricky to force <code>ms\do_masm.bat</code>, for example, to perform
+        the patent encumberances as mentioned above.  Patches to add the $* argument list
+        to the appropriate .bat lines in these scripts aren't incorporated, thus far.</p>
       </li>
 
       <li>
-        <p>[Optional] zlib sources (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
+        <p>[Optional] zlib library (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
         <p>Zlib must be installed into a <code>srclib</code> subdirectory named
-        <code>zlib</code>, however those sources need not be compiled. The build system
-        will compile the compression sources directly into the <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>
-        module. Zlib can be obtained from <a href="http://www.gzip.org/zlib/">http://www.gzip.org/zlib/</a> -- <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is
-        confirmed to build correctly with version 1.1.4.</p>
+        <code>zlib</code>.  This must be built in-place.  Zlib can be obtained 
+        from <a href="http://www.zlib.net/">http://www.zlib.net/</a> -- the
+        <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is confirmed to work correctly with 
+        version 1.2.3.</p>
+
+        <div class="example"><p><code>
+          nmake -f win32\Makefile.msc<br />
+          nmake -f win32\Makefile.msc test
+        </code></p></div>
       </li>
 
     </ul>

diff --git a/docs/manual/platform/win_compiling.xml.ko b/docs/manual/platform/win_compiling.xml.ko
index 9ebbe3701f705b8c2e58e8fbb9a6c80b444746b8..7c7c46dc9ce64cbcf84320cc0b795f1abe0719b6 100644 (file)
--- a/docs/manual/platform/win_compiling.xml.ko
+++ b/docs/manual/platform/win_compiling.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:395228 (outdated) -->
+<!-- English Revision: 105989:419635 (outdated) -->
 
 <!--
  Copyright 2004-2006 The Apache Software Foundation or its licensors,