diff options
author | Rich Bowen <rbowen@apache.org> | 2004-12-24 20:19:58 +0000 |
---|---|---|
committer | Rich Bowen <rbowen@apache.org> | 2004-12-24 20:19:58 +0000 |
commit | f40678ec5f67609cc6526d2fffa49b25c77f173c (patch) | |
tree | c5c0227e289cdcd32a8ff7ff8fbe35ba1af5569a | |
parent | 8b62fcf936d8e5ebc54b3efebc611b748a742bb0 (diff) | |
download | httpd-f40678ec5f67609cc6526d2fffa49b25c77f173c.tar.gz |
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
-rw-r--r-- | docs/manual/mod/core.html.en | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml | 2 | ||||
-rw-r--r-- | docs/manual/platform/windows.html.en | 7 | ||||
-rw-r--r-- | docs/manual/platform/windows.xml | 7 |
4 files changed, 16 insertions, 2 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 135b56684f..3993e9e08d 100644 --- 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> - <DirectoryMatch "^/www/.*/[0-9]{3}"> + <DirectoryMatch "^/www/(.+/)?[0-9]{3}"> </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 5646a624e9..f8fb4304c2 100644 --- 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> - <DirectoryMatch "^/www/.*/[0-9]{3}"> + <DirectoryMatch "^/www/(.+/)?[0-9]{3}"> </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 122d66303e..9640cdb82a 100644 --- 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 ce67fc3075..f94327dc88 100644 --- 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 |