From f40678ec5f67609cc6526d2fffa49b25c77f173c Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Fri, 24 Dec 2004 20:19:58 +0000 Subject: [PATCH] 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 --- docs/manual/mod/core.html.en | 2 +- docs/manual/mod/core.xml | 2 +- docs/manual/platform/windows.html.en | 7 +++++++ 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 135b56684fb..3993e9e08d7 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -759,7 +759,7 @@ subdirectories takes as an argument a regular expression. For example:

- <DirectoryMatch "^/www/.*/[0-9]{3}"> + <DirectoryMatch "^/www/(.+/)?[0-9]{3}">

would match directories in /www/ that consisted of three diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 5646a624e95..f8fb4304c24 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -712,7 +712,7 @@ subdirectories takes as an argument a regular expression. For example:

- <DirectoryMatch "^/www/.*/[0-9]{3}"> + <DirectoryMatch "^/www/(.+/)?[0-9]{3}">

would match directories in /www/ that consisted of three diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en index 122d66303ed..9640cdb82a8 100644 --- a/docs/manual/platform/windows.html.en +++ b/docs/manual/platform/windows.html.en @@ -707,6 +707,13 @@ http://127.0.0.1/

+

If you happen to be running Apache on an alternate port, you + need to explicitly put that in the URL:

+ +

+ http://127.0.0.1:8080/ +

+

Once your basic installation is working, you should configure it properly by editing the files in the conf 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 ce67fc3075f..f94327dc888 100644 --- a/docs/manual/platform/windows.xml +++ b/docs/manual/platform/windows.xml @@ -704,6 +704,13 @@ http://127.0.0.1/ +

If you happen to be running Apache on an alternate port, you + need to explicitly put that in the URL:

+ + + http://127.0.0.1:8080/ + +

Once your basic installation is working, you should configure it properly by editing the files in the conf subdirectory. Again, if you change the configuration of the Windows NT service -- 2.47.2