Return-Path: 
 <cvs-return-21049-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 84645 invoked from network); 19 Dec 2004 17:05:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 19 Dec 2004 17:05:09 -0000
Received: (qmail 24833 invoked by uid 500); 19 Dec 2004 17:05:07 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 24790 invoked by uid 500); 19 Dec 2004 17:05:07 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 24775 invoked by uid 99); 19 Dec 2004 17:05:07 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sun, 19 Dec 2004 09:05:07 -0800
Received: (qmail 84621 invoked by uid 65534); 19 Dec 2004 17:05:05 -0000
Date: 19 Dec 2004 17:05:05 -0000
Message-ID: <20041219170505.84614.qmail@minotaur.apache.org>
From: mturk@apache.org
To: cvs@httpd.apache.org
Subject: svn commit: r122772 -
 /httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
 /httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: mturk
Date: Sun Dec 19 09:05:04 2004
New Revision: 122772

URL: http://svn.apache.org/viewcvs?view=rev&rev=122772
Log:
Move the timeout explanation sentence to the proper place in the table.
Modified:
   httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
   httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en?view=diff&rev=122772&p1=httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en&r1=122771&p2=httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en&r2=122772
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en	(original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en	Sun Dec 19 09:05:04 2004
@@ -578,14 +578,14 @@
         <td>Time To Live for the inactive connections above the
         <code>smax</code> connections in seconds. Apache will close all
         connections that has not been used inside that time period.
-        If not set the Apache will wait until the free connection
-        is available. This directive is used for limiting the number
-        of connections to the backend server together with <code>max</code>
-        parameter.
     </td></tr>
     <tr><td>timeout</td>
         <td><code class="directive">Timeout</code></td>
         <td>Connection timeout in seconds.
+        If not set the Apache will wait until the free connection
+        is available. This directive is used for limiting the number
+        of connections to the backend server together with <code>max</code>
+        parameter.
     </td></tr>
     <tr><td>acquire</td>
         <td>-</td>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?view=diff&rev=122772&p1=httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml&r1=122771&p2=httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml&r2=122772
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml	(original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml	Sun Dec 19 09:05:04 2004
@@ -406,14 +406,14 @@
         <td>Time To Live for the inactive connections above the
         <code>smax</code> connections in seconds. Apache will close all
         connections that has not been used inside that time period.
-        If not set the Apache will wait until the free connection
-        is available. This directive is used for limiting the number
-        of connections to the backend server together with <code>max</code>
-        parameter.
     </td></tr>
     <tr><td>timeout</td>
         <td><directive>Timeout</directive></td>
         <td>Connection timeout in seconds.
+        If not set the Apache will wait until the free connection
+        is available. This directive is used for limiting the number
+        of connections to the backend server together with <code>max</code>
+        parameter.
     </td></tr>
     <tr><td>acquire</td>
         <td>-</td>