summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Slive <slive@apache.org>2005-08-26 19:54:49 +0200
committerJoshua Slive <slive@apache.org>2005-08-26 19:54:49 +0200
commit8a1e45e947ff5a2c1b6c417ea060a9bf8cfd508e (patch)
tree3571c3a3f84768d83a9709f61ef02621c751b35b
parentAllow htcacheclean to deal in gigabytes. (diff)
downloadapache2-8a1e45e947ff5a2c1b6c417ea060a9bf8cfd508e.tar.xz
apache2-8a1e45e947ff5a2c1b6c417ea060a9bf8cfd508e.zip
Make the arguments to the redirect directive clearer.
PR: 36166 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240299 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/mod/mod_alias.html.en31
-rw-r--r--docs/manual/mod/mod_alias.xml31
2 files changed, 36 insertions, 26 deletions
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index c3dbac7e1e..45573260bd 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -193,27 +193,32 @@ a different URL</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_alias</td></tr>
</table>
- <p>The Redirect directive maps an old URL into a new one. The
- new URL is returned to the client which attempts to fetch it
- again with the new address. <var>URL-path</var> a (%-decoded)
- path; any requests for documents beginning with this path will
- be returned a redirect error to a new (%-encoded) URL beginning
- with <var>URL</var>.</p>
+ <p>The Redirect directive maps an old URL into a new one by asking
+ the client to refetch the resource at the new location.</p>
+
+ <p>The old <em>URL-path</em> is a (%-decoded) path beginning with
+ a slash. A relative path is not allowed. The new <em>URL</em>
+ should be an absolute URL beginning with a scheme and hostname,
+ but a URL-path beginning with a slash may also be used, in which
+ case the scheme and hostname of the current server will be
+ added.</p>
+
+ <p>Then any request beginning with <em>URL-Path</em> will return a
+ redirect request to the client at the location of the target
+ <em>URL</em>. Additional path information beyond the matched
+ <em>URL-Path</em> will be appended to the target URL.</p>
<div class="example"><h3>Example:</h3><p><code>
- Redirect /service http://foo2.bar.com/service
+ Redirect /service http://foo2.example.com/service
</code></p></div>
- <p>If the client requests http://myserver/service/foo.txt, it
- will be told to access http://foo2.bar.com/service/foo.txt
+ <p>If the client requests http://example.com/service/foo.txt, it
+ will be told to access http://foo2.example.com/service/foo.txt
instead.</p>
<div class="note"><h3>Note</h3> <p>Redirect directives take precedence over
Alias and ScriptAlias directives, irrespective of their ordering in
-the configuration file. Also, <var>URL-path</var> must be a fully
-qualified URL, not a relative path, even when used with .htaccess files or
-inside of <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-sections.</p></div>
+the configuration file.</p></div>
<p>If no <var>status</var> argument is given, the redirect will
be "temporary" (HTTP status 302). This indicates to the client
diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml
index 7bd327bbb4..2bcb910282 100644
--- a/docs/manual/mod/mod_alias.xml
+++ b/docs/manual/mod/mod_alias.xml
@@ -184,27 +184,32 @@ a different URL</description>
<override>FileInfo</override>
<usage>
- <p>The Redirect directive maps an old URL into a new one. The
- new URL is returned to the client which attempts to fetch it
- again with the new address. <var>URL-path</var> a (%-decoded)
- path; any requests for documents beginning with this path will
- be returned a redirect error to a new (%-encoded) URL beginning
- with <var>URL</var>.</p>
+ <p>The Redirect directive maps an old URL into a new one by asking
+ the client to refetch the resource at the new location.</p>
+
+ <p>The old <em>URL-path</em> is a (%-decoded) path beginning with
+ a slash. A relative path is not allowed. The new <em>URL</em>
+ should be an absolute URL beginning with a scheme and hostname,
+ but a URL-path beginning with a slash may also be used, in which
+ case the scheme and hostname of the current server will be
+ added.</p>
+
+ <p>Then any request beginning with <em>URL-Path</em> will return a
+ redirect request to the client at the location of the target
+ <em>URL</em>. Additional path information beyond the matched
+ <em>URL-Path</em> will be appended to the target URL.</p>
<example><title>Example:</title>
- Redirect /service http://foo2.bar.com/service
+ Redirect /service http://foo2.example.com/service
</example>
- <p>If the client requests http://myserver/service/foo.txt, it
- will be told to access http://foo2.bar.com/service/foo.txt
+ <p>If the client requests http://example.com/service/foo.txt, it
+ will be told to access http://foo2.example.com/service/foo.txt
instead.</p>
<note><title>Note</title> <p>Redirect directives take precedence over
Alias and ScriptAlias directives, irrespective of their ordering in
-the configuration file. Also, <var>URL-path</var> must be a fully
-qualified URL, not a relative path, even when used with .htaccess files or
-inside of <directive type="section" module="core">Directory</directive>
-sections.</p></note>
+the configuration file.</p></note>
<p>If no <var>status</var> argument is given, the redirect will
be "temporary" (HTTP status 302). This indicates to the client