Imported Upstream version 2.4.9upstream/2.4.9

1 files changed, 11 insertions, 23 deletions

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index f5520f3a..b9d315c0 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.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>
@@ -181,27 +181,21 @@ listens to</td></tr>
     <p>For example, to make the server accept connections on both
     port 80 and port 8000, use:</p>
 
-    <pre class="prettyprint lang-config">
-Listen 80
-Listen 8000
-    </pre>
+    <pre class="prettyprint lang-config">Listen 80
+Listen 8000</pre>
 
 
     <p>To make the server accept connections on two specified
     interfaces and port numbers, use </p>
 
-    <pre class="prettyprint lang-config">
-Listen 192.170.2.1:80
-Listen 192.170.2.5:8000
-    </pre>
+    <pre class="prettyprint lang-config">Listen 192.170.2.1:80
+Listen 192.170.2.5:8000</pre>
 
 
     <p>IPv6 addresses must be surrounded in square brackets, as in the
     following example:</p>
 
-    <pre class="prettyprint lang-config">
-      Listen [2001:db8::a00:20ff:fea7:ccea]:80
-    </pre>
+    <pre class="prettyprint lang-config">Listen [2001:db8::a00:20ff:fea7:ccea]:80</pre>
 
 
     <p>The optional <var>protocol</var> argument is not required for most
@@ -214,9 +208,7 @@ Listen 192.170.2.5:8000
     <p>You only need to set the protocol if you are running on non-standard
        ports.  For example, running an <code>https</code> site on port 8443:</p>
 
-    <pre class="prettyprint lang-config">
-      Listen 192.170.2.1:8443 https
-    </pre>
+    <pre class="prettyprint lang-config">Listen 192.170.2.1:8443 https</pre>
 
 
     <div class="note"><h3>Error condition</h3>
@@ -439,9 +431,7 @@ of the daemon</td></tr>
     filename is not absolute then it is assumed to be relative to the
     <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      PidFile /var/run/apache.pid
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">PidFile /var/run/apache.pid</pre>
 </div>
 
     <p>It is often useful to be able to send the server a signal,
@@ -495,9 +485,7 @@ the child processes</td></tr>
     disk (using file-based shared memory). Specifying this directive causes
     Apache httpd to always create the file on the disk.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      ScoreBoardFile /var/run/apache_runtime_status
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ScoreBoardFile /var/run/apache_runtime_status</pre>
 </div>
 
     <p>File-based shared memory is useful for third-party applications
@@ -578,7 +566,7 @@ Apache HTTP Server</a></li>
     <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
     settings require more than 16 server processes (default). Do not set
     the value of this directive any higher than the number of server
-    processes required by what you may want for <code class="directive"><a href="#maxrequestworkers ">MaxRequestWorkers </a></code> and <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>.</p>
+    processes required by what you may want for <code class="directive"><a href="#maxrequestworkers">MaxRequestWorkers </a></code> and <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>.</p>
 
     <div class="note"><h3>Note</h3>
       <p>There is a hard limit of <code>ServerLimit 20000</code> compiled
@@ -788,7 +776,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mpm_common.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();