From 5d646dec96044630085d3fd489fa889598309513 Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Mon, 12 Mar 2012 00:29:10 +0000
Subject: [PATCH] Merge r1299497 from trunk:

PR52877, MaxMemFree text no longer matches 2.4.x+ default of 2048.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1299498 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mpm_common.html.en | 2 +-
 docs/manual/mod/mpm_common.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 2361664993..83b4906436 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -292,7 +292,7 @@ to hold without calling <code>free()</code></td></tr>
     <p>The <code class="directive">MaxMemFree</code> directive sets the
     maximum number of free Kbytes that every allocator is allowed
     to hold without calling <code>free()</code>. In threaded MPMs, every
-    thread has its own allocator. When not set, or when set
+    thread has its own allocator. When set
     to zero, the threshold will be set to unlimited.</p>
 
 </div>
diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index e979555795..bcabd39b07 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -337,7 +337,7 @@ to hold without calling <code>free()</code></description>
     <p>The <directive>MaxMemFree</directive> directive sets the
     maximum number of free Kbytes that every allocator is allowed
     to hold without calling <code>free()</code>. In threaded MPMs, every
-    thread has its own allocator. When not set, or when set
+    thread has its own allocator. When set
     to zero, the threshold will be set to unlimited.</p>
 </usage>
 </directivesynopsis>
-- 
2.40.0