httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbo...@apache.org
Subject svn commit: r1180734 - in /httpd/httpd/trunk/docs/manual/mod: mod_rewrite.html.en mod_rewrite.xml
Date Sun, 09 Oct 2011 22:29:41 GMT
Author: rbowen
Date: Sun Oct  9 22:29:41 2011
New Revision: 1180734

URL: http://svn.apache.org/viewvc?rev=1180734&view=rev
Log:
Clarify behavior of multiple rewrite rules in the same scope. refs https://issues.apache.org/bugzilla/show_bug.cgi?id=51968

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml

Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en?rev=1180734&r1=1180733&r2=1180734&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Sun Oct  9 22:29:41 2011
@@ -936,7 +936,7 @@ and automatically <em>added</em> after a
 slash or protocol name) substitution encounters the end of a rule set.
 See the <code class="directive"><a href="#rewritebase">RewriteBase</a></code>
 directive for more information regarding what prefix will be added back to
-relative substutions.</li>
+relative substitions.</li>
 
 <li> If you wish to match against the full URL-path in a per-directory
 (htaccess) RewriteRule, use the <code>%{REQUEST_URI}</code> variable in
@@ -1045,14 +1045,16 @@ cannot use <code>$N</code> in the substi
       <code>RewriteMap</code> directive and are explained there.
       These three types of variables are expanded in the order above.</p>
 
-      <p>As already mentioned, all rewrite rules are
-      applied to the <em>Substitution</em> (in the order in which
-      they are defined
-      in the config file). The URL is <strong>completely
+      <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
       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
-      <code><strong>L</strong></code> flag.</p>
+      <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
+      <code><strong>F</strong></code>.</p>
 
      <div class="note"><h3>Modifying the Query String</h3>
       <p>By default, the query string is passed through unchanged. You

Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml?rev=1180734&r1=1180733&r2=1180734&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml Sun Oct  9 22:29:41 2011
@@ -940,7 +940,7 @@ and automatically <em>added</em> after a
 slash or protocol name) substitution encounters the end of a rule set.
 See the <directive module="mod_rewrite">RewriteBase</directive>
 directive for more information regarding what prefix will be added back to
-relative substutions.</li>
+relative substitions.</li>
 
 <li> If you wish to match against the full URL-path in a per-directory
 (htaccess) RewriteRule, use the <code>%{REQUEST_URI}</code> variable in
@@ -1053,14 +1053,16 @@ cannot use <code>$N</code> in the substi
       <code>RewriteMap</code> directive and are explained there.
       These three types of variables are expanded in the order above.</p>
 
-      <p>As already mentioned, all rewrite rules are
-      applied to the <em>Substitution</em> (in the order in which
-      they are defined
-      in the config file). The URL is <strong>completely
+      <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
       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
-      <code><strong>L</strong></code> flag.</p>
+      <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
+      <code><strong>F</strong></code>.</p>
 
      <note><title>Modifying the Query String</title>
       <p>By default, the query string is passed through unchanged. You



Mime
View raw message