Change <RequireAll><RequireOne> to <SatisfyAll><SatisfyOne>. The keyword 'Satisfy' seems to fit a little better since the blocks can contain both 'Require' and 'Reject' directivesauthz-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@367678 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 10 deletions

diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml
index 5e29279298..cad2eb8e72 100644
--- a/docs/manual/howto/auth.xml
+++ b/docs/manual/howto/auth.xml
@@ -380,24 +380,24 @@ do?</title>
     you can specify just part of an address or domain name:</p>
 
     <example>
-      &lt;RequireAll&gt;<br />
+      &lt;SatisfyAll&gt;<br />
       &nbsp;  Reject ip <var>192.101.205</var><br />
       &nbsp;  Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br />
       &nbsp;  Reject host ke<br />
-      &lt;/RequireAll&gt;
+      &lt;/SatisfyAll&gt;
     </example>
 
     <p>Using the <directive module="mod_authz_host">Reject</directive> directive
-    inside of a <directive module="mod_authz_core">&lt;RequireAll&gt;</directive>
+    inside of a <directive module="mod_authz_core">&lt;SatisfyAll&gt;</directive>
     block, will let you be sure that you are actually restricting things to 
     only the group that you want to let in.</p>
 
     <p>The above example uses the <directive module="mod_authz_core">
-    &lt;RequireAll&gt;</directive> block to make sure that all of the 
+    &lt;SatisfyAll&gt;</directive> block to make sure that all of the 
     <directive module="mod_authz_host">Reject</directive> directives are 
     satisfied before granting access. The <directive module="mod_authz_core">
-    &lt;RequireAll&gt;</directive> block as well as the 
-    <directive module="mod_authz_core">&lt;RequireOne&gt;</directive> block 
+    &lt;SatisfyAll&gt;</directive> block as well as the 
+    <directive module="mod_authz_core">&lt;SatisfyOne&gt;</directive> block 
     allow you to apply "AND" and "OR" logic to the authorization processing. 
     For example the following authorization block would apply the logic:</p>
 
@@ -418,14 +418,14 @@ do?</title>
     &nbsp;  AuthBasicProvider ...<br />
     &nbsp;  ...<br />
     &nbsp;  Require user John<br />
-    &nbsp;  &lt;RequireAll&gt;<br />
+    &nbsp;  &lt;SatisfyAll&gt;<br />
     &nbsp;&nbsp;    Require Group admins<br />
     &nbsp;&nbsp;    Require ldap-group cn=mygroup,o=foo<br />
-    &nbsp;&nbsp;    &lt;RequireOne&gt;<br />
+    &nbsp;&nbsp;    &lt;SatisfyOne&gt;<br />
     &nbsp;&nbsp;&nbsp;      Require ldap-attribute dept="sales"<br />
     &nbsp;&nbsp;&nbsp;      Require file-group<br />
-    &nbsp;&nbsp;    &lt;/RequireOne&gt;<br />
-    &nbsp;  &lt;/RequireAll&gt;<br />
+    &nbsp;&nbsp;    &lt;/SatisfyOne&gt;<br />
+    &nbsp;  &lt;/SatisfyAll&gt;<br />
     &lt;/Directory&gt;<br />
     </example>