diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index 135ca16f1b..877935051c 100644
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -42,7 +42,7 @@ do?</a></li>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="related" id="related">Related Modules and Directives</a></h2>
-    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code></li><li><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code></li><li><code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li></ul></td></tr></table>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="introduction" id="introduction">Introduction</a></h2>
@@ -340,7 +340,9 @@ do?</a></h2>
 <h2><a name="moreinformation" id="moreinformation">More information</a></h2>
     <p>You should also read the documentation for
     <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> and <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> which
-    contain some more information about how this all works.</p>
+    contain some more information about how this all works.
+    <code class="module"><a href="../mod/mod_authn_alias.html">mod_authn_alias</a></code> can also help in simplifying certain
+    authentication configurations.</p>
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml
index 3ae949113d..3e79237173 100644
--- a/docs/manual/howto/auth.xml
+++ b/docs/manual/howto/auth.xml
@@ -31,11 +31,12 @@
     process by which someone is allowed to be where they want to
     go, or to have information that they want to have.</p>
 </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>
@@ -47,6 +48,7 @@
         <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>
@@ -357,7 +359,9 @@ do?</title>
 <section id="moreinformation"><title>More information</title>
     <p>You should also read the documentation for
     <module>mod_auth_basic</module> and <module>mod_authz_host</module> which
-    contain some more information about how this all works.</p>
+    contain some more information about how this all works.
+    <module>mod_authn_alias</module> can also help in simplifying certain
+    authentication configurations.</p>
 </section>
 
 </manualpage>
diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index 5d364f40a7..a3a320d4d6 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -41,9 +41,12 @@
 
       <dt>Authn/Authz</dt>
       <dd>The bundled authentication and authorization modules have
-          been refactored.  There is a new authentication backend provider
-          scheme which greatly eases the construction of new authentication
-          backends.</dd>
+          been refactored.  The new <code class="module"><a href="./mod/mod_authn_alias.html">mod_authn_alias</a></code> module
+          can greatly simplify certain authentication configurations.
+          See <a href="#module">module name changes</a>, and
+          <a href="#developer">the developer changes</a> for more
+          information about how these changes affects users and module
+          writers.</dd>
 
       <dt>Caching</dt>
       <dd><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>, and
@@ -113,6 +116,17 @@
 <h2><a name="module" id="module">Module Enhancements</a></h2>
     
     <dl>
+      <dt>Authn/Authz</dt>
+      <dd>Modules in the aaa directory have been renamed and offer
+          better support for digest authentication.  For example, mod_auth
+          is now split into <code class="module"><a href="./mod/mod_auth_basic.html">mod_auth_basic</a></code> and
+          <code class="module"><a href="./mod/mod_auth_file.html">mod_auth_file</a></code>; mod_auth_dbm is now called
+          <code class="module"><a href="./mod/mod_authn_dbm.html">mod_authn_dbm</a></code>; mod_access has been renamed
+          <code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code>.  There is also a new
+          <code class="module"><a href="./mod/mod_authn_alias.html">mod_authn_alias</a></code> module for simplifying
+          certain authentication configurations.
+      </dd>
+
       <dt><code class="module"><a href="./mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code></dt>
       <dd>This module is a port of the 2.0 
           <code>mod_auth_ldap</code> module to the 2.2 <code>Authn/Authz</code> 
@@ -156,6 +170,19 @@
           <code>APR-Util</code>. For details, see the 
           <a href="http://apr.apache.org/">APR Website</a>.</dd>
 
+      <dt>Authn/Authz</dt>
+      <dd>The bundled authentication and authorization modules have
+          been renamed along the following lines:
+          <ul>
+          <li>mod_auth_*  -&gt; Modules that implement an HTTP authentication mechanism</li>
+          <li>mod_authn_* -&gt; Modules that provide a backend authentication provider</li>
+          <li>mod_authz_* -&gt; Modules that implement authorization (or access)</li>
+          <li>mod_authnz_*-&gt; Module that implements both authentication &amp; authorization</li>
+          </ul>
+          There is a new authentication backend provider
+          scheme which greatly eases the construction of new authentication
+          backends.</dd>
+
       <dt>Connection Error Logging</dt>
 
       <dd>A new function, <code>ap_log_cerror</code> has been added to log
diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index 60b1f6e848..6867b84072 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -37,9 +37,12 @@
 
       <dt>Authn/Authz</dt>
       <dd>The bundled authentication and authorization modules have
-          been refactored.  There is a new authentication backend provider
-          scheme which greatly eases the construction of new authentication
-          backends.</dd>
+          been refactored.  The new <module>mod_authn_alias</module> module
+          can greatly simplify certain authentication configurations.
+          See <a href="#module">module name changes</a>, and
+          <a href="#developer">the developer changes</a> for more
+          information about how these changes affects users and module
+          writers.</dd>
 
       <dt>Caching</dt>
       <dd><module>mod_cache</module>, <module>mod_disk_cache</module>, and
@@ -110,6 +113,17 @@
   <section id="module">
     <title>Module Enhancements</title>
     <dl>
+      <dt>Authn/Authz</dt>
+      <dd>Modules in the aaa directory have been renamed and offer
+          better support for digest authentication.  For example, mod_auth
+          is now split into <module>mod_auth_basic</module> and
+          <module>mod_auth_file</module>; mod_auth_dbm is now called
+          <module>mod_authn_dbm</module>; mod_access has been renamed
+          <module>mod_authz_host</module>.  There is also a new
+          <module>mod_authn_alias</module> module for simplifying
+          certain authentication configurations.
+      </dd>
+
       <dt><module>mod_authnz_ldap</module></dt>
       <dd>This module is a port of the 2.0 
           <code>mod_auth_ldap</code> module to the 2.2 <code>Authn/Authz</code> 
@@ -153,6 +167,19 @@
           <code>APR-Util</code>. For details, see the 
           <a href="http://apr.apache.org/">APR Website</a>.</dd>
 
+      <dt>Authn/Authz</dt>
+      <dd>The bundled authentication and authorization modules have
+          been renamed along the following lines:
+          <ul>
+          <li>mod_auth_*  -> Modules that implement an HTTP authentication mechanism</li>
+          <li>mod_authn_* -> Modules that provide a backend authentication provider</li>
+          <li>mod_authz_* -> Modules that implement authorization (or access)</li>
+          <li>mod_authnz_*-> Module that implements both authentication &amp; authorization</li>
+          </ul>
+          There is a new authentication backend provider
+          scheme which greatly eases the construction of new authentication
+          backends.</dd>
+
       <dt>Connection Error Logging</dt>
 
       <dd>A new function, <code>ap_log_cerror</code> has been added to log