Imported Upstream version 2.4.9upstream/2.4.9

1 files changed, 9 insertions, 11 deletions

diff --git a/docs/manual/mod/worker.html.en b/docs/manual/mod/worker.html.en
index a7548a37..f8149f85 100644
--- a/docs/manual/mod/worker.html.en
+++ b/docs/manual/mod/worker.html.en
@@ -9,7 +9,7 @@
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
-<script src="../style/scripts/prettify.js" type="text/javascript">
+<script src="../style/scripts/prettify.min.js" type="text/javascript">
 </script>
 
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
@@ -106,17 +106,17 @@
     <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> directive.
     The maximum number of active child processes is determined by
     the <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>
-    directive divided by the <code class="directive"><a href="../mod/mpm_common.html#&#10;    threadsperchild">
+    directive divided by the <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">
     ThreadsPerChild</a></code> directive.</p>
 
     <p>Two directives set hard limits on the number of active child
     processes and the number of server threads in a child process,
     and can only be changed by fully stopping the server and then
-    starting it again.  <code class="directive"><a href="../mod/mpm_common.html#serverlimit&#10;    ">ServerLimit
+    starting it again.  <code class="directive"><a href="../mod/mpm_common.html#serverlimit">ServerLimit
     </a></code> is a hard limit on the number of active child
     processes, and must be greater than or equal to the
     <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>
-    directive divided by the <code class="directive"><a href="../mod/mpm_common.html#&#10;    threadsperchild">
+    directive divided by the <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">
     ThreadsPerChild</a></code> directive.
     <code class="directive"><a href="../mod/mpm_common.html#threadlimit">ThreadLimit</a></code> is a hard
     limit of the number of server threads, and must be greater than
@@ -132,10 +132,10 @@
     the following:</p>
 
     <ul>
-      <li>set the value of <code class="directive"><a href="../mod/mpm_common.html#&#10;      maxconnectionsperchild">
+      <li>set the value of <code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">
       MaxConnectionsPerChild</a></code> to zero</li>
 
-      <li>set the value of <code class="directive"><a href="../mod/mpm_common.html#&#10;      maxsparethreads">
+      <li>set the value of <code class="directive"><a href="../mod/mpm_common.html#maxsparethreads">
       MaxSpareThreads</a></code> to the same value as
       <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code></li>
     </ul>
@@ -143,14 +143,12 @@
     <p>A typical configuration of the process-thread controls in
     the <code class="module"><a href="../mod/worker.html">worker</a></code> MPM could look as follows:</p>
 
-    <pre class="prettyprint lang-config">
-ServerLimit         16
+    <pre class="prettyprint lang-config">ServerLimit         16
 StartServers         2
 MaxRequestWorkers  150
 MinSpareThreads     25
 MaxSpareThreads     75
-ThreadsPerChild     25
-    </pre>
+ThreadsPerChild     25</pre>
 
 
     <p>While the parent process is usually started as <code>root</code>
@@ -199,7 +197,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/worker.html';
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2013 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();