Merge r345064, r345065 from trunk:

Remove on/off arguments from AuthDigestProvider.

Provide at least a basic roadmap to the aaa modules as part of the tutorial.

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

diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml
index 3e79237173f02610172a5a9c960514aa7f19db87..ea6531886d5f4ef454309231446d4a8948049024 100644 (file)
--- a/docs/manual/howto/auth.xml
+++ b/docs/manual/howto/auth.xml
@@ -33,27 +33,54 @@
 </summary>
 
 <section id="related"><title>Related Modules and Directives</title>
-    <related>
-      <modulelist>
-        <module>mod_auth_basic</module>
-        <module>mod_auth_digest</module>
-        <module>mod_authn_file</module>
-        <module>mod_authz_groupfile</module>
-        <module>mod_authz_host</module>
-      </modulelist>
-
-      <directivelist>
-        <directive module="mod_authz_host">Allow</directive>
-        <directive module="mod_authz_groupfile">AuthGroupFile</directive>
-        <directive module="core">AuthName</directive>
-        <directive module="core">AuthType</directive>
-        <directive module="mod_authn_file">AuthUserFile</directive>
-        <directive module="mod_auth_basic">AuthBasicProvider</directive>
-        <directive module="mod_authz_host">Deny</directive>
-        <directive module="core">Options</directive>
-        <directive module="core">Require</directive>
-      </directivelist>
-    </related>
+
+<p>There are three types of modules involved in the authentication and
+authorization process.  You will usually need to choose at least one
+module from each group.</p>
+
+<ul>
+  <li>Authentication type (see the 
+      <directive module="core">AuthType</directive> directive)
+    <ul>
+      <li><module>mod_auth_basic</module></li>
+      <li><module>mod_auth_digest</module></li>
+    </ul>
+  </li>
+  <li>Authentication provider
+    <ul>
+      <li><module>mod_authn_alias</module></li>
+      <li><module>mod_authn_anon</module></li>
+      <li><module>mod_authn_dbd</module></li>
+      <li><module>mod_authn_dbm</module></li>
+      <li><module>mod_authn_default</module></li>
+      <li><module>mod_authn_file</module></li>
+      <li><module>mod_authnz_ldap</module></li>
+    </ul>
+  </li>
+  <li>Authorization (see the 
+      <directive module="core">Require</directive> directive)
+    <ul>
+      <li><module>mod_authnz_ldap</module></li>
+      <li><module>mod_authz_dbm</module></li>
+      <li><module>mod_authz_default</module></li>
+      <li><module>mod_authz_groupfile</module></li>
+      <li><module>mod_authz_owner</module></li>
+      <li><module>mod_authz_user</module></li>
+    </ul>
+  </li>
+</ul>
+
+  <p>The module <module>mod_authnz_ldap</module> is both an
+  authentication and authorization provider.  The module
+  <module>mod_authn_alias</module> is not an authentication provider
+  in itself, but allows other authentication providers to be
+  configured in a flexible manner.</p>
+
+  <p>The module <module>mod_authz_host</module> provides authorization
+  and access control based on hostname, IP address or characteristics
+  of the request, but is not part of the authentication provider
+  system.</p>
+
 </section>
 
 <section id="introduction"><title>Introduction</title>

diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml
index d71b35f13a834d0a62e59ebb7d978182a5bd32b7..b4bfdb5309e837c9dad4929977e9b11a7a7d85de 100644 (file)
--- a/docs/manual/mod/mod_auth_digest.xml
+++ b/docs/manual/mod/mod_auth_digest.xml
@@ -122,9 +122,9 @@
 <directivesynopsis>
 <name>AuthDigestProvider</name>
 <description>Sets the authentication provider(s) for this location</description>
-<syntax>AuthDigestProvider On|Off|<var>provider-name</var>
+<syntax>AuthDigestProvider <var>provider-name</var>
 [<var>provider-name</var>] ...</syntax>
-<default>AuthDigestProvider On</default>
+<default>AuthDigestProvider file</default>
 <contextlist><context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>AuthConfig</override>
@@ -132,16 +132,12 @@
 <usage>
     <p>The <directive>AuthDigestProvider</directive> directive sets 
     which provider is used to authenticate the users for this location.
-    Setting the value to <code>On</code> will choose the default provider
-    (<code>file</code>). Since the <code>file</code> provider is implemented
-    by the <module>mod_authn_file</module> module, you have to make sure,
-    that the module is present in the server.</p>
+    The default <code>file</code> provider is implemented
+    by the <module>mod_authn_file</module> module.  Make sure
+    that the chosen provider module is present in the server.</p>
 
     <p>See <module>mod_authn_dbm</module> and <module>mod_authn_file</module>
     for providers.</p>
-
-    <p>The value <code>Off</code> clears the provider list and sets it back
-    to the default.</p>
 </usage>
 </directivesynopsis>