From: Daniel Gruno <humbedooh@apache.org>
Date: Tue, 1 May 2012 09:43:51 +0000 (+0000)
Subject: Try to clarify what is matched in a rewrite rule as per bug #53080.
X-Git-Tag: 2.5.0-alpha~6930
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e33f1a0cb69cb46027923a351b6c3301cba72c96;p=thirdparty%2Fapache%2Fhttpd.git

Try to clarify what is matched in a rewrite rule as per bug #53080.



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

diff --git a/docs/manual/rewrite/intro.html.en b/docs/manual/rewrite/intro.html.en
index 3cff570b4d8..314204c99a1 100644
--- a/docs/manual/rewrite/intro.html.en
+++ b/docs/manual/rewrite/intro.html.en
@@ -168,12 +168,15 @@ of three arguments separated by spaces. The arguments are</p>
 <li><var>[flags]</var>: options affecting the rewritten request.</li>
 </ol>
 
-<p>The <var>Pattern</var> is always a <a href="#regex">regular
-expression</a> matched against the URL-Path of the incoming request
-(the part after the hostname but before any question mark indicating
-the beginning of a query string) or, in per-directory context, against 
-the request's path relative to the directory for which the rule is 
-defined.</p>
+<p>The <var>Pattern</var> is a <a href="#regex">regular expression</a>. 
+It is initially (for the first rewrite rule or until a substitution occurs) 
+matched against the URL-path of the incoming request (the part after the 
+hostname but before any question mark indicating the beginning of a query 
+string) or, in per-directory context, against the request's path relative 
+to the directory for which the rule is defined. Once a substitution has 
+occured, the rules that follow are matched against the substituted
+value.
+</p>
 
 <p class="figure">
       <img src="../images/syntax_rewriterule.png" alt="Syntax of the RewriteRule directive" /><br />
diff --git a/docs/manual/rewrite/intro.xml b/docs/manual/rewrite/intro.xml
index 88a64d2e7db..ea0d4db321e 100644
--- a/docs/manual/rewrite/intro.xml
+++ b/docs/manual/rewrite/intro.xml
@@ -173,12 +173,15 @@ of three arguments separated by spaces. The arguments are</p>
 <li><var>[flags]</var>: options affecting the rewritten request.</li>
 </ol>
 
-<p>The <var>Pattern</var> is always a <a href="#regex">regular
-expression</a> matched against the URL-Path of the incoming request
-(the part after the hostname but before any question mark indicating
-the beginning of a query string) or, in per-directory context, against 
-the request's path relative to the directory for which the rule is 
-defined.</p>
+<p>The <var>Pattern</var> is a <a href="#regex">regular expression</a>. 
+It is initially (for the first rewrite rule or until a substitution occurs) 
+matched against the URL-path of the incoming request (the part after the 
+hostname but before any question mark indicating the beginning of a query 
+string) or, in per-directory context, against the request's path relative 
+to the directory for which the rule is defined. Once a substitution has 
+occured, the rules that follow are matched against the substituted
+value.
+</p>
 
 <p class="figure">
       <img src="../images/syntax_rewriterule.png"