From: Eric Covener <covener@apache.org>
Date: Thu, 4 Nov 2010 15:29:16 +0000 (+0000)
Subject: PR#17239 - mention the logical relation of multiple "Require" statement.
X-Git-Tag: 2.2.18~336
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9921bf07dcd8524aac1b33bd231f984719e28c6b;p=thirdparty%2Fapache%2Fhttpd.git

PR#17239 - mention the logical relation of multiple "Require" statement.

Not required in trunk where we have the new authz containers.



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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 428e68ab949..2b784469d19 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2493,7 +2493,9 @@ a resource</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
 </table>
     <p>This directive selects which authenticated users can access a
-    resource.  The restrictions are processed by authorization
+    resource.  Multipe instances of this directive are combined with a logical
+    "OR", such that a user matching any <code class="directive">Require </code>line is 
+    granted access.  The restrictions are processed by authorization
     modules.  Some of the allowed syntaxes provided by
     <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> and
     <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> are:</p>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index afc7fb37244..7abdd0545a9 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2488,7 +2488,9 @@ a resource</description>
 
 <usage>
     <p>This directive selects which authenticated users can access a
-    resource.  The restrictions are processed by authorization
+    resource.  Multipe instances of this directive are combined with a logical
+    "OR", such that a user matching any <directive>Require </directive>line is 
+    granted access.  The restrictions are processed by authorization
     modules.  Some of the allowed syntaxes provided by
     <module>mod_authz_user</module> and
     <module>mod_authz_groupfile</module> are:</p>