You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2014/06/10 02:02:39 UTC

svn commit: r1601533 - in /httpd/httpd/branches/2.4.x/docs/manual/mod: mod_rewrite.html.en mod_rewrite.xml

Author: covener
Date: Tue Jun 10 00:02:39 2014
New Revision: 1601533

URL: http://svn.apache.org/r1601533
Log:
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.



Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en?rev=1601533&r1=1601532&r2=1601533&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en Tue Jun 10 00:02:39 2014
@@ -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>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml?rev=1601533&r1=1601532&r2=1601533&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml Tue Jun 10 00:02:39 2014
@@ -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>