Return-Path: 
 <cvs-return-30748-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 78380 invoked from network); 9 Aug 2008 20:32:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Aug 2008 20:32:27 -0000
Received: (qmail 25906 invoked by uid 500); 9 Aug 2008 20:32:26 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 25851 invoked by uid 500); 9 Aug 2008 20:32:26 -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>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 25842 invoked by uid 99); 9 Aug 2008 20:32:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Aug 2008 13:32:26 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Aug 2008 20:31:38 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8623123889C0; Sat,  9 Aug 2008 13:32:06 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r684337 -
 /httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
Date: Sat, 09 Aug 2008 20:32:06 -0000
To: cvs@httpd.apache.org
From: rpluem@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080809203206.8623123889C0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rpluem
Date: Sat Aug  9 13:32:05 2008
New Revision: 684337

URL: http://svn.apache.org/viewvc?rev=684337&view=rev
Log:
* Fix bogus explanation of timeout parameter

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?rev=684337&r1=684336&r2=684337&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml Sat Aug  9 13:32:05 2008
@@ -786,10 +786,9 @@
     <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.
+        The number of seconds Apache waits for data sent by / to the backend.
+        If not set, it defaults to
+        <directive module="mod_proxy">ProxyTimeout</directive>.
     </td></tr>
     <tr><td>ttl</td>
         <td>-</td>