[deployment-guide/comm-rel: 564/727] Updated the Timeout directive description.
Jaromir Hradilek
jhradile at fedoraproject.org
Tue Oct 19 13:12:23 UTC 2010
commit 6189014c20911d0c775d8974eeb6467547ce8d6a
Author: Jaromir Hradilek <jhradile at redhat.com>
Date: Thu Sep 2 11:41:43 2010 +0200
Updated the Timeout directive description.
en-US/The_Apache_HTTP_Server.xml | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index d0ecd15..bdf794c 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -1155,7 +1155,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<term><option>KeepAliveTimeout</option></term>
<listitem>
<para>
- The <option>KeepAliveTimeout</option> directive allows you to specify the number of seconds to wait for another request before closing the connection. It takes the following form:
+ The <option>KeepAliveTimeout</option> directive allows you to specify the amount of time to wait for another request before closing the connection. It takes the following form:
</para>
<screen>KeepAliveTimeout <replaceable>time</replaceable></screen>
<para>
@@ -2021,6 +2021,22 @@ ErrorDocument 404 /404-not_found.html</screen>
</example>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>Timeout</option></term>
+ <listitem>
+ <para>
+ The <option>Timeout</option> directive allows you to specify the amount of time to wait for an event before closing a connection. It takes the following form:
+ </para>
+ <screen>Timeout <replaceable>time</replaceable></screen>
+ <para>
+ The <replaceable>time</replaceable> is specified in seconds. The default option is <literal>60</literal>.
+ </para>
+ <example id="example-apache-httpdconf-timeout">
+ <title>Using the <option>Timeout</option> directive</title>
+ <screen>Timeout 60</screen>
+ </example>
+ </listitem>
+ </varlistentry>
</variablelist>
<formalpara id="s2-apache-indexoptions">
<title>IndexOptions</title>
@@ -2048,20 +2064,6 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
<command>IndexOptions</command> has a number of other parameters which can be set to control the appearance of server generated directories. The <command>IconHeight</command> and <command>IconWidth</command> parameters require the server to include HTML <command>HEIGHT</command> and <command>WIDTH</command> tags for the icons in server generated webpages. The <command>IconsAreLinks</command> parameter combines the graphical icon with the HTML link anchor, which contains the URL link target.
</para>
- <formalpara id="s2-apache-timeout">
- <title>Timeout</title>
- <indexterm>
- <primary><command>Timeout</command></primary>
- <secondary>Apache configuration directive</secondary>
- </indexterm>
- <indexterm>
- <primary>configuration directives, Apache</primary>
- <secondary><command>Timeout</command></secondary>
- </indexterm>
- <para>
- <command>Timeout</command> defines, in seconds, the amount of time that the server waits for receipts and transmissions during communications. <command>Timeout</command> is set to <command>300</command> seconds by default, which is appropriate for most situations.
- </para>
- </formalpara>
<formalpara id="s2-apache-typesconfig">
<title>TypesConfig</title>
<indexterm>
More information about the docs-commits
mailing list