From: Graham Leggett <minfrin@apache.org>
Date: Wed, 9 Sep 2009 21:35:50 +0000 (+0000)
Subject: Update transformations.
X-Git-Tag: 2.3.3~332
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2796419e416e914241ada3ca704a677c0be6b2ac;p=apache

Update transformations.


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

diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index 82609fbedb..b7fe3a3d61 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -38,6 +38,7 @@
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#req">Operating System Requirements</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#down">Downloading Apache for Windows</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#inst">Installing Apache for Windows</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#advinst">Advanced Installation Topics</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#cust">Customizing Apache for Windows</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#winsvc">Running Apache as a Service</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#wincons">Running Apache as a Console Application</a></li>
@@ -73,6 +74,16 @@
     single Microsoft Installer file, which contains a ready-to-run
     build of Apache.  There is a separate <code>.zip</code> file,
     which contains only the source code, see the summary above.</p>
+
+    <p>There is a choice between an *-openssl-*.msi flavor and
+    a *-no_ssl.msi flavor.  The *-openssl-*.msi flavor is distributed
+    by the Apache Software Foundation under ECCN 5D002 pursuant to 
+    US Export Law license exception TSU.  This law may or may not
+    apply to your circumstance, please review the httpd README as
+    well as the <a href="http://www.apache.org/licenses/exports/">ASF
+    Export Classifications and Source Links</a> page.  The project
+    provides no further guidance to third parties in resolving the
+    legal circumstances which apply in each circumstance.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="inst" id="inst">Installing Apache for Windows</a></h2>
@@ -159,6 +170,63 @@
     should work as installed.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
+<h2><a name="advinst" id="advinst">Advanced Installation Topics</a></h2>
+    
+
+    <p>One feature of the installer, "Build Headers and Libraries", can be
+    ignored by most users, but should be installed if compiling third party
+    modules.  The "APR Iconv Code Pages" can similarly be omitted by most
+    users, unless using <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> or a third party
+    module which relies on APR internationalization features.</p>
+
+    <p>There are requests to ship a .zip file from time to time.  There is
+    no point in the ASF consuming additional storage, mirroring and bandwidth
+    for this purpose, because the .msi installer allows the installation
+    artifacts to all be unpacked using the <code>msiexec /a</code> network
+    installation option.  Using this command against any .msi will result
+    in an exploded tree of all of the individual files and components.</p>
+
+    <p>The installation options above can be customized by users familiar
+    with msiexec.exe options and silent installation.  The actual installer
+    sources are available in the httpd/httpd/win32-msi/ tree of the httpd 
+    project subversion respository.  For reference, some of the more common
+    variables which may be modified are;</p>
+
+    <ul>
+      <li><code>AgreeToLicense</code> (toggle to "Yes")</li>
+      <li><code>ALLUSERS</code> (choose between Null and "1")</li>
+      <li><code>ApplicationUsers</code> (toggle to "OnlyCurrentUser")</li>
+      <li><code>EXISTING_APACHE_SERVICE_PATH</code></li>
+      <li><code>INSTALLDIR</code> (default "ProgramFilesFolder\Apache Software Foundation\Apache2.2\")</li>
+      <li><code>INSTALLLEVEL</code> (default "100", refer to list below)</li>
+      <li><code>RESOLVED_WINSOCK2</code> (toggle to "1")</li>
+      <li><code>SERVERADMIN</code></li>
+      <li><code>SERVERDOMAIN</code></li>
+      <li><code>SERVERNAME</code></li>
+      <li><code>SERVERPORT</code> (default "80")</li>
+      <li><code>SERVERSSLPORT</code> (default "443")</li>
+      <li><code>SERVICEINTERNALNAME</code> (default "Apache2.2", no spaces!)</li>
+      <li><code>SERVICENAME</code> (default "Apache2.2", include spaces)</li>
+      <li><code>SetupType</code> (default "Typical")</li>
+    </ul>
+
+    <p>The installation level of various features, which may be individually 
+    toggled, include;</p>
+
+    <ul>
+      <li>Apache (1, base Apache HTTP Server 2.2 feature)</li>
+      <li>ApacheDocs (11, Apache Documentation)</li>
+      <li>ApacheMonitoring (41, Apache Service Taskbar Icon)</li>
+      <li>ApacheRuntime (1, Apache Runtime)</li>
+      <li>BuildFiles (101, Build Headers and Libraries)</li>
+      <li>Iconv (21, APR Iconv Code Pages)</li>
+      <li>OpensslBin (31, OpenSSL Runtime)</li>
+      <li>SslBin (41, Ssl Binaries)</li>
+    </ul>
+
+
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="cust" id="cust">Customizing Apache for Windows</a></h2>
     
 
diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko
index 44850c081b..9922a279a3 100644
--- a/docs/manual/platform/windows.xml.ko
+++ b/docs/manual/platform/windows.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:806186 (outdated) -->
+<!-- English Revision: 105989:813127 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/programs/ab.xml.ko b/docs/manual/programs/ab.xml.ko
index b288a12a8e..2bb3dcec2c 100644
--- a/docs/manual/programs/ab.xml.ko
+++ b/docs/manual/programs/ab.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:706880 (outdated) -->
+<!-- English Revision: 105989:811869 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/programs/ab.xml.meta b/docs/manual/programs/ab.xml.meta
index 48efeb0080..f4fcc8a3b2 100644
--- a/docs/manual/programs/ab.xml.meta
+++ b/docs/manual/programs/ab.xml.meta
@@ -9,6 +9,6 @@
   <variants>
     <variant>en</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/programs/ab.xml.tr b/docs/manual/programs/ab.xml.tr
index 511a270247..1936a6efb2 100644
--- a/docs/manual/programs/ab.xml.tr
+++ b/docs/manual/programs/ab.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 706880 -->
+<!-- English Revision: 706880:811869 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>