update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97154 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index 9621265de27af0eaf9c0ffe026dba95a9b193e87..fa9270eca7059f30ced00339719db739abedabb9 100644 (file)
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -94,7 +94,7 @@
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="using" id="using">Using Environment Variables</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_access.html">mod_access</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_access.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</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_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</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_log_config.html#customlog">CustomLog</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/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
 
     <h3><a name="cgi-scripts" id="cgi-scripts">CGI Scripts</a></h3>
         

diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en
index e981de9fd52ddaaeda78c06be1aca488626b3398..4e3919e079490542b3559016e7361e3dab02774c 100644 (file)
--- a/docs/manual/howto/htaccess.html.en
+++ b/docs/manual/howto/htaccess.html.en
@@ -8,7 +8,7 @@
 <p><code>.htaccess</code> files provide a way to make configuration
 changes on a per-directory basis.</p>
 </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">.htaccess files</a></li><li><img alt="" src="../images/down.gif" /> <a href="#what">What they are/How to use them</a></li><li><img alt="" src="../images/down.gif" /> <a href="#when">When (not) to use .htaccess files</a></li><li><img alt="" src="../images/down.gif" /> <a href="#how">How directives are applied</a></li><li><img alt="" src="../images/down.gif" /> <a href="#auth">Authentication example</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ssi">Server side includes example</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi">CGI example</a></li><li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">Troubleshooting</a></li></ul></div><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">.htaccess files</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/core.html">core</a></code></li><li><code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</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/core.html">core</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_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</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_groupfile.html#authgroupfile">AuthGroupFile</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="what" id="what">What they are/How to use them</a></h2>
 
 

diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index 3b5f396ed70b5d46e03a6368ded34c8d90092ad1..e1567b5a07fcfd5cd1c62e6fb2b9d6437a8e4546 100644 (file)
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -470,7 +470,7 @@
 <h3><a name="dbm" id="dbm">DBM</a></h3>
 
     <p>Several Apache features, including
-    <code class="module"><a href="./mod/mod_auth_dbm.html">mod_auth_dbm</a></code> and <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>'s
+    <code class="module"><a href="./mod/mod_authn_dbm.html">mod_authn_dbm</a></code> and <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>'s
     DBM <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> use
     simple key/value databases for quick lookups of information.  Apache
     includes SDBM with its source-code, so this database is always

diff --git a/docs/manual/misc/rewriteguide.html.en b/docs/manual/misc/rewriteguide.html.en
index dcc93e2ca09e583a3f79002186f6525a50530733..d3caf6549a4e2efcaa3e0d7a07d50634768c687c 100644 (file)
--- a/docs/manual/misc/rewriteguide.html.en
+++ b/docs/manual/misc/rewriteguide.html.en
@@ -2041,7 +2041,7 @@ RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]
           instance a authentication which checks for a set of
           explicitly configured users. Only these should receive
           access and without explicit prompting (which would occur
-          when using the Basic Auth via <code class="module"><a href="../mod/mod_access.html">mod_access</a></code>).</p>
+          when using the Basic Auth via <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>).</p>
         </dd>
 
         <dt>Solution:</dt>

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index a8f95f708ea9a2636debf6edf2fbd8e93205df0a..20b4d389f0544f1216a772e9d5dd7dbc817ba343 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -213,7 +213,7 @@ response without an explicit character set</td></tr><tr><th><a href="directive-d
 
       Allow use of the authorization directives (<code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>,
       <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>,
-      <code class="directive"><a href="../mod/mod_authn_file.html#authgroupfile">AuthGroupFile</a></code>,
+      <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>,
       <code class="directive"><a href="#authname">AuthName</a></code>, 
       <code class="directive"><a href="#authtype">AuthType</a></code>, <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>, <code class="directive"><a href="#require">Require</a></code>, <em>etc.</em>).</dd>
 
@@ -238,7 +238,7 @@ response without an explicit character set</td></tr><tr><th><a href="directive-d
       <dt>Limit</dt>
 
       <dd>
-      Allow use of the directives controlling host access (<code class="directive"><a href="../mod/mod_access.html#allow">Allow</a></code>, <code class="directive"><a href="../mod/mod_access.html#deny">Deny</a></code> and <code class="directive"><a href="../mod/mod_access.html#order">Order</a></code>).</dd>
+      Allow use of the directives controlling host access (<code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code>, <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> and <code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code>).</dd>
 
       <dt>Options</dt>
 
@@ -267,8 +267,8 @@ authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
     <code class="directive">AuthName</code> takes a single argument; if the
     realm name contains spaces, it must be enclosed in quotation
     marks.  It must be accompanied by <code class="directive"><a href="#authtype">AuthType</a></code> and <code class="directive"><a href="#require">Require</a></code> directives, and directives such
-    as <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code> and
-    <code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code> to
+    as <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> and
+    <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> to
     work.</p>
 
    <p>For example:</p>
@@ -292,8 +292,8 @@ authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
     currently implemented. 
 
      It must be accompanied by <code class="directive"><a href="#authname">AuthName</a></code> and <code class="directive"><a href="#require">Require</a></code> directives, and directives such
-     as <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code> and
-     <code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code> to
+     as <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> and
+     <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> to
      work.</p>
 <h3>See also</h3><ul><li><a href="../howto/auth.html">Authentication, Authorization,
 and Access Control</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="CGIMapExtension" id="CGIMapExtension">CGIMapExtension</a> <a name="cgimapextension" id="cgimapextension">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
@@ -829,7 +829,7 @@ MIME content-type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
     address. (In "tcpwrappers" terminology this is called
     <code>PARANOID</code>.)</p>
 
-    <p>Regardless of the setting, when <code class="module"><a href="../mod/mod_access.html">mod_access</a></code> is
+    <p>Regardless of the setting, when <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> is
     used for controlling access by hostname, a double reverse lookup
     will be performed.  This is necessary for security. Note that the
     result of this double-reverse isn't generally available unless you
@@ -1753,8 +1753,8 @@ a resource</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
 
     <p><code class="directive">Require</code> must be accompanied by
     <code class="directive"><a href="#authname">AuthName</a></code> and <code class="directive"><a href="#authtype">AuthType</a></code> directives, and directives such
-    as <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code>
-    and <code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code> (to
+    as <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
+    and <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> (to
     define users and groups) in order to work correctly. Example:</p>
 
     <div class="example"><p><code>
@@ -1772,7 +1772,7 @@ a resource</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
     place the <code class="directive">Require</code> statement into a
     <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code>
     section.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#satisfy">Satisfy</a></code></li><li><code class="module"><a href="../mod/mod_access.html">mod_access</a></code></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RLimitCPU" id="RLimitCPU">RLimitCPU</a> <a name="rlimitcpu" id="rlimitcpu">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
+<h3>See also</h3><ul><li><code class="directive"><a href="#satisfy">Satisfy</a></code></li><li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RLimitCPU" id="RLimitCPU">RLimitCPU</a> <a name="rlimitcpu" id="rlimitcpu">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
               </a></th><td>Limits the CPU consumption of processes launched
 by Apache children</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
               </a></th><td><code>RLimitCPU <var>number</var>|max [<var>number</var>|max]</code></td></tr><tr><th><a href="directive-dict.html#Default">Default: 
@@ -1865,7 +1865,7 @@ user authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax
               </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
               </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
               </a></th><td>core</td></tr></table>
-    <p>Access policy if both <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#require">Require</a></code> used. The parameter can be
+    <p>Access policy if both <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> and <code class="directive"><a href="#require">Require</a></code> used. The parameter can be
     either <var>all</var> or <var>any</var>. This directive is only
     useful if access to a particular area is being restricted by both
     username/password <em>and</em> client host address. In this case
@@ -1888,7 +1888,7 @@ user authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax
       Satisfy any
     </code></p></div>
    
-<h3>See also</h3><ul><li><code class="directive"><a href="../mod/mod_access.html#allow">Allow</a></code></li><li><code class="directive"><a href="#require">Require</a></code></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ScriptInterpreterSource" id="ScriptInterpreterSource">ScriptInterpreterSource</a> <a name="scriptinterpretersource" id="scriptinterpretersource">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
+<h3>See also</h3><ul><li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="#require">Require</a></code></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ScriptInterpreterSource" id="ScriptInterpreterSource">ScriptInterpreterSource</a> <a name="scriptinterpretersource" id="scriptinterpretersource">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
               </a></th><td>Technique for locating the interpreter for CGI 
 scripts</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
               </a></th><td><code>ScriptInterpreterSource registry|script</code></td></tr><tr><th><a href="directive-dict.html#Default">Default: 

diff --git a/docs/manual/mod/mod_auth_ldap.html.en b/docs/manual/mod/mod_auth_ldap.html.en
index 629e69d7ea8f411a45f3b3c7de7a9bbebd56131c..feff2e1edb3c84d90b80dec8bcb48e811a1c89a6 100644 (file)
--- a/docs/manual/mod/mod_auth_ldap.html.en
+++ b/docs/manual/mod/mod_auth_ldap.html.en
@@ -63,19 +63,14 @@ for HTTP Basic authentication.</td></tr><tr><th><a href="module-dict.html#Status
 
         <ul>
           <li><a href="#reqvaliduser">require valid-user</a></li>
-
           <li><a href="#requser">require user</a></li>
-
           <li><a href="#reqgroup">require group</a></li>
-
           <li><a href="#reqdn">require dn</a></li>
         </ul>
       </li>
 
       <li><a href="#examples">Examples</a></li>
-
       <li><a href="#usingtls">Using TLS</a></li>
-
       <li><a href="#usingssl">Using SSL</a></li>
 
       <li>
@@ -84,7 +79,6 @@ for HTTP Basic authentication.</td></tr><tr><th><a href="module-dict.html#Status
 
         <ul>
           <li><a href="#howitworks">How It Works</a></li>
-
           <li><a href="#fpcaveats">Caveats</a></li>
         </ul>
       </li>
@@ -428,7 +422,8 @@ require valid-user
     FrontPage with mod_auth_ldap</a></h2>
 
     <p>Normally, FrontPage uses FrontPage-web-specific user/group
-    files (i.e., the <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> module) to handle all
+    files (i.e., the <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> and
+    <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> modules) to handle all
     authentication. Unfortunately, it is not possible to just
     change to LDAP authentication by adding the proper directives,
     because it will break the <em>Permissions</em> forms in
@@ -475,8 +470,8 @@ AuthLDAPFrontPageHack  on
     <ul>
       <li>When choosing the LDAP URL, the attribute to use for
       authentication should be something that will also be valid
-      for putting into a <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> user file. The user ID is
-      ideal for this.</li>
+      for putting into a <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> user file.
+      The user ID is ideal for this.</li>
 
       <li>When adding users via FrontPage, FrontPage administrators
       should choose usernames that already exist in the LDAP
@@ -486,15 +481,18 @@ AuthLDAPFrontPageHack  on
       LDAP database, and not against the password in the local user
       file. This could cause confusion for web administrators.</li>
 
-      <li>Apache must be compiled with <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> in order to
+      
+      <li>Apache must be compiled with <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>,
+      <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> and
+      <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> in order to
       use FrontPage support. This is because Apache will still use
-      the <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> group file for determine the extent of a
+      the <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> group file for determine the extent of a
       user's access to the FrontPage web.</li>
 
       <li>The directives must be put in the <code>.htaccess</code>
       files. Attempting to put them inside <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> directives won't work. This
       is because <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> has to be able to grab
-      the <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code>
+      the <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
       directive that is found in FrontPage <code>.htaccess</code>
       files so that it knows where to look for the valid user list. If
       the <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> directives aren't in the same

diff --git a/docs/manual/mod/mod_authn_anon.html.en b/docs/manual/mod/mod_authn_anon.html.en
index 37ae6bfe4867608e0d50f09b9c6420a8bd457bdb..b19fdff930e15856e5358b9864940c2fd9d0f3f0 100644 (file)
--- a/docs/manual/mod/mod_authn_anon.html.en
+++ b/docs/manual/mod/mod_authn_anon.html.en
@@ -70,7 +70,7 @@
       AuthType basic<br />
 <br />
        # An
-      AuthUserFile/AuthDBUserFile/AuthDBMUserFile<br />
+      AuthUserFile/AuthDBMUserFile<br />
        # directive must be specified, or use<br />
        # Anonymous_Authoritative for public access.<br />
        # In the .htaccess for the public directory, add:<br />

diff --git a/docs/manual/mod/mod_authz_host.html.en b/docs/manual/mod/mod_authz_host.html.en
index 822c20ca1e1d58c108ed6caca1e8e6f0a80c9558..9730a76913c552dcd616b576e738883594749061 100644 (file)
--- a/docs/manual/mod/mod_authz_host.html.en
+++ b/docs/manual/mod/mod_authz_host.html.en
@@ -11,10 +11,13 @@ address)</td></tr><tr><th><a href="module-dict.html#Status">Status:
                   </a></th><td>authz_host_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
                   </a></th><td>mod_authz_host.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
                   </a></th><td>Available in Apache 2.0.44 and later</td></tr></table><h3>Summary</h3>
-    <p>The directives provided by mod_authz_host are used in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, and <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> sections as well as
-    <code><a href="core.html#accessfilename">.htaccess</a></code>
-    files to control access to particular parts of the server. Access
-    can be controlled based on the client hostname, IP address, or
+    <p>The directives provided by <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> are
+    used in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>,
+    <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, and
+    <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> sections
+    as well as <code><a href="core.html#accessfilename">.htaccess</a>
+    </code> files to control access to particular parts of the server.
+    Access can be controlled based on the client hostname, IP address, or
     other characteristics of the client request, as captured in <a href="../env.html">environment variables</a>. The <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are used to
     specify which clients are or are not allowed access to the server,
     while the <code class="directive"><a href="#order">Order</a></code>

diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index 60bf7c285650a15267808a8e8e0ee4ea28ce1c63..dbebdb5c8eda138087014416af113b4ba24941ed 100644 (file)
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -23,7 +23,7 @@ SetHandler server-info<br />
     <p>You may wish to add a 
     <code class="directive"><a href="../mod/core.html#&lt;limit&gt;">&lt;Limit&gt;</a></code> 
     clause inside the 
-    <code class="directive"><a href="../mod/core.html#&lt;location&gt;">&lt;location&gt;</a></code>
+    <code class="directive"><a href="../mod/core.html#&lt;location&gt;">&lt;Location&gt;</a></code>
     directive to limit access to your server configuration 
     information.</p>
 
@@ -69,8 +69,10 @@ information displayed by the server-info handler</td></tr><tr><th><a href="direc
     the module <em>module-name</em>. Example:</p>
 
 <div class="example"><p><code>
-AddModuleInfo mod_authn_file.c 'See &lt;A \<br />
-  HREF="http://www.apache.org/docs-2.0/mod/mod_authn_file.html"&gt;\<br />
-  http://www.apache.org/docs-2.0/mod/mod_authn_file.html&lt;/A&gt;'
+  AddModuleInfo mod_authn_file.c 'See &lt;a \<br />
+  <span class="indent">
+    href="http://www.apache.org/docs-2.0/mod/mod_authn_file.html"&gt;\<br />
+    http://www.apache.org/docs-2.0/mod/mod_authn_file.html&lt;/a&gt;'
+  </span>
 </code></p></div>
 </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file

diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en
index b3a6364773367a49600cfd9b355ad3eec4d946b1..ea6290a021eacb3a55859b3d3a9f2864dc2f9162 100644 (file)
--- a/docs/manual/ssl/ssl_howto.html.en
+++ b/docs/manual/ssl/ssl_howto.html.en
@@ -147,13 +147,13 @@ parts of the server?</a></h3>
 
     <p>The key is to check for various ingredients of the client certficate.
     Usually this means to check the whole or part of the Distinguished
-    Name (DN) of the Subject. For this two methods exists: The <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> based variant and the <code class="directive"><a href="../mod/mod_ssl.html#sslrequire">SSLRequire</a></code> variant. The first method is good when the
-    clients are of totally different type, i.e. when their DNs have no
-    common fields (usually the organisation, etc.). In this case you've
-    to establish a password database containing <em>all</em> clients. The
-    second method is better when your clients are all part of a common
-    hierarchy which is encoded into the DN. Then you can match them more
-    easily.</p>
+    Name (DN) of the Subject. For this two methods exists: The <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> based variant and the <code class="directive"><a href="../mod/mod_ssl.html#sslrequire">SSLRequire</a></code> variant. The first method is
+    good when the clients are of totally different type, i.e. when their
+    DNs have no common fields (usually the organisation, etc.). In this
+    case you've to establish a password database containing <em>all</em>
+    clients. The second method is better when your clients are all part of
+    a common hierarchy which is encoded into the DN. Then you can match
+    them more easily.</p>
 
     <p>The first method:</p>
     <div class="example"><h3>httpd.conf</h3><pre>
@@ -168,6 +168,7 @@ SSLOptions           +FakeBasicAuth
 SSLRequireSSL
 AuthName             "Snake Oil Authentication"
 AuthType             Basic
+AuthBasicProvider    file
 AuthUserFile         /usr/local/apache2/conf/httpd.passwd
 require              valid-user
 &lt;/Directory&gt;</pre></div>
@@ -243,6 +244,7 @@ Allow                192.168.1.0/24
 #   HTTP Basic Authentication
 AuthType             basic
 AuthName             "Protected Intranet Area"
+AuthBasicProvider    file
 AuthUserFile         conf/protected.passwd
 Require              valid-user
 &lt;/Directory&gt;</pre></div>