From: Richard Bowen <rbowen@apache.org>
Date: Thu, 6 Jun 2013 20:05:27 +0000 (+0000)
Subject: Rebuild
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19ab9c7dd7abe110693e25d7e0727adcb71a44c8;p=thirdparty%2Fapache%2Fhttpd.git

Rebuild


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

diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index 24989ca02b9..fa9784d6ddb 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -66,6 +66,14 @@
     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.apachefriends.org/en/xampp.html">XAMPP, from
+    ApacheFriends</a></li>
+    <li><a href="http://www.wampserver.com/">WampServer</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>