You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2011/10/10 13:32:53 UTC

svn commit: r1180879 - in /httpd/httpd/trunk/docs/manual/mod: mod_rewrite.html.en mod_rewrite.xml

Author: rbowen
Date: Mon Oct 10 11:32:53 2011
New Revision: 1180879

URL: http://svn.apache.org/viewvc?rev=1180879&view=rev
Log:
Further clarifications of the rewrite process, as per ticket #52000

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=1180879&r1=1180878&r2=1180879&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Mon Oct 10 11:32:53 2011
@@ -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 substi
 
       <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

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=1180879&r1=1180878&r2=1180879&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml Mon Oct 10 11:32:53 2011
@@ -901,7 +901,7 @@ RewriteRule  ^/$                 /homepa
       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 substi
 
       <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