Fix the links for the PidFile directive in stopping.html and

add mpm_common and mod_cache to index-bytype.html (which, by the way,
is clearly the abused stepsister of index.xml/index.html... we should
find some automated way to generate the index-bytype as we have with the
regular index).

PR:  9187
Reported by:  Max Dittrich <amax@cs.tu-berlin.de>

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

diff --git a/docs/manual/mod/index-bytype.html b/docs/manual/mod/index-bytype.html
index 906ae34443f20122aec0c47940b447f34430a59e..72bb095f1df9f7265fbb403eec9e32b40c597244 100644 (file)
--- a/docs/manual/mod/index-bytype.html
+++ b/docs/manual/mod/index-bytype.html
@@ -21,38 +21,34 @@
     alphabetical list of <a href="directives.html">all Apache
     directives</a>.</p>
 
-    <h2>Core and Mutli-Processing Modules</h2>
+    <h2>Core Features and Multi-Processing Modules</h2>
 
     <dl>
-      <dt><a href="core.html">Core</a></dt>
+      <dt><a href="core.html">core</a></dt>
+      <dd>Core Apache HTTP Server features that are always available</dd>
 
-      <dd>Core Apache features.</dd>
+      <dt><a href="mpm_common.html">mpm_common</a></dt>
+      <dd>A collection of directives that are implemented by more than
+      one multi-processing module (MPM)</dd>
 
-      <dt><a href="worker.html">worker</a></dt>
-
-      <dd>Multi-Processing Module with Threading via Pthreads;
-      Variable number of processes, constant number of
-      threads/child</dd>
+      <dt><a href="mpm_netware.html">mpm_netware</a></dt>
+      <dd>Multi-Processing Module implementing an exclusively threaded web
+      server optimized for Novell NetWare</dd>
 
       <dt><a href="mpm_winnt.html">mpm_winnt</a></dt>
-
-      <dd>Multi-Processing Module with a single control process and
-      a single server process with multiple threads for Windows
-      NT</dd>
+      <dd>This Multi-Processing Module is optimized for Windows NT.</dd>
 
       <dt><a href="perchild.html">perchild</a></dt>
-
-      <dd>Multi-Processing Module with the ability to server
-      different virtual hosts under different userids.</dd>
+      <dd>Multi-Processing Module allowing for daemon processes
+      serving requests to be assigned a variety of different
+      userids</dd>
 
       <dt><a href="prefork.html">prefork</a></dt>
+      <dd>Implements a non-threaded, pre-forking web server</dd>
 
-      <dd>Non-threaded preforking processes model similar to Apache
-      1.3</dd>
-
-      <dt><a href="mpm_netware.html">mpm_netware</a></dt>
-
-      <dd>Thread only model optimized for Novell NetWare</dd>
+      <dt><a href="worker.html">worker</a></dt>
+      <dd>Multi-Processing Module implementing a hybrid
+      multi-threaded multi-process web server</dd>
     </dl>
 
     <h2>Environment Creation</h2>
@@ -257,6 +253,10 @@
 
       <dd>Caching files in memory for faster serving.</dd>
 
+      <dt><a href="mod_cache.html">mod_cache</a></dt>
+
+      <dd>Content cache keyed to URIs</dd>
+
       <dt><a href="mod_dav.html">mod_dav</a></dt>
 
       <dd>Class 1,2 <a href="http://www.webdav.org">WebDAV</a> HTTP

diff --git a/docs/manual/stopping.html b/docs/manual/stopping.html
index 89c1a58a3e360080b42ac989f2417313d9c869f6..8e2c2b12c62714aafa1285ce355f093eaa78c3d6 100644 (file)
--- a/docs/manual/stopping.html
+++ b/docs/manual/stopping.html
@@ -23,7 +23,7 @@
     <p>You will notice many <code>httpd</code> executables running
     on your system, but you should not send signals to any of them
     except the parent, whose pid is in the <a
-    href="mod/core.html#pidfile">PidFile</a>. That is to say you
+    href="mod/mpm_common.html#pidfile">PidFile</a>. That is to say you
     shouldn't ever need to send signals to any process except the
     parent. There are three signals that you can send the parent:
     <code>TERM</code>, <code>HUP</code>, and <code>USR1</code>,
@@ -46,7 +46,7 @@
     </blockquote>
     Modify those examples to match your <a
     href="mod/core.html#serverroot">ServerRoot</a> and <a
-    href="mod/core.html#pidfile">PidFile</a> settings. 
+    href="mod/mpm_common.html#pidfile">PidFile</a> settings. 
 
     <p>A shell script called <a
     href="programs/apachectl.html">apachectl</a> is provided which

diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en
index 89c1a58a3e360080b42ac989f2417313d9c869f6..8e2c2b12c62714aafa1285ce355f093eaa78c3d6 100644 (file)
--- a/docs/manual/stopping.html.en
+++ b/docs/manual/stopping.html.en
@@ -23,7 +23,7 @@
     <p>You will notice many <code>httpd</code> executables running
     on your system, but you should not send signals to any of them
     except the parent, whose pid is in the <a
-    href="mod/core.html#pidfile">PidFile</a>. That is to say you
+    href="mod/mpm_common.html#pidfile">PidFile</a>. That is to say you
     shouldn't ever need to send signals to any process except the
     parent. There are three signals that you can send the parent:
     <code>TERM</code>, <code>HUP</code>, and <code>USR1</code>,
@@ -46,7 +46,7 @@
     </blockquote>
     Modify those examples to match your <a
     href="mod/core.html#serverroot">ServerRoot</a> and <a
-    href="mod/core.html#pidfile">PidFile</a> settings. 
+    href="mod/mpm_common.html#pidfile">PidFile</a> settings. 
 
     <p>A shell script called <a
     href="programs/apachectl.html">apachectl</a> is provided which