The default sysconfdif is conf, not etc

[apache] / docs / manual / programs / configure.xml

diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index 82bd5e6f7c834a3753a252e5ec5ff9a99a2d79d7..7553cde7e6ff411b4dcb85bb02ff0ef938843125 100644 (file)
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -226,7 +226,7 @@
         <dd>Install read-only single-machine data like the server configuration
           files <code>httpd.conf</code>, <code>mime.types</code>, etc. in
           <var>DIR</var>. By default <code>sysconfdir</code> is set to
-          <code><var>PREFIX</var>/etc</code>.</dd>
+          <code><var>PREFIX</var>/conf</code>.</dd>
       </dl>
     </section>
   </section>
@@ -309,7 +309,7 @@
 
         <dt><code>--disable-auth</code></dt>
         <dd>Disable user-based access control provided  by
-          <module>mod_auth</module>. This module provides for HTTP Basic
+          <module>mod_authn_file</module>. This module provides for HTTP Basic
           Authentication, where the usernames and passwords are stored in
           plain text files.</dd>
 
@@ -319,7 +319,7 @@
 
         <dt><code>--disable-access</code></dt>
         <dd>Disable host-based access control provided by
-          <module>mod_access</module>.</dd>
+          <module>mod_authz_host</module>.</dd>
 
         <dt><code>--disable-cgi</code></dt>
         <dd><module>mod_cgi</module>, which provides support for CGI scripts,
@@ -633,9 +633,49 @@
       </dl>
     </section>
 
-    <section id="modules"><title>MPMs and third-party modules</title>
-      <p>To add the necessary Multi Processing Module and additional third-party
-        modules use the following options:</p>
+    <section id="mpms"><title>Multi-Processing Modules</title>
+      <p><a href="../mpm.html">Multi-Processing Modules</a>, or MPMs, implement
+        the basic behavior of the server.  A single MPM must be active in order
+        for the server to function.  The list of available MPMs appears on the
+        <a href="../mod/">module index page</a>.</p>
+
+      <p>MPMs can be built as DSOs for dynamic loading or statically linked with
+        the server, and are enabled using the following options:</p>
+
+      <dl>
+        <dt><code>--with-mpm=MPM</code></dt>
+        <dd>
+          <p>Choose the default MPM for your server.  If MPMs are built as DSO 
+            modules (see <code>--enable-mpms-shared</code>), this directive
+            selects the MPM which will be loaded in the default configuration
+            file.  Otherwise, this directive selects the only available MPM,
+            which will be statically linked into the server.</p>
+          <p>If this option is omitted, the <a href="../mpm.html#defaults">default
+          MPM</a> for your operating system will be used.</p>
+        </dd>
+
+        <dt><code>--enable-mpms-shared=<var>MPM-LIST</var></code></dt>
+        <dd>
+          <p>Enable a list of MPMs as dynamic shared modules.  One of these
+            modules must be loaded dynamically using the
+            <directive module="mod_so">LoadModule</directive> directive.</p>
+          <p><var>MPM-LIST</var> is a space-separated list of MPM names
+            enclosed by quotation marks.  For example:</p>
+          <example>
+            --enable-mpms-shared='prefork worker'
+          </example>
+          <p>Additionally you can use the special keyword <code>all</code>,
+            which will select all MPMs which support dynamic loading on the
+            current platform and build them as DSO modules.  For example:</p>
+          <example>
+            --enable-mpms-shared=all
+          </example>
+       </dd>
+      </dl>
+    </section>
+
+    <section id="modules"><title>Third-party modules</title>
+      <p>To add additional third-party modules use the following options:</p>
 
       <dl>
         <dt><code>--with-module=<var>module-type</var>:<var>module-file</var>[,
@@ -656,14 +696,6 @@
             If you want to build a DSO module instead of a statically linked
             use <program>apxs</program>.</note>
         </dd>
-
-        <dt><code>--with-mpm=MPM</code></dt>
-        <dd>Choose the process model for your server. You have to select
-          exactly one <a href="../mpm.html">Multi-Processing Module</a>.
-          Otherwise the <a href="../mpm.html#defaults">default MPM</a> for
-          your operating system will be taken. Possible MPMs are
-          <module>beos</module>, <module>mpmt_os2</module>,
-          <module>prefork</module> and <module>worker</module>.</dd>
       </dl>
     </section>