Ported changes over from 2.0 docs.

Add port designation to test URL for Windows.html
Corrected regular expression in DirectoryMatch document

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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 135b56684fb49e1d6fbcf4c60aa10629c41f058f..3993e9e08d7bc0e90b97074d5cd87e1e8748f04a 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -759,7 +759,7 @@ subdirectories</td></tr>
     takes as an argument a regular expression. For example:</p>
 
     <div class="example"><p><code>
-      &lt;DirectoryMatch "^/www/.*/[0-9]{3}"&gt;
+      &lt;DirectoryMatch "^/www/(.+/)?[0-9]{3}"&gt;
     </code></p></div>
 
     <p>would match directories in <code>/www/</code> that consisted of three

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 5646a624e95d6e15f8003964ed8aa450bab278d2..f8fb4304c2499ecd636d14bd3e7fbfcc09f5360d 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -712,7 +712,7 @@ subdirectories</description>
     takes as an argument a regular expression. For example:</p>
 
     <example>
-      &lt;DirectoryMatch "^/www/.*/[0-9]{3}"&gt;
+      &lt;DirectoryMatch "^/www/(.+/)?[0-9]{3}"&gt;
     </example>
 
     <p>would match directories in <code>/www/</code> that consisted of three

diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index 122d66303ed77842e9bdd8fda113d1e1987411f3..9640cdb82a89481ebbafcfbd67c69d236f21d817 100644 (file)
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -707,6 +707,13 @@
       http://127.0.0.1/
     </code></p></div>
 
+    <p>If you happen to be running Apache on an alternate port, you
+    need to explicitly put that in the URL:</p>
+   
+    <div class="example"><p><code>
+       http://127.0.0.1:8080/
+    </code></p></div>
+
     <p>Once your basic installation is working, you should configure it
     properly by editing the files in the <code>conf</code> subdirectory.
     Again, if you change the configuration of the Windows NT service

diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index ce67fc3075f086f14b7ea7c60a31ef4e78257756..f94327dc888f04ba1751df4e4aaa9a9b42849b5c 100644 (file)
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -704,6 +704,13 @@
       http://127.0.0.1/
     </example>
 
+    <p>If you happen to be running Apache on an alternate port, you
+    need to explicitly put that in the URL:</p>
+   
+    <example>
+       http://127.0.0.1:8080/
+    </example>
+
     <p>Once your basic installation is working, you should configure it
     properly by editing the files in the <code>conf</code> subdirectory.
     Again, if you change the configuration of the Windows NT service