You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mt...@apache.org on 2004/12/19 18:05:05 UTC
svn commit: r122772 - /httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en /httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
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>