From 44bd5812f9a27004ec44dc9ee09d3fd6bbcc4a02 Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Fri, 2 Oct 2009 15:39:46 +0000
Subject: [PATCH] Remove text implying "Require valid-user" is handled by
 mod_authnz_ldap, which makes the behavior of AuthzLDAPAuthoritative more
 intuitive.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@821062 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_authnz_ldap.html.en | 15 +++------------
 docs/manual/mod/mod_authnz_ldap.xml     | 15 +++------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en
index 3c731ce956d..c9b268da035 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.en
+++ b/docs/manual/mod/mod_authnz_ldap.html.en
@@ -109,7 +109,6 @@ for HTTP Basic authentication.</td></tr>
         <a href="#requiredirectives">The Require Directives</a> 
 
         <ul>
-          <li><a href="#reqvaliduser">Require valid-user</a></li>
           <li><a href="#requser">Require ldap-user</a></li>
           <li><a href="#reqgroup">Require ldap-group</a></li>
           <li><a href="#reqdn">Require ldap-dn</a></li>
@@ -261,9 +260,9 @@ for HTTP Basic authentication.</td></tr>
     was set to <code>off</code>. </p>
 
     <ul>
-        <li>Grant access if there is a <a href="#requser"><code>Require
-        valid-user</code></a> directive. (requires 
-        <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code>)</li>
+        <li>Grant access to all successfully authenticated users if 
+        there is a <a href="#requser"><code>Require valid-user</code></a> 
+        directive. (requires <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code>)</li>
 
         <li>Grant access if there is a <a href="#reqgroup"><code>Require group</code></a> directive, and
         <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> has been loaded with the 
@@ -323,14 +322,6 @@ for HTTP Basic authentication.</td></tr>
     <code>ldap-filter</code>.  Other authorization types may also be 
     used but may require that additional authorization modules be loaded.</p>
 
-<h3><a name="reqvaliduser" id="reqvaliduser">Require valid-user</a></h3>
-
-    <p>If this directive exists, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> grants
-    access to any user that has successfully authenticated during the
-    search/bind phase.  Requires that <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> be 
-    loaded.</p>
-
-
 <h3><a name="requser" id="requser">Require ldap-user</a></h3>
 
     <p>The <code>Require ldap-user</code> directive specifies what
diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml
index d96565668b1..75642b0d7de 100644
--- a/docs/manual/mod/mod_authnz_ldap.xml
+++ b/docs/manual/mod/mod_authnz_ldap.xml
@@ -84,7 +84,6 @@ for HTTP Basic authentication.</description>
         <a href="#requiredirectives">The Require Directives</a> 
 
         <ul>
-          <li><a href="#reqvaliduser">Require valid-user</a></li>
           <li><a href="#requser">Require ldap-user</a></li>
           <li><a href="#reqgroup">Require ldap-group</a></li>
           <li><a href="#reqdn">Require ldap-dn</a></li>
@@ -240,9 +239,9 @@ for HTTP Basic authentication.</description>
     was set to <code>off</code>. </p>
 
     <ul>
-        <li>Grant access if there is a <a href="#requser"><code>Require
-        valid-user</code></a> directive. (requires 
-        <module>mod_authz_user</module>)</li>
+        <li>Grant access to all successfully authenticated users if 
+        there is a <a href="#requser"><code>Require valid-user</code></a> 
+        directive. (requires <module>mod_authz_user</module>)</li>
 
         <li>Grant access if there is a <a
         href="#reqgroup"><code>Require group</code></a> directive, and
@@ -306,14 +305,6 @@ for HTTP Basic authentication.</description>
     <code>ldap-filter</code>.  Other authorization types may also be 
     used but may require that additional authorization modules be loaded.</p>
 
-<section id="reqvaliduser"><title>Require valid-user</title>
-
-    <p>If this directive exists, <module>mod_authnz_ldap</module> grants
-    access to any user that has successfully authenticated during the
-    search/bind phase.  Requires that <module>mod_authz_user</module> be 
-    loaded.</p>
-</section>
-
 <section id="requser"><title>Require ldap-user</title>
 
     <p>The <code>Require ldap-user</code> directive specifies what
-- 
2.47.3