From cec5fed21d9a18e22e46ababe0ab8b63818f89ca Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@apache.org>
Date: Thu, 4 Nov 2010 15:51:51 +0000
Subject: [PATCH] Note that RewriteOptions inherit causes parent rules to be
 applied AFTER child scope rules. PR46399

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031046 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_rewrite.html.en | 12 ++++++++++--
 docs/manual/mod/mod_rewrite.xml     | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index d5722d3e37..21eadbdce8 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -799,7 +799,9 @@ 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
@@ -812,7 +814,13 @@ later</td></tr>
       the local rules. The position of this directive - below or above
       of local rules - has no influence on this behavior. If local
       rules forced the rewriting to stop, the inherited rules won't
-      be processed.</dd>
+      be processed.</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 762633e03c..39873be967 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -141,7 +141,9 @@ 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
@@ -154,7 +156,13 @@ later</compatibility>
       the local rules. The position of this directive - below or above
       of local rules - has no influence on this behavior. If local
       rules forced the rewriting to stop, the inherited rules won't
-      be processed.</dd>
+      be processed.</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>
 
-- 
2.40.0