keep it consistent with 2.0

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

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 3cc865a8e6267843b9f7aedb35733bb077e24126..5cae84498b2242e1221b60e90faaed5603fa5270 100644 (file)
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -82,7 +82,7 @@ accepting requests on network sockets</td></tr>
       file defined by the <code class="directive"><a href="#lockfile">LockFile</a></code> directive.</dd>
 
       <dt><code>fcntl</code></dt>
-      <dd>uses the <code>fnctl(2)</code> system call to lock the
+      <dd>uses the <code>fcntl(2)</code> system call to lock the
       file defined by the <code class="directive"><a href="#lockfile">LockFile</a></code> directive.</dd>
 
       <dt><code>posixsem</code></dt>
@@ -166,10 +166,10 @@ requests</td></tr>
 </table>
     <p>The <code class="directive">Group</code> directive sets the group under
     which the server will answer requests. In order to use this
-    directive, the server must be run initially as root. If you start the
-    server as a non-root user, it will fail to change to the specified
-    group, and will instead continue to run as the group of the original
-    user. <var>Unix-group</var> is one of:</p>
+    directive, the server must be run initially as <code>root</code>. If
+    you start the server as a non-root user, it will fail to change to the
+    specified group, and will instead continue to run as the group of the
+    original user. <var>Unix-group</var> is one of:</p>
 
     <dl>
       <dt>A group name</dt>
@@ -305,7 +305,7 @@ uses</a></li>
     of the main server process is automatically appended to the
     filename.</p>
 
-    <div class="warning"><h3>Security:</h3>
+    <div class="warning"><h3>Security</h3>
       <p>It is best to <em>avoid</em> putting this file in a world writable
       directory such as <code>/var/tmp</code> because someone could create
       a denial of service attack and prevent the server from starting by
@@ -340,7 +340,7 @@ to serve requests</td></tr>
     <p>For non-threaded servers (<em>i.e.</em>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>),
     <code class="directive">MaxClients</code> translates into the maximum
     number of child processes that will be launched to serve requests.
-    The default value is 256; to increase it, you must also raise
+    The default value is <code>256</code>; to increase it, you must also raise
     <code class="directive"><a href="#serverlimit">ServerLimit</a></code>.</p>
 
     <p>For threaded and hybrid servers (<em>e.g.</em> <code class="module"><a href="../mod/beos.html">beos</a></code>
@@ -387,7 +387,7 @@ will handle during its life</td></tr>
     process will die. If <code class="directive">MaxRequestsPerChild</code> is
     <code>0</code>, then the process will never expire.</p>
 
-    <div class="note"><h3>Different default values:</h3>
+    <div class="note"><h3>Different default values</h3>
       <p>The default value for <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> and
       <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> is <code>0</code>.</p>
     </div>
@@ -403,7 +403,7 @@ will handle during its life</td></tr>
       the number of processes when the server load reduces.</li>
     </ul>
 
-    <div class="note"><h3>Note:</h3>
+    <div class="note"><h3>Note</h3>
       <p>For <code class="directive"><a href="../mod/core.html#keepalive">KeepAlive</a></code> requests, only
       the first request is counted towards this limit. In effect, it
       changes the behavior to limit the number of <em>connections</em> per
@@ -537,12 +537,12 @@ of the daemon</td></tr>
     SIGHUP (kill -1) signal to the process id listed in the
     <code class="directive">PidFile</code>.</p>
 
-    <p>The PidFile is subject to the same warnings about log file
-    placement and <a href="../misc/security_tips.html#serverroot">security</a>.</p>
+    <p>The <code class="directive">PidFile</code> is subject to the same
+    warnings about log file placement and <a href="../misc/security_tips.html#serverroot">security</a>.</p>
 
     <div class="note"><h3>Note</h3>
-      As of Apache 2 it is recommended to use only the <a href="../programs/apachectl.html">apachectl</a> script for
-      (re-)starting or stopping the server.
+      <p>As of Apache 2 it is recommended to use only the <a href="../programs/apachectl.html">apachectl</a> script for
+      (re-)starting or stopping the server.</p>
     </div>
 
 </div>
@@ -614,8 +614,8 @@ Apache</a></li>
 </table>
     <p>For the <code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM, this directive sets the
     maximum configured value for <code class="directive"><a href="#maxclients">MaxClients</a></code> for the lifetime of the
-    Apache process.  For the worker MPM, this directive in combination
-    with <code class="directive"><a href="#threadlimit">ThreadLimit</a></code> sets
+    Apache process.  For the <code class="module"><a href="../mod/worker.html">worker</a></code> MPM, this directive
+    in combination with <code class="directive"><a href="#threadlimit">ThreadLimit</a></code> sets
     the maximum configured value for <code class="directive"><a href="#maxclients">MaxClients</a></code> for the lifetime of the
     Apache process.  Any attempts to change this directive during a
     restart will be ignored, but <code class="directive"><a href="#maxclients">MaxClients</a></code> can be modified during

diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index 11d9048c81646b8fa5caa3abc2815ddeba79af67..8409daa967362a6bb0984a1f5c873fb7bdf0b145 100644 (file)
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -42,7 +42,7 @@ accepting requests on network sockets</description>
       >LockFile</directive> directive.</dd>
 
       <dt><code>fcntl</code></dt>
-      <dd>uses the <code>fnctl(2)</code> system call to lock the
+      <dd>uses the <code>fcntl(2)</code> system call to lock the
       file defined by the <directive module="mpm_common"
       >LockFile</directive> directive.</dd>
 
@@ -131,10 +131,10 @@ requests</description>
 <usage>
     <p>The <directive>Group</directive> directive sets the group under
     which the server will answer requests. In order to use this
-    directive, the server must be run initially as root. If you start the
-    server as a non-root user, it will fail to change to the specified
-    group, and will instead continue to run as the group of the original
-    user. <var>Unix-group</var> is one of:</p>
+    directive, the server must be run initially as <code>root</code>. If
+    you start the server as a non-root user, it will fail to change to the
+    specified group, and will instead continue to run as the group of the
+    original user. <var>Unix-group</var> is one of:</p>
 
     <dl>
       <dt>A group name</dt>
@@ -202,14 +202,14 @@ of the daemon</description>
     SIGHUP (kill -1) signal to the process id listed in the
     <directive>PidFile</directive>.</p>
 
-    <p>The PidFile is subject to the same warnings about log file
-    placement and <a
+    <p>The <directive>PidFile</directive> is subject to the same
+    warnings about log file placement and <a
     href="../misc/security_tips.html#serverroot">security</a>.</p>
 
     <note><title>Note</title>
-      As of Apache 2 it is recommended to use only the <a
+      <p>As of Apache 2 it is recommended to use only the <a
       href="../programs/apachectl.html">apachectl</a> script for
-      (re-)starting or stopping the server.
+      (re-)starting or stopping the server.</p>
     </note>
 </usage>
 </directivesynopsis>
@@ -321,7 +321,7 @@ uses</a></seealso>
     of the main server process is automatically appended to the
     filename.</p>
 
-    <note type="warning"><title>Security:</title>
+    <note type="warning"><title>Security</title>
       <p>It is best to <em>avoid</em> putting this file in a world writable
       directory such as <code>/var/tmp</code> because someone could create
       a denial of service attack and prevent the server from starting by
@@ -355,7 +355,7 @@ to serve requests</description>
     <p>For non-threaded servers (<em>i.e.</em>, <module>prefork</module>),
     <directive>MaxClients</directive> translates into the maximum
     number of child processes that will be launched to serve requests.
-    The default value is 256; to increase it, you must also raise
+    The default value is <code>256</code>; to increase it, you must also raise
     <directive module="mpm_common">ServerLimit</directive>.</p>
 
     <p>For threaded and hybrid servers (<em>e.g.</em> <module>beos</module>
@@ -411,7 +411,7 @@ will handle during its life</description>
     process will die. If <directive>MaxRequestsPerChild</directive> is
     <code>0</code>, then the process will never expire.</p>
 
-    <note><title>Different default values:</title>
+    <note><title>Different default values</title>
       <p>The default value for <module>mpm_netware</module> and
       <module>mpm_winnt</module> is <code>0</code>.</p>
     </note>
@@ -427,7 +427,7 @@ will handle during its life</description>
       the number of processes when the server load reduces.</li>
     </ul>
 
-    <note><title>Note:</title>
+    <note><title>Note</title>
       <p>For <directive module="core">KeepAlive</directive> requests, only
       the first request is counted towards this limit. In effect, it
       changes the behavior to limit the number of <em>connections</em> per
@@ -613,8 +613,9 @@ Apache</a></seealso>
     <p>For the <module>prefork</module> MPM, this directive sets the
     maximum configured value for <directive
     module="mpm_common">MaxClients</directive> for the lifetime of the
-    Apache process.  For the worker MPM, this directive in combination
-    with <directive module="mpm_common">ThreadLimit</directive> sets
+    Apache process.  For the <module>worker</module> MPM, this directive
+    in combination with <directive
+    module="mpm_common">ThreadLimit</directive> sets
     the maximum configured value for <directive
     module="mpm_common">MaxClients</directive> for the lifetime of the
     Apache process.  Any attempts to change this directive during a