Return-Path: 
 <cvs-return-25296-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 13884 invoked from network); 6 Jul 2006 19:25:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 Jul 2006 19:25:00 -0000
Received: (qmail 30061 invoked by uid 500); 6 Jul 2006 19:24:59 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 30020 invoked by uid 500); 6 Jul 2006 19:24:58 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 30006 invoked by uid 99); 6 Jul 2006 19:24:58 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 12:24:58 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 12:24:57 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id ACB461A981D; Thu,  6 Jul 2006 12:24:37 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r419669 - in /httpd/httpd/trunk/docs/manual/platform:
 win_compiling.html.en win_compiling.xml.ko
Date: Thu, 06 Jul 2006 19:24:37 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060706192437.ACB461A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: wrowe
Date: Thu Jul  6 12:24:36 2006
New Revision: 419669

URL: http://svn.apache.org/viewvc?rev=419669&view=rev
Log:

  New changes to win32 docs, regenerated

Modified:
    httpd/httpd/trunk/docs/manual/platform/win_compiling.html.en
    httpd/httpd/trunk/docs/manual/platform/win_compiling.xml.ko

Modified: httpd/httpd/trunk/docs/manual/platform/win_compiling.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/platform/win_compiling.html.en?rev=419669&r1=419668&r2=419669&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/win_compiling.html.en (original)
+++ httpd/httpd/trunk/docs/manual/platform/win_compiling.html.en Thu Jul  6 12:24:36 2006
@@ -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>

Modified: httpd/httpd/trunk/docs/manual/platform/win_compiling.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/platform/win_compiling.xml.ko?rev=419669&r1=419668&r2=419669&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/win_compiling.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/platform/win_compiling.xml.ko [euc-kr] Thu Jul  6 12:24:36 2006
@@ -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,