Return-Path: 
 <cvs-return-45224-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C4598DB15
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Sun,  7 Oct 2012 23:06:35 +0000 (UTC)
Received: (qmail 97380 invoked by uid 500); 7 Oct 2012 23:06:35 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 97315 invoked by uid 500); 7 Oct 2012 23:06:35 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 97308 invoked by uid 99); 7 Oct 2012 23:06:35 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2012 23:06:35 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2012 23:06:32 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0EB16238890D;
	Sun,  7 Oct 2012 23:05:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1395421 - in /httpd/httpd/branches/2.4.x/docs/manual:
 mpm.html.en mpm.xml
Date: Sun, 07 Oct 2012 23:05:47 -0000
To: cvs@httpd.apache.org
From: rbowen@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121007230548.0EB16238890D@eris.apache.org>

Author: rbowen
Date: Sun Oct  7 23:05:47 2012
New Revision: 1395421

URL: http://svn.apache.org/viewvc?rev=1395421&view=rev
Log:
Adds some clarification to the statement that a default MPM is selected
"depending on platform capabilities"

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mpm.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mpm.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mpm.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mpm.html.en?rev=1395421&r1=1395420&r2=1395421&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mpm.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mpm.html.en Sun Oct  7 23:05:47 2012
@@ -99,6 +99,28 @@ choice at compile-time.</p>
     <code class="module"><a href="./mod/event.html">event</a></code>, depending on platform capabilities</td></tr>
 <tr class="odd"><td>Windows</td><td><code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
 </table>
+
+<div class="note"><p>Here, 'Unix' is used to mean Unix-like operating systems, such as
+Linux, BSD, Solaris, Mac OS X, etc.</p></div>
+
+<p>In the case of Unix, the decision as to which MPM is installed is
+based on two questions:</p>
+<p>1. Does the system support <a href="http://en.wikipedia.org/wiki/Threads_(computer_science)">threads</a>?</p>
+<p>2. Does the system support <a href="http://en.wikipedia.org/wiki/Polling_(computer_science)">polling</a>?</p>
+
+<p>If the answer to both questions is 'yes', the default MPM is
+<code class="module"><a href="./mod/event.html">event</a></code>.</p>
+
+<p>If The answer to #1 is 'yes', but the answer to #2 is 'no', the
+default will be <code class="module"><a href="./mod/worker.html">worker</a></code>.</p>
+
+<p>If the answer to both questions is 'no', then the default MPM will be
+<code class="module"><a href="./mod/prefork.html">prefork</a></code>.</p>
+
+<p>In practical terms, this means that the default will almost always be
+<code class="module"><a href="./mod/event.html">event</a></code>, as all modern operating systems support these
+two features.</p>
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="static" id="static">Building an MPM as a static module</a></h2>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mpm.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mpm.xml?rev=1395421&r1=1395420&r2=1395421&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mpm.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mpm.xml Sun Oct  7 23:05:47 2012
@@ -89,6 +89,30 @@ choice at compile-time.</p>
     <module>event</module>, depending on platform capabilities</td></tr>
 <tr><td>Windows</td><td><module>mpm_winnt</module></td></tr>
 </table>
+
+<note><p>Here, 'Unix' is used to mean Unix-like operating systems, such as
+Linux, BSD, Solaris, Mac OS X, etc.</p></note>
+
+<p>In the case of Unix, the decision as to which MPM is installed is
+based on two questions:</p>
+<p>1. Does the system support <a
+href="http://en.wikipedia.org/wiki/Threads_(computer_science)">threads</a>?</p>
+<p>2. Does the system support <a
+href="http://en.wikipedia.org/wiki/Polling_(computer_science)">polling</a>?</p>
+
+<p>If the answer to both questions is 'yes', the default MPM is
+<module>event</module>.</p>
+
+<p>If The answer to #1 is 'yes', but the answer to #2 is 'no', the
+default will be <module>worker</module>.</p>
+
+<p>If the answer to both questions is 'no', then the default MPM will be
+<module>prefork</module>.</p>
+
+<p>In practical terms, this means that the default will almost always be
+<module>event</module>, as all modern operating systems support these
+two features.</p>
+
 </section>
 
 <section id="static"><title>Building an MPM as a static module</title>