From: Rich Bowen <rbowen@apache.org>
Date: Fri, 7 Jan 2011 12:07:40 +0000 (+0000)
Subject: Rebuild Covener's changes from jan 5
X-Git-Tag: 2.3.11~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de3732cf45563aa8fddbd93ae1607d37c14e785a;p=thirdparty%2Fapache%2Fhttpd.git

Rebuild Covener's changes from jan 5


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

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 33169d17e25..82aebcaef3f 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -512,6 +512,15 @@ Apache HTTP Server</a></li>
     <p>If set to the value of <code>0</code>, the server will use the
     default value provided by your OS.</p>
 
+    <p>Further configuration of your operating system may be required to elicit
+    better performance on high speed, high latency connections.</p>
+
+    <div class="note"> <p> On some operating systems, changes in TCP behavior resulting
+    from a larger <code class="directive">SendBufferSize</code> may not be seen unless
+    <code class="directive"><a href="../mod/core.html#enablesendfile">EnableSendfile</a></code> is set to OFF.  This
+    interaction applies only to static files.</p> </div>
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ServerLimit" id="ServerLimit">ServerLimit</a> <a name="serverlimit" id="serverlimit">Directive</a></h2>
diff --git a/docs/manual/mod/mpm_common.xml.de b/docs/manual/mod/mpm_common.xml.de
index 70c2c566d26..79f3850db27 100644
--- a/docs/manual/mod/mpm_common.xml.de
+++ b/docs/manual/mod/mpm_common.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 151408:1053666 (outdated) -->
+<!-- English Revision: 151408:1055701 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index 12237539303..81f13cbdfae 100644
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 674934:1053666 (outdated) -->
+<!-- English Revision: 674934:1055701 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mpm_common.xml.tr b/docs/manual/mod/mpm_common.xml.tr
index 3ceac268bae..bcf4568c2f6 100644
--- a/docs/manual/mod/mpm_common.xml.tr
+++ b/docs/manual/mod/mpm_common.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 804678:1053666 (outdated) -->
+<!-- English Revision: 804678:1055701 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>