[deployment-guide/comm-rel: 519/727] Updated the KeepAliveTimeout directive description.

Jaromir Hradilek jhradile at fedoraproject.org
Tue Oct 19 13:08:34 UTC 2010


commit d1dca7891adc00515b7c6d3eca1cf76d254ab898
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Tue Aug 31 10:32:44 2010 +0200

    Updated the KeepAliveTimeout directive description.

 en-US/The_Apache_HTTP_Server.xml |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 0750871..dabfeb8 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -605,7 +605,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
             </para>
             <screen>CacheDefaultExpire <replaceable>time</replaceable></screen>
             <para>
-              The <replaceable>time</replaceable> is a number of seconds to cache a file before it expires. The default option is <literal>3600</literal> (that is, one hour).
+              The <replaceable>time</replaceable> specified in seconds. The default option is <literal>3600</literal> (that is, one hour).
             </para>
             <example id="example-apache-httpdconf-cachedefaultexpire">
               <title>Using the <option>CacheDefaultExpire</option> directive</title>
@@ -712,7 +712,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
             </para>
             <screen>CacheMaxExpire <replaceable>time</replaceable></screen>
             <para>
-              The <replaceable>time</replaceable> is a maximum number of seconds to cache a document before it expires. The default option is <literal>86400</literal> (that is, one day).
+              The <replaceable>time</replaceable> is specified in seconds. The default option is <literal>86400</literal> (that is, one day).
             </para>
             <example id="example-apache-httpdconf-cachemaxexpire">
               <title>Using the <option>CacheMaxExpire</option> directive</title>
@@ -1151,6 +1151,22 @@ ErrorDocument 404 /404-not_found.html</screen>
             </example>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <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:
+            </para>
+            <screen>KeepAliveTimeout <replaceable>time</replaceable></screen>
+            <para>
+              The <replaceable>time</replaceable> is specified in seconds. The default option is <literal>15</literal>.
+            </para>
+            <example id="example-apache-httpdconf-keepalivetimeout">
+              <title>Using the <option>KeepAliveTimeout</option> directive</title>
+              <screen>KeepAliveTimeout 15</screen>
+            </example>
+          </listitem>
+        </varlistentry>
       </variablelist>
       <formalpara id="s2-apache-indexoptions">
         <title>IndexOptions</title>
@@ -1178,20 +1194,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-keepalivetimeout">
-        <title>KeepAliveTimeout</title>
-        <indexterm>
-          <primary><command>KeepAliveTimeout</command></primary>
-          <secondary>Apache configuration directive</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>configuration directives, Apache</primary>
-          <secondary><command>KeepAliveTimeout</command></secondary>
-        </indexterm>
-        <para>
-          <command>KeepAliveTimeout</command> sets the number of seconds the server waits after a request has been served before it closes the connection. Once the server receives a request, the <command>Timeout</command> directive applies instead. The <command>KeepAliveTimeout</command> directive is set to 15 seconds by default.
-        </para>
-      </formalpara>
       <formalpara id="s2-apache-languagepriority">
         <title>LanguagePriority</title>
         <indexterm>


More information about the docs-commits mailing list