From: Rich Bowen <rbowen@apache.org>
Date: Mon, 10 Oct 2011 11:32:53 +0000 (+0000)
Subject: Further clarifications of the rewrite process, as per ticket #52000
X-Git-Tag: 2.3.15~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e12e172c021a95414b97558bbddbdb1a8a542d0;p=thirdparty%2Fapache%2Fhttpd.git

Further clarifications of the rewrite process, as per ticket #52000


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

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 422fdbb3d03..6723e9740cf 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -899,7 +899,7 @@ later</td></tr>
       subsequent patterns are applied to the output of the last matched
       RewriteRule.</p>
 
-<div class="note"><h3>What is matched?</h3>
+<div class="note"><h3><a id="what_is_matched" name="what_is_matched">What is matched?</a></h3>
       <p>In <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> context,
       The <em>Pattern</em> will initially be matched against the part of the
       URL after the hostname and port, and before the query string (e.g. "/app1/index.html").</p>
@@ -1047,10 +1047,10 @@ cannot use <code>$N</code> in the substitution string!
 
       <p>Rewrite rules are applied to the results of previous rewrite
       rules, in the order in which they are defined
-      in the config file. The URL is <strong>completely
+      in the config file. The URI or file path (see <a href="#what_is_matched">"What is matched?"</a>, above) is <strong>completely
       replaced</strong> by the <em>Substitution</em> and the
       rewriting process continues until all rules have been applied,
-      or it is explicitly terminated by a
+      or it is explicitly terminated by an
       <a href="../rewrite/flags.html#flag_l"><code><strong>L</strong></code> flag</a>,
       or other flag which implies immediate termination, such as
       <code><strong>END</strong></code> or
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 757a45786a2..c12df7f3519 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -901,7 +901,7 @@ RewriteRule  ^/$                 /homepage.std.html  [L]
       subsequent patterns are applied to the output of the last matched
       RewriteRule.</p>
 
-<note><title>What is matched?</title>
+<note><title><a id="what_is_matched" name="what_is_matched">What is matched?</a></title>
       <p>In <directive module="core">VirtualHost</directive> context,
       The <em>Pattern</em> will initially be matched against the part of the
       URL after the hostname and port, and before the query string (e.g. "/app1/index.html").</p>
@@ -1055,10 +1055,11 @@ cannot use <code>$N</code> in the substitution string!
 
       <p>Rewrite rules are applied to the results of previous rewrite
       rules, in the order in which they are defined
-      in the config file. The URL is <strong>completely
+      in the config file. The URI or file path (see <a
+      href="#what_is_matched">"What is matched?"</a>, above) is <strong>completely
       replaced</strong> by the <em>Substitution</em> and the
       rewriting process continues until all rules have been applied,
-      or it is explicitly terminated by a
+      or it is explicitly terminated by an
       <a href="../rewrite/flags.html#flag_l"><code><strong>L</strong></code> flag</a>,
       or other flag which implies immediate termination, such as
       <code><strong>END</strong></code> or