From: Igor Galić <igalic@apache.org>
Date: Tue, 31 Jul 2012 01:00:05 +0000 (+0000)
Subject: bump versions.
X-Git-Tag: 2.5.0-alpha~6558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7ca0d064d850aea123a1d1a69b5c03b4b4b3636;p=thirdparty%2Fapache%2Fhttpd.git

bump versions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1367381 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/misc/perf-scaling.xml b/docs/manual/misc/perf-scaling.xml
index d84ebc6ee3a..dd131454141 100644
--- a/docs/manual/misc/perf-scaling.xml
+++ b/docs/manual/misc/perf-scaling.xml
@@ -59,7 +59,7 @@
         <title>What Will and Will Not Be Discussed
         </title>
         <p>The session will focus on easily accessible configuration and tuning
-            options for Apache httpd 2.2 and 2.3 as well as monitoring tools.
+            options for Apache httpd 2.2 and 2.4 as well as monitoring tools.
             Monitoring tools will allow you to observe your web server to
             gather information about its performance, or lack thereof.
             We'll assume that you don't have an unlimited budget for
@@ -883,9 +883,9 @@
                 same pre-forking process model that Apache 1.3 uses. The Worker
                 MPM runs a smaller number of child processes, and spawns
                 multiple request handling threads within each child process. In
-                2.3+ MPMs are no longer hard-wired. They too can be exchanged
+                2.4 MPMs are no longer hard-wired. They too can be exchanged
 				via <directive module="core">LoadModule</directive>.
-				The default MPM in 2.3 is the event MPM. 
+				The default MPM in 2.4 is the event MPM. 
             </p>
             <p>The maximum number of workers, be they pre-forked child
                 processes or threads within a process, is an indication of how