From: Astrid Malo <kess@apache.org>
Date: Mon, 28 Mar 2005 19:53:24 +0000 (+0000)
Subject: backport changes from 2.1:
X-Git-Tag: 2.0.54~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b6c99d472efc32f6f83018150fc45062c314212;p=thirdparty%2Fapache%2Fhttpd.git

backport changes from 2.1:

- markup improvement
- Deletion of an incomprehensible sentence, because there is no
  posibility not to choose the MPM at compile time.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@159286 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mpm.xml b/docs/manual/mpm.xml
index a2108bf939a..30ec624582b 100644
--- a/docs/manual/mpm.xml
+++ b/docs/manual/mpm.xml
@@ -63,7 +63,7 @@ how they are used by the Apache HTTP Server.</p>
       <li>The server can be better customized for the needs of the
       particular site. For example, sites that need a great deal of
       scalability can choose to use a threaded MPM like 
-      <module>worker</module>, while sites requiring
+      <module>worker</module> or <module>event</module>, while sites requiring
       stability or compatibility with older software can use a
       <module>prefork</module>. In addition,
       special features like serving different hosts under different
@@ -83,13 +83,12 @@ how they are used by the Apache HTTP Server.</p>
     <p>MPMs must be chosen during configuration, and compiled into
     the server. Compilers are capable of optimizing a lot of
     functions if threads are used, but only if they know that
-    threads are being used. Because some MPMs use threads on Unix
-    and others don't, Apache will always perform better if the MPM
-    is chosen at configuration time and built into Apache.</p>
+    threads are being used.</p>
 
     <p>To actually choose the desired MPM, use the argument
-    --with-mpm= <em>NAME</em> with the <program>configure</program> script.
-    <em>NAME</em> is the name of the desired MPM.</p>
+      <code>--with-mpm=<em>NAME</em></code> with the
+      <program>configure</program> script. <em>NAME</em> is the name of the
+      desired MPM.</p>
 
     <p>Once the server has been compiled, it is possible to
     determine which MPM was chosen by using <code>./httpd