You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ke...@apache.org on 2003/01/08 21:04:54 UTC

cvs commit: httpd-2.0/docs/manual/mod core.xml core.html.en quickreference.html.en

kess        2003/01/08 12:04:54

  Modified:    docs/manual/mod Tag: APACHE_2_0_BRANCH core.xml core.html.en
                        quickreference.html.en
  Log:
  - further markup improvements
  - use a more realistic values for some examples
  - use better parameter names
  - correct a seealso title
  
  thanks to nd for his suggestions
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.46.2.6  +37 -41    httpd-2.0/docs/manual/mod/core.xml
  
  Index: core.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.xml,v
  retrieving revision 1.46.2.5
  retrieving revision 1.46.2.6
  diff -u -r1.46.2.5 -r1.46.2.6
  --- core.xml	8 Jan 2003 03:54:32 -0000	1.46.2.5
  +++ core.xml	8 Jan 2003 20:04:52 -0000	1.46.2.6
  @@ -73,7 +73,7 @@
         <indent>
           Options +Includes<br />
           SetOutputFilter INCLUDES<br />
  -        AcceptPathInfo on<br />
  +        AcceptPathInfo On<br />
         </indent>
         &lt;/Files&gt;
       </example>
  @@ -882,8 +882,8 @@
   <usage>
       <p>The <directive>ErrorLog</directive> directive sets the name of
       the file to which the server will log any errors it encounters. If
  -    the <var>file-path</var> does not begin with a slash (/) then it is
  -    assumed to be relative to the <directive
  +    the <var>file-path</var> is not absolute (in general: does not begin
  +    with a slash (/)) then it is assumed to be relative to the <directive
       module="core">ServerRoot</directive>.</p>
   
       <example><title>Example</title>
  @@ -986,10 +986,10 @@
   <usage>
       <p>The <directive type="section">Files</directive> directive
       provides for access control by filename. It is comparable to the
  -    <directive module="core" type="directive">Directory</directive>
  +    <directive module="core" type="section">Directory</directive>
       directive and <directive module="core"
  -    type="directive">Location</directive> directives. It should be
  -    matched with a <code>&lt;/Files&gt;</code> directive. The
  +    type="section">Location</directive> directives. It should be
  +    matched with a <directive type="section">Files</directive> directive. The
       directives given within this section will be applied to any object
       with a basename (last component of filename) matching the
       specified filename. <directive type="section">Files</directive>
  @@ -1299,7 +1299,7 @@
       <p>This directive allows inclusion of other configuration files
       from within the server configuration files.</p>
   
  -    <p>Shell-style (fnmatch) wildcard characters can be used to
  +    <p>Shell-style (<code>fnmatch()</code>) wildcard characters can be used to
       include several files at once, in alphabetical order. In
       addition, if <directive>Include</directive> points to a directory,
       rather than a file, Apache will read all files in that directory
  @@ -1599,7 +1599,7 @@
       <p>For example:</p>
   
       <example>
  -      LimitRequestFieldSize 16380
  +      LimitRequestFieldSize 4094
       </example>
   
       <note>Under normal conditions, the value should not be changed from
  @@ -1640,7 +1640,7 @@
       <p>For example:</p>
   
       <example>
  -      LimitRequestLine 16380
  +      LimitRequestLine 4094
       </example>
   
       <note>Under normal conditions, the value should not be changed from
  @@ -2165,27 +2165,18 @@
       <p>This directive selects which authenticated users can access
       a directory. The allowed syntaxes are:</p>
   
  -    <ul>
  -      <li>
  -        Require user <var>userid</var> [<var>userid</var>] ...
  -
  -        <p>Only the named users can access the resource.</p>
  -      </li>
  -
  -      <li>
  -        Require group <var>group-name</var> [<var>group-name</var>] ...
  -
  -
  -        <p>Only users in the named groups can access the
  -        resource.</p>
  -      </li>
  -
  -      <li>
  -        Require valid-user
  +    <dl>
  +      <dt><code>Require user <var>userid</var> [<var>userid</var>]
  +      ...</code></dt>
  +      <dd>Only the named users can access the resource.</dd>
  +
  +      <dt><code>Require group <var>group-name</var> [<var>group-name</var>]
  +      ...</code></dt>
  +      <dd>Only users in the named groups can access the resource.</dd>
   
  -        <p>All valid users can access the resource.</p>
  -      </li>
  -    </ul>
  +      <dt><code>Require valid-user</code></dt>
  +      <dd>All valid users can access the resource.</dd>
  +    </dl>
   
       <p><directive>Require</directive> must be accompanied by
       <directive module="core">AuthName</directive> and <directive
  @@ -2218,7 +2209,7 @@
   <name>RLimitCPU</name>
   <description>Limits the CPU consumption of processes launched
   by Apache children</description>
  -<syntax>RLimitCPU <var>number</var>|max [<var>number</var>|max]</syntax>
  +<syntax>RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</syntax>
   <default>Unset; uses operating system defaults</default>
   <contextlist><context>server config</context><context>virtual host</context>
   <context>directory</context><context>.htaccess</context></contextlist>
  @@ -2231,7 +2222,7 @@
       or <code>max</code> to indicate to the server that the limit should
       be set to the maximum allowed by the operating system
       configuration. Raising the maximum resource limit requires that
  -    the server is running as root, or in the initial startup
  +    the server is running as <code>root</code>, or in the initial startup
       phase.</p>
   
       <p>This applies to processes forked off from Apache children
  @@ -2251,7 +2242,7 @@
   <name>RLimitMEM</name>
   <description>Limits the memory consumption of processes launched
   by Apache children</description>
  -<syntax>RLimitMEM <var>number</var>|max [<var>number</var>|max]</syntax>
  +<syntax>RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</syntax>
   <default>Unset; uses operating system defaults</default>
   <contextlist><context>server config</context><context>virtual host</context>
   <context>directory</context><context>.htaccess</context></contextlist>
  @@ -2264,7 +2255,7 @@
       or <code>max</code> to indicate to the server that the limit should
       be set to the maximum allowed by the operating system
       configuration. Raising the maximum resource limit requires that
  -    the server is running as root, or in the initial startup
  +    the server is running as <code>root</code>, or in the initial startup
       phase.</p>
   
       <p>This applies to processes forked off from Apache children
  @@ -2297,7 +2288,7 @@
       or <code>max</code> to indicate to the server that the limit
       should be set to the maximum allowed by the operating system
       configuration. Raising the maximum resource limit requires that
  -    the server is running as root, or in the initial startup
  +    the server is running as <code>root</code>, or in the initial startup
       phase.</p>
   
       <p>This applies to processes forked off from Apache children
  @@ -2372,7 +2363,8 @@
   <context>directory</context><context>.htaccess</context></contextlist>
   <override>FileInfo</override>
   <compatibility>Win32 only<br />
  -option Registry-Strict is available in Apache 2.0 and later</compatibility>
  +option <code>Registry-Strict</code> is available in Apache 2.0 and
  +later</compatibility>
   
   <usage>
       <p>This directive is used to control how Apache finds the
  @@ -2483,7 +2475,8 @@
       </p>
   </usage>
   
  -<seealso><a href="../dns-caveats.html">DNS Issues</a></seealso>
  +<seealso><a href="../dns-caveats.html">Issues Regarding DNS and
  +Apache</a></seealso>
   <seealso><a href="../vhosts/">Apache virtual host
       documentation</a></seealso>
   <seealso><directive module="core">UseCanonicalName</directive></seealso>
  @@ -2529,7 +2522,7 @@
       option to <code>httpd</code></a></seealso>
   <seealso><a href="../misc/security_tips.html#serverroot">the
       security tips</a> for information on how to properly set
  -    permissions on the ServerRoot</seealso>
  +    permissions on the <directive>ServerRoot</directive></seealso>
   </directivesynopsis>
   
   <directivesynopsis>
  @@ -2549,7 +2542,9 @@
       listings, <module>mod_info</module> output, ...). The reason why you
       would want to enable such a footer line is that in a chain of proxies,
       the user often has no possibility to tell which of the chained servers
  -    actually produced a returned error message.<br /> The <code>Off</code>
  +    actually produced a returned error message.</p>
  +
  +    <p>The <code>Off</code>
       setting, which is the default, suppresses the footer line (and is
       therefore compatible with the behavior of Apache-1.2 and
       below). The <code>On</code> setting simply adds a line with the
  @@ -2569,7 +2564,8 @@
   
   <directivesynopsis>
   <name>ServerTokens</name>
  -<description>Configures the Server HTTP response header</description>
  +<description>Configures the <code>Server</code> HTTP response
  +header</description>
   <syntax>ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</syntax>
   <default>ServerTokens Full</default>
   <contextlist><context>server config</context></contextlist>
  @@ -2732,7 +2728,7 @@
   <name>TimeOut</name>
   <description>Amount of time the server will wait for
   certain events before failing a request</description>
  -<syntax>TimeOut <var>number</var></syntax>
  +<syntax>TimeOut <var>seconds</var></syntax>
   <default>TimeOut 300</default>
   <contextlist><context>server config</context></contextlist>
   
  @@ -2926,7 +2922,7 @@
       </note>
   </usage>
   <seealso><a href="../vhosts/">Apache Virtual Host documentation</a></seealso>
  -<seealso><a href="../dns-caveats.html">Warnings about DNS and
  +<seealso><a href="../dns-caveats.html">Issues Regarding DNS and
       Apache</a></seealso>
   <seealso><a href="../bind.html">Setting
       which addresses and ports Apache uses</a></seealso>
  
  
  
  1.46.2.9  +50 -54    httpd-2.0/docs/manual/mod/core.html.en
  
  Index: core.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.html.en,v
  retrieving revision 1.46.2.8
  retrieving revision 1.46.2.9
  diff -u -r1.46.2.8 -r1.46.2.9
  --- core.html.en	8 Jan 2003 03:54:32 -0000	1.46.2.8
  +++ core.html.en	8 Jan 2003 20:04:52 -0000	1.46.2.9
  @@ -99,7 +99,7 @@
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0.30 and later</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>Available in Apache 2.0.30 and later</compatibility></td></tr>
   </table>
   
       <p>This directive controls whether requests that contain trailing
  @@ -151,7 +151,7 @@
         <span class="indent">
           Options +Includes<br />
           SetOutputFilter INCLUDES<br />
  -        AcceptPathInfo on<br />
  +        AcceptPathInfo On<br />
         </span>
         &lt;/Files&gt;
       </code></p></div>
  @@ -237,7 +237,7 @@
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0.33 and later</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>Available in Apache 2.0.33 and later</compatibility></td></tr>
   </table>
       <p>This directive activates a particular output <a href="../filter.html">filter</a> for a request depending on the
       response MIME-type.</p>
  @@ -454,7 +454,7 @@
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>NetWare only</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>NetWare only</compatibility></td></tr>
   </table>
       <p>This directive is used to control how Apache finds the
       interpreter used to run CGI scripts. For example, setting
  @@ -800,7 +800,7 @@
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.44 and later</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>Available in version 2.0.44 and later</compatibility></td></tr>
   </table>
       <p>This directive controls whether <code>httpd</code> may use the sendfile
       support from the kernel to transmit file contents to the client.
  @@ -853,8 +853,8 @@
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Quoting syntax for text messages is different in Apache
  -2.0</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>Quoting syntax for text messages is different in Apache
  +2.0</compatibility></td></tr>
   </table>
       <p>In the event of a problem or error, Apache can be configured
       to do one of four things,</p>
  @@ -934,8 +934,8 @@
   </table>
       <p>The <code class="directive">ErrorLog</code> directive sets the name of
       the file to which the server will log any errors it encounters. If
  -    the <var>file-path</var> does not begin with a slash (/) then it is
  -    assumed to be relative to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>.</p>
  +    the <var>file-path</var> is not absolute (in general: does not begin
  +    with a slash (/)) then it is assumed to be relative to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>.</p>
   
       <div class="example"><h3>Example</h3><p><code>
       ErrorLog /var/log/httpd/error_log
  @@ -1037,9 +1037,9 @@
   </table>
       <p>The <code class="directive">&lt;Files&gt;</code> directive
       provides for access control by filename. It is comparable to the
  -    <code class="directive"><a href="#directory">Directory</a></code>
  -    directive and <code class="directive"><a href="#location">Location</a></code> directives. It should be
  -    matched with a <code>&lt;/Files&gt;</code> directive. The
  +    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
  +    directive and <code class="directive"><a href="#location">&lt;Location&gt;</a></code> directives. It should be
  +    matched with a <code class="directive">&lt;Files&gt;</code> directive. The
       directives given within this section will be applied to any object
       with a basename (last component of filename) matching the
       specified filename. <code class="directive">&lt;Files&gt;</code>
  @@ -1113,7 +1113,7 @@
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Moved to the core in Apache 2.0</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>Moved to the core in Apache 2.0</compatibility></td></tr>
   </table>
       <p>When placed into an <code>.htaccess</code> file or a
       <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>, or
  @@ -1333,12 +1333,12 @@
   <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Wildcard matching available in 2.0.41 and later</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>Wildcard matching available in 2.0.41 and later</compatibility></td></tr>
   </table>
       <p>This directive allows inclusion of other configuration files
       from within the server configuration files.</p>
   
  -    <p>Shell-style (fnmatch) wildcard characters can be used to
  +    <p>Shell-style (<code>fnmatch()</code>) wildcard characters can be used to
       include several files at once, in alphabetical order. In
       addition, if <code class="directive">Include</code> points to a directory,
       rather than a file, Apache will read all files in that directory
  @@ -1637,7 +1637,7 @@
       <p>For example:</p>
   
       <div class="example"><p><code>
  -      LimitRequestFieldSize 16380
  +      LimitRequestFieldSize 4094
       </code></p></div>
   
       <div class="note">Under normal conditions, the value should not be changed from
  @@ -1679,7 +1679,7 @@
       <p>For example:</p>
   
       <div class="example"><p><code>
  -      LimitRequestLine 16380
  +      LimitRequestLine 4094
       </code></p></div>
   
       <div class="note">Under normal conditions, the value should not be changed from
  @@ -2195,27 +2195,18 @@
       <p>This directive selects which authenticated users can access
       a directory. The allowed syntaxes are:</p>
   
  -    <ul>
  -      <li>
  -        Require user <var>userid</var> [<var>userid</var>] ...
  -
  -        <p>Only the named users can access the resource.</p>
  -      </li>
  -
  -      <li>
  -        Require group <var>group-name</var> [<var>group-name</var>] ...
  -
  -
  -        <p>Only users in the named groups can access the
  -        resource.</p>
  -      </li>
  -
  -      <li>
  -        Require valid-user
  +    <dl>
  +      <dt><code>Require user <var>userid</var> [<var>userid</var>]
  +      ...</code></dt>
  +      <dd>Only the named users can access the resource.</dd>
  +
  +      <dt><code>Require group <var>group-name</var> [<var>group-name</var>]
  +      ...</code></dt>
  +      <dd>Only users in the named groups can access the resource.</dd>
   
  -        <p>All valid users can access the resource.</p>
  -      </li>
  -    </ul>
  +      <dt><code>Require valid-user</code></dt>
  +      <dd>All valid users can access the resource.</dd>
  +    </dl>
   
       <p><code class="directive">Require</code> must be accompanied by
       <code class="directive"><a href="#authname">AuthName</a></code> and <code class="directive"><a href="#authtype">AuthType</a></code> directives, and directives such
  @@ -2250,7 +2241,7 @@
   <table class="directive">
   <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the CPU consumption of processes launched
   by Apache children</td></tr>
  -<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RLimitCPU <var>number</var>|max [<var>number</var>|max]</code></td></tr>
  +<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</code></td></tr>
   <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Unset; uses operating system defaults</code></td></tr>
   <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
  @@ -2263,7 +2254,7 @@
       or <code>max</code> to indicate to the server that the limit should
       be set to the maximum allowed by the operating system
       configuration. Raising the maximum resource limit requires that
  -    the server is running as root, or in the initial startup
  +    the server is running as <code>root</code>, or in the initial startup
       phase.</p>
   
       <p>This applies to processes forked off from Apache children
  @@ -2286,7 +2277,7 @@
   <table class="directive">
   <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the memory consumption of processes launched
   by Apache children</td></tr>
  -<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RLimitMEM <var>number</var>|max [<var>number</var>|max]</code></td></tr>
  +<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</code></td></tr>
   <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Unset; uses operating system defaults</code></td></tr>
   <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
  @@ -2299,7 +2290,7 @@
       or <code>max</code> to indicate to the server that the limit should
       be set to the maximum allowed by the operating system
       configuration. Raising the maximum resource limit requires that
  -    the server is running as root, or in the initial startup
  +    the server is running as <code>root</code>, or in the initial startup
       phase.</p>
   
       <p>This applies to processes forked off from Apache children
  @@ -2335,7 +2326,7 @@
       or <code>max</code> to indicate to the server that the limit
       should be set to the maximum allowed by the operating system
       configuration. Raising the maximum resource limit requires that
  -    the server is running as root, or in the initial startup
  +    the server is running as <code>root</code>, or in the initial startup
       phase.</p>
   
       <p>This applies to processes forked off from Apache children
  @@ -2414,8 +2405,9 @@
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Win32 only
  -option Registry-Strict is available in Apache 2.0 and later</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>Win32 only<br />
  +option <code>Registry-Strict</code> is available in Apache 2.0 and
  +later</compatibility></td></tr>
   </table>
       <p>This directive is used to control how Apache finds the
       interpreter used to run CGI scripts. The default technique is to
  @@ -2489,9 +2481,9 @@
   <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>In version 2.0, this
  -     directive supersedes the functionality of the Port
  -     directive from version 1.3.</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>In version 2.0, this
  +     directive supersedes the functionality of the <code class="directive">Port</code>
  +     directive from version 1.3.</compatibility></td></tr>
   </table>
       <p>The <code class="directive">ServerName</code> directive sets the hostname and
       port that the server uses to identify itself.  This is used when
  @@ -2528,7 +2520,8 @@
   
   <h3>See also</h3>
   <ul>
  -<li><a href="../dns-caveats.html">DNS Issues</a></li>
  +<li><a href="../dns-caveats.html">Issues Regarding DNS and
  +Apache</a></li>
   <li><a href="../vhosts/">Apache virtual host
       documentation</a></li>
   <li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
  @@ -2581,7 +2574,7 @@
       option to <code>httpd</code></a></li>
   <li><a href="../misc/security_tips.html#serverroot">the
       security tips</a> for information on how to properly set
  -    permissions on the ServerRoot</li>
  +    permissions on the <code class="directive">ServerRoot</code></li>
   </ul>
   </div>
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
  @@ -2601,7 +2594,9 @@
       listings, <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> output, ...). The reason why you
       would want to enable such a footer line is that in a chain of proxies,
       the user often has no possibility to tell which of the chained servers
  -    actually produced a returned error message.<br /> The <code>Off</code>
  +    actually produced a returned error message.</p>
  +
  +    <p>The <code>Off</code>
       setting, which is the default, suppresses the footer line (and is
       therefore compatible with the behavior of Apache-1.2 and
       below). The <code>On</code> setting simply adds a line with the
  @@ -2621,7 +2616,8 @@
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
   <div class="directive-section"><h2><a name="ServerTokens" id="ServerTokens">ServerTokens</a> <a name="servertokens" id="servertokens">Directive</a></h2>
   <table class="directive">
  -<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures the Server HTTP response header</td></tr>
  +<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures the Server HTTP response
  +header</td></tr>
   <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</code></td></tr>
   <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ServerTokens Full</code></td></tr>
   <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
  @@ -2686,7 +2682,7 @@
   <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
  -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Moved into the core in Apache 2.0</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><compatibility>Moved into the core in Apache 2.0</compatibility></td></tr>
   </table>
       <p>When placed into an <code>.htaccess</code> file or a
       <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> or
  @@ -2791,7 +2787,7 @@
   <table class="directive">
   <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Amount of time the server will wait for
   certain events before failing a request</td></tr>
  -<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TimeOut <var>number</var></code></td></tr>
  +<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TimeOut <var>seconds</var></code></td></tr>
   <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>TimeOut 300</code></td></tr>
   <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
  @@ -2989,7 +2985,7 @@
   <h3>See also</h3>
   <ul>
   <li><a href="../vhosts/">Apache Virtual Host documentation</a></li>
  -<li><a href="../dns-caveats.html">Warnings about DNS and
  +<li><a href="../dns-caveats.html">Issues Regarding DNS and
       Apache</a></li>
   <li><a href="../bind.html">Setting
       which addresses and ports Apache uses</a></li>
  
  
  
  1.47.2.19 +5 -4      httpd-2.0/docs/manual/mod/quickreference.html.en
  
  Index: quickreference.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/quickreference.html.en,v
  retrieving revision 1.47.2.18
  retrieving revision 1.47.2.19
  diff -u -r1.47.2.18 -r1.47.2.19
  --- quickreference.html.en	8 Jan 2003 03:55:52 -0000	1.47.2.18
  +++ quickreference.html.en	8 Jan 2003 20:04:52 -0000	1.47.2.19
  @@ -525,9 +525,9 @@
   <tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <em>Options</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
   <tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
         <em>Pattern</em> <em>Substitution</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
  -<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>number</var>|max [<var>number</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
  +<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
   by Apache children</td></tr>
  -<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>number</var>|max [<var>number</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
  +<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
   by Apache children</td></tr>
   <tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of processes that can be launched by
   processes launched by Apache children</td></tr>
  @@ -563,7 +563,8 @@
   is accessed by an incompatible browser</td></tr>
   <tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Base directory for the server installation</td></tr>
   <tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
  -<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the Server HTTP response header</td></tr>
  +<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
  +header</td></tr>
   <tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
   <tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
       regex [!]env-variable</em>[=<em>value</em>]
  @@ -644,7 +645,7 @@
   per child process</td></tr>
   <tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
   <tr class="odd"><td><a href="mpm_netware.html#threadstacksize">ThreadStackSize <var>number</var></a></td><td> 65536 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Determine the stack size for each thread</td></tr>
  -<tr><td><a href="core.html#timeout">TimeOut <var>number</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
  +<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
   certain events before failing a request</td></tr>
   <tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specifly location of a log file</td></tr>
   <tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>