Merge r1914039, r1914040 from trunk:

remove apachehaus

I've read in two places they are no longer providing builds,
and the website is currently down.

[skip ci]

mention httpd.conf and install root dependency

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914041 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index 135d3d58995d0257f2672fa6610b0c56e3bd79eb..f68eaa0d12f8d4ab574535dedcd5bd4672faf89e 100644 (file)
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -64,7 +64,6 @@
     <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://bitnami.com/stack/wamp">Bitnami WAMP Stack</a></li>
     <li><a href="http://www.wampserver.com/">WampServer</a></li>
@@ -82,6 +81,13 @@
     Windows. See the <a href="../mod/directives.html">directive index</a>
     for all the available directives.</p>
 
+    <p>The default configuration of the source distribution expects the server
+    to be installed into \Apache24. This can be customized at compilation time,
+    but it's important that ultimately the <directive>ServerRoot</directive> in
+    httpd.conf match the actual installation root. Binary distributions may
+    customize either the default installation root or the overall layout of
+    the initial configuration.</p>
+
     <p>The main differences in Apache for Windows are:</p>
     <ul>
       <li><p>Because Apache for Windows is multithreaded, it does not