Imported Upstream version 2.4.6upstream/2.4.6

1 files changed, 16 insertions, 5 deletions

diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index af93757b..5c9ab9f6 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -22,6 +22,7 @@
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.4</a> &gt; <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Using Apache HTTP Server on Microsoft Windows</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/platform/windows.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/platform/windows.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ko/platform/windows.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 
@@ -62,10 +63,19 @@
 <h2><a name="down" id="down">Downloading Apache for Windows</a></h2>
     
 
-    <p>The Apache HTTP Server Project itself does not provide binary releases of 
+    <p>The Apache HTTP Server Project itself does not provide binary releases of
     software, only source code. If you cannot compile the Apache HTTP Server
     yourself, you can obtain a binary package from numerous binary distributions
     available on the Internet.</p>
+
+    <p>Popular options for deploying Apache httpd, and, optionally, PHP
+    and MySQL, on Microsoft Windows, include:</p>
+    <ul>
+    <li><a href="http://www.apachehaus.com/cgi-bin/download.plx">ApacheHaus</a></li>
+    <li><a href="http://www.apachelounge.com/download/">Apache Lounge</a></li>
+    <li><a href="http://www.wampserver.com/">WampServer</a></li>
+    <li><a href="http://www.apachefriends.org/en/xampp.html">XAMPP</a></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>
@@ -150,7 +160,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
       runtime, without recompiling the server. If Apache is compiled
       normally, it will install a number of optional modules in the
       <code>\Apache2.4\modules</code> directory. To activate these or
-      other modules, the new <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
+      other modules, the <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
       directive must be used. For example, to activate the status
       module, use the following (in addition to the status-activating
       directives in <code>access.conf</code>):</p>
@@ -185,7 +195,7 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
       Windows event log when running on Windows NT. This mechanism
       acts as a backup for those situations where Apache is not yet
       prepared to use the <code>error.log</code> file. You can
-      review the Windows Applicat Event Log by using the Event Viewer,
+      review the Windows Application Event Log by using the Event Viewer,
       e.g. Start - Settings - Control Panel - Administrative Tools
       - Event Viewer.</p></li>
     </ul>
@@ -427,8 +437,8 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
     Programs. Change to the folder to which you installed Apache, type
     the command <code>httpd.exe</code>, and read the error message. Then
     change to the logs folder, and review the <code>error.log</code>
-    file for configuration mistakes. Assuming httpd was installed into 
-    <code>C:\Program Files\Apache Software Foundation\Apache2.4\</code>, 
+    file for configuration mistakes. Assuming httpd was installed into
+    <code>C:\Program Files\Apache Software Foundation\Apache2.4\</code>,
     you can do the following:</p>
 
     <div class="example"><p><code>
@@ -620,6 +630,7 @@ Alias /images/ //imagehost/www/images/
   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/platform/windows.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/platform/windows.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ko/platform/windows.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&amp;A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
 <script type="text/javascript"><!--//--><![CDATA[//><!--