From: Rich Bowen <rbowen@apache.org>
Date: Thu, 4 Nov 2010 15:56:08 +0000 (+0000)
Subject: Mention that RewriteOptions inherit causes parent rules to be applied
X-Git-Tag: 2.2.18~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d0b908345c7abc890ebb279f8d2574393f97667;p=thirdparty%2Fapache%2Fhttpd.git

Mention that RewriteOptions inherit causes parent rules to be applied
AFTER child rules. PR46399


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1031048 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index e6b9aaeb963..8488239c648 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -1068,12 +1068,21 @@ later</td></tr>
 
       <dl>
       <dt><code>inherit</code></dt>
-      <dd>This forces the current configuration to inherit the
+      <dd>
+      
+      <p>This forces the current configuration to inherit the
       configuration of the parent. In per-virtual-server context,
       this means that the maps, conditions and rules of the main
       server are inherited. In per-directory context this means
       that conditions and rules of the parent directory's
-      <code>.htaccess</code> configuration are inherited.</dd>
+      <code>.htaccess</code> configuration are inherited.</p>
+
+      <div class="warning">
+      Rules inherited from the parent scope are applied
+      <strong>after</strong> rules specified in the child scope.
+      </div>
+      
+      </dd>
       </dl>
 
 </div>
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index a9616b47cbd..0c19004b32e 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -173,12 +173,21 @@ later</compatibility>
 
       <dl>
       <dt><code>inherit</code></dt>
-      <dd>This forces the current configuration to inherit the
+      <dd>
+      
+      <p>This forces the current configuration to inherit the
       configuration of the parent. In per-virtual-server context,
       this means that the maps, conditions and rules of the main
       server are inherited. In per-directory context this means
       that conditions and rules of the parent directory's
-      <code>.htaccess</code> configuration are inherited.</dd>
+      <code>.htaccess</code> configuration are inherited.</p>
+
+      <note type="warning">
+      Rules inherited from the parent scope are applied
+      <strong>after</strong> rules specified in the child scope.
+      </note>
+      
+      </dd>
       </dl>
 </usage>