From: Eric Covener <covener@apache.org>
Date: Tue, 10 Jun 2014 00:02:39 +0000 (+0000)
Subject: Merge r1601532 from trunk:
X-Git-Tag: 2.4.10~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb8f9865cac18e87423461abec03a18f397d466;p=thirdparty%2Fapache%2Fhttpd.git

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 166f02dcec8..786f31fedf9 100644
--- 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 98dbd6cc456..56fe17cfdd6 100644
--- 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>