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 2010/11/04 16:41:11 UTC

svn commit: r1031041 - in /httpd/httpd/branches/2.2.x/docs/manual/rewrite: rewrite_intro.html.en rewrite_intro.xml

Author: covener
Date: Thu Nov  4 15:41:11 2010
New Revision: 1031041

URL: http://svn.apache.org/viewvc?rev=1031041&view=rev
Log:
backport r1031038 from trunk:
    PR#47935 some people think s/except/unless makes this somewhat contrived RewriteCond example clearer.

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en
    httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en?rev=1031041&r1=1031040&r2=1031041&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en Thu Nov  4 15:41:11 2010
@@ -254,7 +254,7 @@ one <code class="directive"><a href="../
 specified, they must all match for
 the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to be
 applied. For example, to deny requests that contain the word "hack" in
-their query string, except if they also contain a cookie containing
+their query string, unless they also contain a cookie containing
 the word "go", you could use:</p>
 <div class="example"><p><code>
 RewriteCond %{QUERY_STRING} hack<br />

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml?rev=1031041&r1=1031040&r2=1031041&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml Thu Nov  4 15:41:11 2010
@@ -260,7 +260,7 @@ one <directive module="mod_rewrite">Rewr
 specified, they must all match for
 the <directive module="mod_rewrite">RewriteRule</directive> to be
 applied. For example, to deny requests that contain the word "hack" in
-their query string, except if they also contain a cookie containing
+their query string, unless they also contain a cookie containing
 the word "go", you could use:</p>
 <example>
 RewriteCond %{QUERY_STRING} hack<br />