From: Jeff Trawick <trawick@apache.org>
Date: Mon, 14 Feb 2011 20:36:12 +0000 (+0000)
Subject: Merge r1058192 from trunk:
X-Git-Tag: 2.2.18~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=305de5fe9fbf944577003ea070b775cfd2a75c84;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1058192 from trunk:

ttl: note that connections are closed at some unspecified point
after reaching this limit



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

diff --git a/docs/manual/mod/mod_autoindex.xml.ja b/docs/manual/mod/mod_autoindex.xml.ja
index 8802672523e..890f0e275b0 100644
--- a/docs/manual/mod/mod_autoindex.xml.ja
+++ b/docs/manual/mod/mod_autoindex.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: 421100:1068793 (outdated) -->
+<!-- English Revision: 421100:1070648 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_autoindex.xml.ko b/docs/manual/mod/mod_autoindex.xml.ko
index d7ce3cf9a12..c0f73dfe0da 100644
--- a/docs/manual/mod/mod_autoindex.xml.ko
+++ b/docs/manual/mod/mod_autoindex.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 103423:1068793 (outdated) -->
+<!-- English Revision: 103423:1070648 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_autoindex.xml.tr b/docs/manual/mod/mod_autoindex.xml.tr
index 1cc003721a0..60418cc53c2 100644
--- a/docs/manual/mod/mod_autoindex.xml.tr
+++ b/docs/manual/mod/mod_autoindex.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: 1059590:1068793 (outdated) -->
+<!-- English Revision: 1059590:1070648 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 00b5a09410b..d3753a8e8c5 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1088,8 +1088,9 @@ through</td></tr>
     <tr><td>ttl</td>
         <td>-</td>
         <td>Time to live for inactive connections and associated connection
-        pool entries, in seconds.  Those which are unused for at least
-        <code>ttl</code> seconds will be destroyed.
+        pool entries, in seconds.  Once reaching this limit, a
+        connection will not be used again; it will be closed at some
+        later time.
     </td></tr>
 
     </table>
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index b55b7b121b9..44eb65a968a 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -936,8 +936,9 @@ expressions</description>
     <tr><td>ttl</td>
         <td>-</td>
         <td>Time to live for inactive connections and associated connection
-        pool entries, in seconds.  Those which are unused for at least
-        <code>ttl</code> seconds will be destroyed.
+        pool entries, in seconds.  Once reaching this limit, a
+        connection will not be used again; it will be closed at some
+        later time.
     </td></tr>
 
     </table>