fix various invalid module references

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

18 files changed, 47 insertions, 47 deletions

diff --git a/docs/manual/env.xml b/docs/manual/env.xml
index 5bb7321254..5bfefb285f 100644
--- a/docs/manual/env.xml
+++ b/docs/manual/env.xml
@@ -453,7 +453,7 @@
 
       <p>If you have to support a client which sends broken headers and
       which can't be fixed, a simple workaround involving <module>mod_setenvif
-      </module> and <module>mod_header</module> allows you to still accept
+      </module> and <module>mod_headers</module> allows you to still accept
       these headers:</p>
 
 <highlight language="config">
diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml
index 715c5b727a..79dc33e025 100644
--- a/docs/manual/howto/auth.xml
+++ b/docs/manual/howto/auth.xml
@@ -491,13 +491,11 @@ Require group GroupName
         other than who they are. Something such as where they are
         coming from.</p>
 
-        <p>The authorization providers <directive module="mod_authz_host">
-        all</directive>, <directive module="mod_authz_host">
-        env</directive>, <directive module="mod_authz_host">
-        host</directive> and <directive module="mod_authz_host">
-        ip</directive> let you allow or deny access based other host based
-        criteria such as host name or ip address of the machine requesting
-        a document.</p>
+        <p>The authorization providers <code>all</code>,
+        <code>env</code>, <code>host</code> and <code>ip</code> let you
+        allow or deny access based other host based criteria such as
+        host name or ip address of the machine requesting a
+        document.</p>
 
         <p>The usage of these providers is specified through the
         <directive module="mod_authz_core">Require</directive> directive.
@@ -583,10 +581,11 @@ Require group GroupName
 
 <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.
-    The directive <directive module="mod_authn_core">&lt;AuthnProviderAlias&gt;</directive>
-    can also help in simplifying certain authentication configurations.</p>
+    <module>mod_auth_basic</module> and <module>mod_authz_host</module>
+    which contain some more information about how this all works.  The
+    directive <directive type="section"
+    module="mod_authn_core">AuthnProviderAlias</directive> can also help
+    in simplifying certain authentication configurations.</p>
 
     <p>The various ciphers supported by Apache for authentication data are
     explained in <a href="../misc/password_encryptions.html">Password
diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml
index 3e3bc2a586..ada3e73ec5 100644
--- a/docs/manual/howto/htaccess.xml
+++ b/docs/manual/howto/htaccess.xml
@@ -47,11 +47,11 @@ changes on a per-directory basis.</p>
             <directive module="core">Options</directive>
             <directive module="mod_mime">AddHandler</directive>
             <directive module="core">SetHandler</directive>
-            <directive module="core">AuthType</directive>
-            <directive module="core">AuthName</directive>
+            <directive module="mod_authn_core">AuthType</directive>
+            <directive module="mod_authn_core">AuthName</directive>
             <directive module="mod_authn_file">AuthUserFile</directive>
             <directive module="mod_authz_groupfile">AuthGroupFile</directive>
-            <directive module="core">Require</directive>
+            <directive module="mod_authz_core">Require</directive>
         </directivelist>
 
     </related>
diff --git a/docs/manual/mod/mod_allowhandlers.xml b/docs/manual/mod/mod_allowhandlers.xml
index f4dc7601df..2dcd165af5 100644
--- a/docs/manual/mod/mod_allowhandlers.xml
+++ b/docs/manual/mod/mod_allowhandlers.xml
@@ -45,7 +45,7 @@ returns 403 FORBIDDEN to the client. This can be used with directives like
 </summary>
 
 <seealso><directive module="core">SetHandler</directive></seealso>
-<seealso><directive module="mime">AddHandler</directive></seealso>
+<seealso><directive module="mod_mime">AddHandler</directive></seealso>
 
 <directivesynopsis>
 <name>AllowHandlers</name>
diff --git a/docs/manual/mod/mod_authn_dbm.xml b/docs/manual/mod/mod_authn_dbm.xml
index 161eff9e75..0d032f09f0 100644
--- a/docs/manual/mod/mod_authn_dbm.xml
+++ b/docs/manual/mod/mod_authn_dbm.xml
@@ -82,8 +82,8 @@ passwords for authentication</description>
     </note>
 
     <p>The encrypted password format depends on which authentication
-    frontend (e.g. <module>mod_authn_basic</module> or
-    <module>mod_authn_digest</module>) is being used.  See <a
+    frontend (e.g. <module>mod_auth_basic</module> or
+    <module>mod_auth_digest</module>) is being used.  See <a
     href="../misc/password_encryptions.html">Password Formats</a> for
     more information.</p>
 
diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml
index 587a33a132..1284cef8a6 100644
--- a/docs/manual/mod/mod_cache.xml
+++ b/docs/manual/mod/mod_cache.xml
@@ -964,8 +964,8 @@ AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html
   <p>When the <directive module="mod_cache">CacheHeader</directive> directive
   is switched on, an <strong>X-Cache</strong> header will be added to the response
   with the cache status of this response. If the normal handler is used, this
-  directive may appear within a <directive module="core">&lt;Directory&gt;</directive>
-  or <directive module="core">&lt;Location&gt;</directive> directive. If the quick
+  directive may appear within a <directive type="section" module="core">Directory</directive>
+  or <directive type="section" module="core">Location</directive> directive. If the quick
   handler is used, this directive must appear within a server or virtual host
   context, otherwise the setting will be ignored.</p>
 
@@ -1013,8 +1013,8 @@ CacheHeader on
   used by the service and client.</p>
 
   <p>If the normal handler is used, this directive may appear within a
-  <directive module="core">&lt;Directory&gt;</directive> or
-  <directive module="core">&lt;Location&gt;</directive> directive. If the quick handler
+  <directive type="section" module="core">Directory</directive> or
+  <directive type="section" module="core">Location</directive> directive. If the quick handler
   is used, this directive must appear within a server or virtual host context, otherwise
   the setting will be ignored.</p>
 
diff --git a/docs/manual/mod/mod_ext_filter.xml b/docs/manual/mod/mod_ext_filter.xml
index f663e2b4d5..e47d180f77 100644
--- a/docs/manual/mod/mod_ext_filter.xml
+++ b/docs/manual/mod/mod_ext_filter.xml
@@ -96,7 +96,7 @@ ExtFilterDefine gzip mode=output cmd=/bin/gzip
     # run on output
     SetOutputFilter gzip
     
-    # mod_header directive to add
+    # mod_headers directive to add
     # "Content-Encoding: gzip" header field
     Header set Content-Encoding gzip
 &lt;/Location&gt;
diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja
index 542e266801..d2f07b1b26 100644
--- a/docs/manual/mod/mod_headers.xml.ja
+++ b/docs/manual/mod/mod_headers.xml.ja
@@ -38,7 +38,7 @@
 
 <section id="order"><title>処理の順番</title>
 
-    <p><module>mod_header</module> のディレクティブはサーバ設定のほぼどこにでも
+    <p><module>mod_headers</module> のディレクティブはサーバ設定のほぼどこにでも
     書くことができ、影響する範囲を<a
     href="../sections.html">設定用セクション</a>で囲むことで限定する
     ことができます。</p>
diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index 1fdad686af..c0a0286539 100644
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -139,18 +139,18 @@ configuration</description>
           <directive module="mod_so">LoadFile</directive>.</li>
       <li>Directives which control the configuration file itself, such as
           <directive module="core">Include</directive>,
-          <directive module="core">&lt;IfModule&gt;</directive> and
-          <directive module="core">&lt;IfDefine&gt;</directive> are not
+          <directive type="section" module="core">IfModule</directive> and
+          <directive type="section" module="core">IfDefine</directive> are not
           listed, but the included configuration directives are.</li>
       <li>Comments are not listed. (This may be considered a feature.)</li>
       <li>Configuration directives from <code>.htaccess</code> files are
           not listed (since they do not form part of the permanent server
           configuration).</li>
       <li>Container directives such as
-          <directive module="core">&lt;Directory&gt;</directive>
+          <directive type="section" module="core">Directory</directive>
           are listed normally, but <module>mod_info</module> cannot figure
           out the line number for the closing
-          <directive module="core">&lt;/Directory&gt;</directive>.</li>
+          <directive type="section" module="core" name="Directory">/Directory</directive>.</li>
       <li>Directives generated by third party modules such as <a href="http://perl.apache.org">mod_perl</a>
           might not be listed.</li>
     </ul>
diff --git a/docs/manual/mod/mod_remoteip.xml b/docs/manual/mod/mod_remoteip.xml
index 02f680cb41..ba127a7f6b 100644
--- a/docs/manual/mod/mod_remoteip.xml
+++ b/docs/manual/mod/mod_remoteip.xml
@@ -44,7 +44,7 @@ via the request headers.
 
     <p>Once replaced as instructed, this overridden useragent IP address is
     then used for the <module>mod_authz_host</module>
-    <directive module="mod_authz_host" type="section">Require ip</directive>
+    <directive module="mod_authz_core" name="Require">Require ip</directive>
     feature, is reported by <module>mod_status</module>, and is recorded by
     <module>mod_log_config</module> <code>%a</code> and <module>core</module>
     <code>%a</code> format strings. The underlying client IP of the connection
diff --git a/docs/manual/mod/mod_session_crypto.xml b/docs/manual/mod/mod_session_crypto.xml
index 5d873df2a0..c2446c251d 100644
--- a/docs/manual/mod/mod_session_crypto.xml
+++ b/docs/manual/mod/mod_session_crypto.xml
@@ -120,11 +120,12 @@ SessionCryptoPassphrase secret
       </highlight>
     </example>
 
-    <p>The <var>NSS</var> crypto driver might have already been configured by another
-    part of the server, for example from <module>mod_nss</module> or
-    <module>mod_ldap</module>. If found to have already been configured,
-    a warning will be logged, and the existing configuration will have taken affect.
-    To avoid this warning, use the noinit parameter as follows.</p>
+    <p>The <var>NSS</var> crypto driver might have already been
+    configured by another part of the server, for example from
+    <code>mod_nss</code> or <module>mod_ldap</module>. If found to
+    have already been configured, a warning will be logged, and the
+    existing configuration will have taken affect.  To avoid this
+    warning, use the noinit parameter as follows.</p>
 
     <example><title>NSS with certificate database</title>
     <highlight language="config">
diff --git a/docs/manual/new_features_2_0.xml b/docs/manual/new_features_2_0.xml
index d24723a9bf..ca8032e560 100644
--- a/docs/manual/new_features_2_0.xml
+++ b/docs/manual/new_features_2_0.xml
@@ -154,7 +154,7 @@
       browsers to request that content be compressed before delivery,
       saving network bandwidth.</dd>
 
-      <dt><module>mod_auth_ldap</module></dt>
+      <dt><module outdated="true">mod_auth_ldap</module></dt>
 
       <dd>New module in Apache httpd 2.0.41.  This module allows an LDAP
       database to be used to store credentials for HTTP Basic
@@ -223,7 +223,7 @@
       using <module>mod_include</module>'s variables <code>$0</code>
       .. <code>$9</code>.</dd>
 
-      <dt><module>mod_auth_dbm</module></dt>
+      <dt><module outdated="true">mod_auth_dbm</module></dt>
 
       <dd>Now supports multiple types of DBM-like databases using the
       <directive>AuthDBMType</directive> directive.</dd>
diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index f7961ff9a3..38ed6703e8 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -124,7 +124,7 @@
           certain authentication configurations.
       </dd>
 
-      <dt><module>mod_authnz_ldap</module></dt>
+      <dt><module outdated="true">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>
           framework.  New features include using LDAP attribute values and
diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index 8212e966fd..387ff084a1 100644
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -302,8 +302,8 @@
         <p>To find out which modules are compiled by default, run
         <code>./configure -h</code> or <code>./configure --help</code>
         and look under <code>Optional Features</code>.  Suppose you
-        are interested in <module>mod_example1</module> and
-        <module>mod_example2</module>, and you
+        are interested in <code>mod_example1</code> and
+        <code>mod_example2</code>, and you
         see this:</p>
 
         <example><pre>Optional Features:
diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index 0e340a2f6a..3839ee63dd 100644
--- a/docs/manual/ssl/ssl_faq.xml
+++ b/docs/manual/ssl/ssl_faq.xml
@@ -765,7 +765,7 @@ SetEnvIf User-Agent "MSIE [2-5]" \
     command. Alternatively, you can append the following standard 1024-bit DH
     parameters from <a href="http://www.ietf.org/rfc/rfc2409.txt">RFC 2409</a>,
     section 6.2 to the respective
-    <directive module="ssl">SSLCertificateFile</directive> file:</p>
+    <directive module="mod_ssl">SSLCertificateFile</directive> file:</p>
     <example><pre>-----BEGIN DH PARAMETERS-----
 MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR
 Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml
index 9d148f4b5b..71cdad84d6 100644
--- a/docs/manual/urlmapping.xml
+++ b/docs/manual/urlmapping.xml
@@ -50,7 +50,7 @@
 <directive module="mod_alias">Alias</directive>
 <directive module="mod_alias">AliasMatch</directive>
 <directive module="mod_speling">CheckSpelling</directive>
-<directive module="core">DirectoryIndex</directive>
+<directive module="mod_dir">DirectoryIndex</directive>
 <directive module="core">DocumentRoot</directive>
 <directive module="core">ErrorDocument</directive>
 <directive module="core">Options</directive>
@@ -88,7 +88,7 @@
 
     <p>If a directory is requested (i.e. a path ending with
     <code>/</code>), the file served from that directory is defined by
-    the <directive module="core">DirectoryIndex</directive> directive.
+    the <directive module="mod_dir">DirectoryIndex</directive> directive.
     For example, if <code>DocumentRoot</code> were set as above, and 
     you were to set:</p>
 
diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml
index 86f99f07bf..f00b9454f0 100644
--- a/docs/manual/vhosts/examples.xml
+++ b/docs/manual/vhosts/examples.xml
@@ -330,9 +330,10 @@ Listen 80
     virtual host through to a server running on another machine. In the
     example, a virtual host of the same name is configured on a machine
     at <code>192.168.111.2</code>. The <directive
-    module="mod_proxy">ProxyPreserveHost On</directive> directive is
-    used so that the desired hostname is passed through, in case we are
-    proxying multiple hostnames to a single machine.</p>
+    module="mod_proxy" name="ProxyPreserveHost">ProxyPreserveHost
+    On</directive> directive is used so that the desired hostname is
+    passed through, in case we are proxying multiple hostnames to a
+    single machine.</p>
 
     <highlight language="config">
 &lt;VirtualHost *:*&gt;
diff --git a/docs/manual/vhosts/fd-limits.xml b/docs/manual/vhosts/fd-limits.xml
index cd9802eb6e..56c78c24b7 100644
--- a/docs/manual/vhosts/fd-limits.xml
+++ b/docs/manual/vhosts/fd-limits.xml
@@ -99,8 +99,7 @@ CustomLog logs/multiple_vhost_log vhost
 <p>This will create a log file in the common log format, but with the
 canonical virtual host (whatever appears in the
 <directive module="core">ServerName</directive> directive) prepended to
-each line. (See <directive
-module="mod_log_config">Custom Log Formats</directive> for
+each line. (See <module>mod_log_config</module> for
 more about customizing your log files.)</p>
 
 <p>When you wish to split your log file into its component parts (one