Merging upstream version 2.4.59.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 2 deletions

diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index 5f0ef46..d7e2b86 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -76,7 +76,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>
@@ -93,6 +92,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 <code class="directive">ServerRoot</code> 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
@@ -655,7 +661,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/platform/windows.htm
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2023 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();