backport r1031038 from trunk:

    PR#47935 some people think s/except/unless makes this somewhat contrived RewriteCond example clearer.

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

diff --git a/docs/manual/rewrite/rewrite_intro.html.en b/docs/manual/rewrite/rewrite_intro.html.en
index c339ec9371314e9f8816fa2d2840eca5cf66104e..05023e0c5540854f6584a505b31a116cb6b5e225 100644 (file)
--- a/docs/manual/rewrite/rewrite_intro.html.en
+++ b/docs/manual/rewrite/rewrite_intro.html.en
@@ -254,7 +254,7 @@ one <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">Rewrit
 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 />

diff --git a/docs/manual/rewrite/rewrite_intro.xml b/docs/manual/rewrite/rewrite_intro.xml
index 1be803cf985c16c95f3cecb02e3dd27ccc364bc5..4e2c74a0f3aa7e443da9a164b31126bffdbb34c8 100644 (file)
--- a/docs/manual/rewrite/rewrite_intro.xml
+++ b/docs/manual/rewrite/rewrite_intro.xml
@@ -260,7 +260,7 @@ one <directive module="mod_rewrite">RewriteCond</directive> is
 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 />