Merge r1642581, r1642584 from trunk:

even out some whitespace

add a few more examples per feedback

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

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index 1f225ca89e03129b67ce35c049cf6b2dc6240bcb..033e56c7b03158b61b2edbc165f5eb60ac8e8129 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -552,7 +552,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 &lt;/Directory&gt;     
 
 # Check a HTTP header for a list of values
-&lt;If "%{HTTP:X-example-header} in { 'foo', 'bar', 'baz'}"&gt;
+&lt;If "%{HTTP:X-example-header} in { 'foo', 'bar', 'baz' }"&gt;
     Header set matched true
 &lt;/If&gt;
 

diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 2c5c1b80833a8cb22c793bfdfc98500b02f3ad2c..3d58f569bb51f5ab4adffb8c4d56dcbc58cb2aa0 100644 (file)
--- a/docs/manual/mod/mod_authz_core.xml
+++ b/docs/manual/mod/mod_authz_core.xml
@@ -231,6 +231,17 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
         Require expr "%{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17"
     </highlight>
 
+    <highlight language="config">
+&lt;RequireAll&gt;
+    Require expr "!(%{QUERY_STRING} =~ /secret/)"
+    Require expr "%{REQUEST_URI} in { '/example.cgi' }" 
+&lt;/RequireAll&gt;
+    </highlight>
+
+    <highlight language="config">
+        Require expr "!(%{QUERY_STRING} =~ /secret/) &amp;&amp; %{REQUEST_URI} in { '/example.cgi' }" 
+    </highlight>
+
   <p>The syntax is described in the <a href="../expr.html">ap_expr</a>
   documentation.</p>