From 2a1859cfaeacad37fa5b8cf37c5f87bcb70bcb79 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@apache.org>
Date: Sun, 7 Oct 2012 22:59:14 +0000
Subject: [PATCH] Adds some clarification to the statement that the default MPM
 is selected based on platform capabilities.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395417 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mpm.html.en | 22 ++++++++++++++++++++++
 docs/manual/mpm.xml     | 24 ++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/docs/manual/mpm.html.en b/docs/manual/mpm.html.en
index 2f1e82546eb..f871ff22a64 100644
--- a/docs/manual/mpm.html.en
+++ b/docs/manual/mpm.html.en
@@ -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>
diff --git a/docs/manual/mpm.xml b/docs/manual/mpm.xml
index 21c0a186114..0150f3f63c3 100644
--- a/docs/manual/mpm.xml
+++ b/docs/manual/mpm.xml
@@ -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>
-- 
2.47.3