Merge r1601532 from trunk:

simplify/clarify that negation operates on an entire condition and not
on the regex or the special test conditions. Comment #1291.

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

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 166f02dcec82c24d6b5e313fcf11706ad945d205..786f31fedf95c1e40717b318eb101449781853f2 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -473,8 +473,9 @@ Alias /myapp /opt/myapp-1.2.3
 
       <ol>
         <li>You can prefix the pattern string with a
-        '<code>!</code>' character (exclamation mark) to specify a
-        <strong>non</strong>-matching pattern.</li>
+        '<code>!</code>' character (exclamation mark) to negate the result
+        of the condition, no matter what kind of <em>CondPattern</em> is used.
+        </li>
 
         <li>
           You can perform lexicographical string comparisons:
@@ -629,11 +630,6 @@ Alias /myapp /opt/myapp-1.2.3
 
           </ul>
 
-<div class="note"><h3>Note:</h3>
-              All of these tests can
-              also be prefixed by an exclamation mark ('!') to
-              negate their meaning.
-</div>
         </li>
 
        <li>

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 98dbd6cc456f6eaa8015d0de2ef87ba7fb536546..56fe17cfdd67ac99ee38f335158131a2e1aebc3e 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -729,8 +729,9 @@ Alias /myapp /opt/myapp-1.2.3
 
       <ol>
         <li>You can prefix the pattern string with a
-        '<code>!</code>' character (exclamation mark) to specify a
-        <strong>non</strong>-matching pattern.</li>
+        '<code>!</code>' character (exclamation mark) to negate the result
+        of the condition, no matter what kind of <em>CondPattern</em> is used.
+        </li>
 
         <li>
           You can perform lexicographical string comparisons:
@@ -885,11 +886,6 @@ Alias /myapp /opt/myapp-1.2.3
 
           </ul>
 
-<note><title>Note:</title>
-              All of these tests can
-              also be prefixed by an exclamation mark ('!') to
-              negate their meaning.
-</note>
         </li>
 
        <li>