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 04:54:33 UTC

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

kess        2003/01/07 19:54:33

  Modified:    docs/manual/mod Tag: APACHE_2_0_BRANCH core.xml core.html.en
  Log:
  - clarify somes mistakables
  - some markup improvement
  - other peanuts (typo, etc.)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.46.2.5  +107 -99   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.4
  retrieving revision 1.46.2.5
  diff -u -r1.46.2.4 -r1.46.2.5
  --- core.xml	19 Dec 2002 20:59:31 -0000	1.46.2.4
  +++ core.xml	8 Jan 2003 03:54:32 -0000	1.46.2.5
  @@ -90,7 +90,7 @@
   </contextlist>
   
   <usage>
  -    <p>When returning a document to the client the server looks for
  +    <p>While processing a request the server looks for
       the first existing configuration file from this list of names in
       every directory of the path to the document, if distributed
       configuration files are enabled for that directory. For
  @@ -193,7 +193,7 @@
       &lt;/Location&gt;
       </example>
   
  -    <note type="warning"><title>Note:</title>
  +    <note type="warning"><title>Note</title>
         <p>Enabling filters with <directive>AddOutputFilterByType</directive>
         may fail partially or completely in some cases. For expample, no
         filters are applied if the content type falls back to the <directive
  @@ -218,7 +218,7 @@
   <directivesynopsis>
   <name>AllowOverride</name>
   <description>Types of directives that are allowed in
  -.htaccess files</description>
  +<code>.htaccess</code> files</description>
   <syntax>AllowOverride All|None|<var>directive-type</var>
   [<var>directive-type</var>] ...</syntax>
   <default>AllowOverride All</default>
  @@ -230,7 +230,7 @@
       it needs to know which directives declared in that file can override
       earlier access information.</p>
   
  -    <note><title>Only available in Directory sections</title>
  +    <note><title>Only available in &lt;Directory&gt; sections</title>
       <directive>AllowOverride</directive> is valid only in
       <directive type="section" module="core">Directory</directive>
       sections, not in <directive type="section"
  @@ -400,14 +400,14 @@
       <p>This directive is used to control how Apache finds the
       interpreter used to run CGI scripts. For example, setting
       <code>CGIMapExtension sys:\foo.nlm .foo</code> will
  -    cause all CGI script files with a .foo extension to be passed to the
  -    FOO interpreter.</p>
  +    cause all CGI script files with a <code>.foo</code> extension to
  +    be passed to the FOO interpreter.</p>
   </usage>
   </directivesynopsis>
   
   <directivesynopsis>
   <name>ContentDigest</name>
  -<description>Enables the generation of Content-MD5 HTTP Response
  +<description>Enables the generation of <code>Content-MD5</code> HTTP Response
   headers</description>
   <syntax>ContentDigest On|Off</syntax>
   <default>ContentDigest Off</default>
  @@ -534,7 +534,8 @@
       <p>would match directories in <code>/www/</code> that consisted of
       three numbers.</p>
   
  -    <p>If multiple (non-regular expression) directory sections
  +    <p>If multiple (non-regular expression) <directive
  +    type="section">Directory</directive> sections
       match the directory (or its parents) containing a document,
       then the directives are applied in the order of shortest match
       first, interspersed with the directives from the <a
  @@ -565,7 +566,7 @@
         <li>Apply directive <code>AllowOverride FileInfo</code> (for
         directory <code>/home/web</code>).</li>
   
  -      <li>Apply any FileInfo directives in
  +      <li>Apply any <code>FileInfo</code> directives in
         <code>/home/web/.htaccess</code></li>
       </ul>
   
  @@ -582,7 +583,7 @@
         &lt;/Directory&gt;
       </example>
   
  -    <p>The regular expression section won't be considered until after
  +    <p>the regular expression section won't be considered until after
       all normal <code>&lt;Directory&gt;</code>s and <code>.htaccess</code>
       files have been applied. Then the regular expression will match on
       <code>/home/abc/public_html/abc</code> and be applied.</p>
  @@ -613,8 +614,8 @@
       type="section">Limit</directive> or <directive module="core"
       type="section">LimitExcept</directive> section.</p>
   </usage>
  -<seealso><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  +<seealso><a href="../sections.html">How &lt;Directory&gt;,
  +    &lt;Location&gt; and &lt;Files&gt; sections work</a> for an
       explanation of how these different sections are combined when a
       request is received</seealso>
   </directivesynopsis>
  @@ -646,11 +647,11 @@
   </usage>
   <seealso><directive type="section" module="core">Directory</directive> for
   a description of how regular expressions are mixed in with normal
  -<code>&lt;Directory&gt;</code>s</seealso>
  +<directive type="section">Directory</directive>s</seealso>
   <seealso><a
  -href="../sections.html">How Directory, Location and Files sections
  -work</a> for an explanation of how these different sections are
  -combined when a request is received</seealso>
  +href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt; and
  +&lt;Files&gt; sections work</a> for an explanation of how these different
  +sections are combined when a request is received</seealso>
   </directivesynopsis>
   
   <directivesynopsis>
  @@ -727,7 +728,9 @@
   
       <example>
         &lt;Directory "/path-to-nfs-files"&gt;
  -            EnableMMAP Off
  +      <indent>
  +        EnableMMAP Off
  +      </indent>
         &lt;/Directory&gt;
       </example>
   </usage>
  @@ -779,8 +782,10 @@
       for the offending files by specifying:</p>
   
       <example>
  -      &lt;Directory "/path-to-nfs-files"&gt;<br />
  -            EnableSendfile Off<br />
  +      &lt;Directory "/path-to-nfs-files"&gt;
  +      <indent>
  +        EnableSendfile Off
  +      </indent>
         &lt;/Directory&gt;
       </example>
   </usage>
  @@ -844,7 +849,7 @@
       URL in an <code>ErrorDocument 401</code>, the client will not
       know to prompt the user for a password since it will not
       receive the 401 status code. Therefore, <strong>if you use an
  -    "ErrorDocument 401" directive then it must refer to a local
  +    <code>ErrorDocument 401</code> directive then it must refer to a local
       document.</strong></p>
   
       <p>Microsoft Internet Explorer (MSIE) will by default ignore
  @@ -869,7 +874,7 @@
   <name>ErrorLog</name>
   <description>Location where the server will log errors</description>
   <syntax> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</syntax>
  -<default>ErrorLog logs/error_log (Unix)
  +<default>ErrorLog logs/error_log (Unix)<br />
   ErrorLog logs/error.log (Windows and OS/2)</default>
   <contextlist><context>server config</context><context>virtual host</context>
   </contextlist>
  @@ -1008,9 +1013,9 @@
         &lt;Files ~ "\.(gif|jpe?g|png)$"&gt;
       </example>
   
  -    <p>would match most common Internet graphics formats. In Apache 1.3
  -    and later, <directive module="core"
  -    type="section">FilesMatch</directive> is preferred, however.</p>
  +    <p>would match most common Internet graphics formats. <directive
  +    module="core" type="section">FilesMatch</directive> is preferred,
  +    however.</p>
   
       <p>Note that unlike <directive type="section"
       module="core">Directory</directive> and <directive type="section"
  @@ -1020,10 +1025,9 @@
       their own files, at a file-by-file level.</p>
   
   </usage>
  -<seealso><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</seealso>
  +<seealso><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</seealso>
   </directivesynopsis>
   
   <directivesynopsis type="section">
  @@ -1049,10 +1053,9 @@
       <p>would match most common Internet graphics formats.</p>
   </usage>
   
  -<seealso><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</seealso>
  +<seealso><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</seealso>
   </directivesynopsis>
   
   <directivesynopsis>
  @@ -1117,7 +1120,7 @@
       <p>This directive enables DNS lookups so that host names can be
       logged (and passed to CGIs/SSIs in <code>REMOTE_HOST</code>).
       The value <code>Double</code> refers to doing double-reverse
  -    DNS. That is, after a reverse lookup is performed, a forward
  +    DNS lookup. That is, after a reverse lookup is performed, a forward
       lookup is then performed on that result. At least one of the ip
       addresses in the forward lookup must match the original
       address. (In "tcpwrappers" terminology this is called
  @@ -1140,9 +1143,9 @@
       Heavily loaded sites should leave this directive
       <code>Off</code>, since DNS lookups can take considerable
       amounts of time. The utility <a
  -    href="../programs/logresolve.html">logresolve</a>, provided in
  -    the <var>/support</var> directory, can be used to look up host
  -    names from logged IP addresses offline.</p>
  +    href="../programs/logresolve.html">logresolve</a>, compiled by default
  +    to the <code>bin</code> subdirectory of your installation directory, can
  +    be used to look up host names from logged IP addresses offline.</p>
   </usage>
   </directivesynopsis>
   
  @@ -1354,8 +1357,8 @@
       which allow multiple requests to be sent over the same TCP
       connection. In some cases this has been shown to result in an
       almost 50% speedup in latency times for HTML documents with
  -    many images. To enable Keep-Alive connections in Apache 1.2 and
  -    later, set <code>KeepAlive On</code>.</p>
  +    many images. To enable Keep-Alive connections, set
  +    <code>KeepAlive On</code>.</p>
   
       <p>For HTTP/1.0 clients, Keep-Alive connections will only be
       used if they are specifically requested by a client. In
  @@ -1416,11 +1419,11 @@
       <p>The purpose of the <directive type="section">Limit</directive>
       directive is to restrict the effect of the access controls to the
       nominated HTTP methods. For all other methods, the access
  -    restrictions that are enclosed in the <code>&lt;Limit&gt;</code>
  -    bracket <strong>will have no effect</strong>. The following
  -    example applies the access control only to the methods <code>POST</code>,
  -    <code>PUT</code>, and <code>DELETE</code>, leaving all other methods
  -    unprotected:</p>
  +    restrictions that are enclosed in the <directive
  +    type="section">Limit</directive> bracket <strong>will have no
  +    effect</strong>. The following example applies the access control
  +    only to the methods <code>POST</code>, <code>PUT</code>, and
  +    <code>DELETE</code>, leaving all other methods unprotected:</p>
   
       <example>
         &lt;Limit POST PUT DELETE&gt;<br />
  @@ -1502,8 +1505,8 @@
       response instead of servicing the request. The size of a normal
       request message body will vary greatly depending on the nature of
       the resource and the methods allowed on that resource. CGI scripts
  -    typically use the message body for passing form information to the
  -    server. Implementations of the <code>PUT</code> method will require
  +    typically use the message body for retrieving form information.
  +    Implementations of the <code>PUT</code> method will require
       a value at least as large as any representation that the server
       wishes to accept for that resource.</p>
   
  @@ -1513,7 +1516,7 @@
       attacks.</p>
   
       <p>If, for example, you are permitting file upload to a particular
  -    location, and wich to limit the size of the uploaded file to 100K,
  +    location, and wish to limit the size of the uploaded file to 100K,
       you might use the following directive:</p>
   
       <example>
  @@ -1579,7 +1582,7 @@
       distributed) that will be allowed in an HTTP request
       header.</p>
   
  -    <p>The <directive>LimitRequestFieldsize</directive> directive
  +    <p>The <directive>LimitRequestFieldSize</directive> directive
       allows the server administrator to reduce the limit on the allowed
       size of an HTTP request header field below the normal input buffer
       size compiled with the server. A server needs this value to be
  @@ -1648,7 +1651,7 @@
   <directivesynopsis>
   <name>LimitXMLRequestBody</name>
   <description>Limits the size of an XML-based request body</description>
  -<syntax>LimitXMLRequestBody <var>number</var></syntax>
  +<syntax>LimitXMLRequestBody <var>bytes</var></syntax>
   <default>LimitXMLRequestBody 1000000</default>
   <contextlist><context>server config</context><context>virtual host</context>
   <context>directory</context><context>.htaccess</context></contextlist>
  @@ -1689,8 +1692,9 @@
       type="section" module="core">Files</directive> sections.</p>
   
       <p>Note that URLs do not have to line up with the filesystem at
  -    all, it should be emphasized that <code>&lt;Location&gt;</code> operates
  -    completely outside the filesystem.</p>
  +    all, it should be emphasized that <directive
  +    type="section">Location</directive> operates completely
  +    outside the filesystem.</p>
   
       <p>For all origin (non-proxy) requests, the URL to be matched is a
       URL-path of the form <code>/path/</code>.  No scheme, hostname,
  @@ -1699,7 +1703,7 @@
       <code>scheme://servername/path</code>, and you must include the
       prefix.</p>
   
  -    <p>The URL may use wildcards In a wild-card string, <code>?</code> matches
  +    <p>The URL may use wildcards. In a wild-card string, <code>?</code> matches
       any single character, and <code>*</code> matches any sequences of
       characters.</p>
   
  @@ -1712,10 +1716,10 @@
       </example>
   
       <p>would match URLs that contained the substring <code>/extra/data</code>
  -    or <code>/special/data</code>. In Apache 1.3 and above, a new directive
  -    <directive type="section" module="core">LocationMatch</directive>
  -    exists which behaves identical to the regex version of
  -    <directive type="section">Location</directive>.</p>
  +    or <code>/special/data</code>. The directive <directive
  +    type="section" module="core">LocationMatch</directive> behaves
  +    identical to the regex version of <directive
  +    type="section">Location</directive>.</p>
   
       <p>The <directive type="section">Location</directive>
       functionality is especially useful when combined with the
  @@ -1756,10 +1760,9 @@
         request is to <code>/abc//def</code> then it will match.</p>
       </note>
   </usage>
  -<seealso><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</seealso>
  +<seealso><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</seealso>
   </directivesynopsis>
   
   <directivesynopsis type="section">
  @@ -1786,10 +1789,9 @@
       or <code>/special/data</code>.</p>
   </usage>
   
  -<seealso><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</seealso>
  +<seealso><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</seealso>
   </directivesynopsis>
   
   <directivesynopsis>
  @@ -1955,11 +1957,14 @@
       servicing the requests. If you have multiple name-based hosts on
       multiple addresses, repeat the directive for each address.</p>
   
  -    <p>Note: the "main server" and any <code>_default_</code> servers will
  -    <strong>never</strong> be served for a request to a
  -    <directive>NameVirtualHost</directive> IP Address (unless for some
  -    reason you specify <directive>NameVirtualHost</directive> but then
  -    don't define any <directive>VirtualHost</directive>s for that address).</p>
  +    <note><title>Note</title>
  +      <p>Note, that the "main server" and any <code>_default_</code> servers
  +      will <strong>never</strong> be served for a request to a
  +      <directive>NameVirtualHost</directive> IP Address (unless for some
  +      reason you specify <directive>NameVirtualHost</directive> but then
  +      don't define any <directive>VirtualHost</directive>s for that
  +      address).</p>
  +    </note>
   
       <p>Optionally you can specify a port number on which the
       name-based virtual hosts should be used, e.g.</p>
  @@ -1982,10 +1987,10 @@
         NameVirtualHost *
       </example>
   
  -    <note><title>Argument to <directive>&lt;VirtualHost&gt;</directive>
  +    <note><title>Argument to <directive  type="section">VirtualHost</directive>
         directive</title>
         <p>Note that the argument to the <directive
  -      >&lt;VirtualHost&gt;</directive> directive must
  +       type="section">VirtualHost</directive> directive must
         exactly match the argument to the <directive
         >NameVirtualHost</directive> directive.</p>
   
  @@ -2024,17 +2029,17 @@
       the following:</p>
   
       <dl>
  -      <dt>All</dt>
  +      <dt><code>All</code></dt>
   
         <dd>All options except for <code>MultiViews</code>. This is the default
         setting.</dd>
   
  -      <dt>ExecCGI</dt>
  +      <dt><code>ExecCGI</code></dt>
   
         <dd>
         Execution of CGI scripts is permitted.</dd>
   
  -      <dt>FollowSymLinks</dt>
  +      <dt><code>FollowSymLinks</code></dt>
   
         <dd>
   
  @@ -2048,12 +2053,12 @@
         section.</p>
         </note></dd>
   
  -      <dt>Includes</dt>
  +      <dt><code>Includes</code></dt>
   
         <dd>
         Server-side includes are permitted.</dd>
   
  -      <dt>IncludesNOEXEC</dt>
  +      <dt><code>IncludesNOEXEC</code></dt>
   
         <dd>
   
  @@ -2062,7 +2067,7 @@
         <code>#include virtual</code> CGI scripts from
         <directive>ScriptAlias</directive>e'd directories.</dd>
   
  -      <dt>Indexes</dt>
  +      <dt><code>Indexes</code></dt>
   
         <dd>
         If a URL which maps to a directory is requested, and the
  @@ -2070,13 +2075,13 @@
         <code>index.html</code>) in that directory, then the server will
         return a formatted listing of the directory.</dd>
   
  -      <dt>MultiViews</dt>
  +      <dt><code>MultiViews</code></dt>
   
         <dd>
         <a href="../content-negotiation.html">Content negotiated</a>
         "MultiViews" are allowed.</dd>
   
  -      <dt>SymLinksIfOwnerMatch</dt>
  +      <dt><code>SymLinksIfOwnerMatch</code></dt>
   
         <dd>
   
  @@ -2136,9 +2141,11 @@
       directory.</p>
   
   
  -    <p><strong>Note:</strong> Using <code>-IncludesNOEXEC</code> or
  -    <code>-Includes</code> disables server-side includes completely
  -    regardless of the previous setting.</p>
  +    <note><title>Note</title>
  +      <p>Using <code>-IncludesNOEXEC</code> or
  +      <code>-Includes</code> disables server-side includes completely
  +      regardless of the previous setting.</p>
  +    </note>
   
       <p>The default in the absence of any other settings is
       <code>All</code>.</p>
  @@ -2162,7 +2169,7 @@
         <li>
           Require user <var>userid</var> [<var>userid</var>] ...
   
  -        <p>Only the named users can access the directory.</p>
  +        <p>Only the named users can access the resource.</p>
         </li>
   
         <li>
  @@ -2170,13 +2177,13 @@
   
   
           <p>Only users in the named groups can access the
  -        directory.</p>
  +        resource.</p>
         </li>
   
         <li>
           Require valid-user
   
  -        <p>All valid users can access the directory.</p>
  +        <p>All valid users can access the resource.</p>
         </li>
       </ul>
   
  @@ -2301,12 +2308,14 @@
   
       <p>Process limits control the number of processes per user.</p>
   
  -    <p>Note: If CGI processes are <strong>not</strong> running
  -    under userids other than the web server userid, this directive
  -    will limit the number of processes that the server itself can
  -    create. Evidence of this situation will be indicated by
  -    <strong><code>cannot fork</code></strong> messages in the
  -    error_log.</p>
  +    <note><title>Note</title>
  +      <p>If CGI processes are <strong>not</strong> running
  +      under userids other than the web server userid, this directive
  +      will limit the number of processes that the server itself can
  +      create. Evidence of this situation will be indicated by
  +      <strong><code>cannot fork</code></strong> messages in the
  +      <code>error_log</code>.</p>
  +    </note>
   </usage>
   <seealso><directive module="core">RLimitMEM</directive></seealso>
   <seealso><directive module="core">RLimitCPU</directive></seealso>
  @@ -2541,7 +2550,7 @@
       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>
  -    setting, which is the default, suppresses the error line (and is
  +    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
       server version number and <directive
  @@ -2642,7 +2651,7 @@
       <p>Another example: if you wanted to have the server display a
       status report whenever a URL of
       <code>http://servername/status</code> was called, you might put
  -    the following into httpd.conf:</p>
  +    the following into <code>httpd.conf</code>:</p>
   
       <example>
         &lt;Location /status&gt;<br />
  @@ -2763,7 +2772,7 @@
   <usage>
       <p>In many situations Apache must construct a <em>self-referential</em>
       URL -- that is, a URL that refers back to the same server. With
  -    <code>UseCanonicalName on</code> Apache will use the hostname and port
  +    <code>UseCanonicalName On</code> Apache will use the hostname and port
       specified in the <directive module="core">ServerName</directive>
       directive to construct the canonical name for the server. This name
       is used in all self-referential URLs, and for the values of
  @@ -2801,7 +2810,7 @@
       reverse DNS lookup on the server IP address that the client
       connected to in order to work out self-referential URLs.</p>
   
  -    <note type="warning"><title>Warning:</title>
  +    <note type="warning"><title>Warning</title>
       <p>If CGIs make assumptions about the values of <code>SERVER_NAME</code>
       they may be broken by this option. The client is essentially free
       to give whatever value they want as a hostname. But if the CGI is
  @@ -2879,7 +2888,7 @@
       in the former case the server machine must be configured to
       accept IP packets for multiple addresses. (If the machine does
       not have multiple network interfaces, then this can be
  -    accomplished with the <code>ifconfig alias</code> command (if
  +    accomplished with the <code>ifconfig alias</code> command -- if
       your OS supports it).</p>
   
       <note><title>Note</title>
  @@ -2921,10 +2930,9 @@
       Apache</a></seealso>
   <seealso><a href="../bind.html">Setting
       which addresses and ports Apache uses</a></seealso>
  -<seealso><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</seealso>
  +<seealso><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</seealso>
   </directivesynopsis>
   
   </modulesynopsis>
  
  
  
  1.46.2.8  +97 -94    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.7
  retrieving revision 1.46.2.8
  diff -u -r1.46.2.7 -r1.46.2.8
  --- core.html.en	23 Dec 2002 00:03:52 -0000	1.46.2.7
  +++ core.html.en	8 Jan 2003 03:54:32 -0000	1.46.2.8
  @@ -168,7 +168,7 @@
   <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>
   </table>
  -    <p>When returning a document to the client the server looks for
  +    <p>While processing a request the server looks for
       the first existing configuration file from this list of names in
       every directory of the path to the document, if distributed
       configuration files are enabled for that directory. For
  @@ -271,7 +271,7 @@
       &lt;/Location&gt;
       </code></p></div>
   
  -    <div class="warning"><h3>Note:</h3>
  +    <div class="warning"><h3>Note</h3>
         <p>Enabling filters with <code class="directive">AddOutputFilterByType</code>
         may fail partially or completely in some cases. For expample, no
         filters are applied if the content type falls back to the <code class="directive"><a href="#defaulttype">DefaultType</a></code>, even if the <code class="directive"><a href="#defaulttype">DefaultType</a></code> is the same.</p>
  @@ -309,7 +309,7 @@
       it needs to know which directives declared in that file can override
       earlier access information.</p>
   
  -    <div class="note"><h3>Only available in Directory sections</h3>
  +    <div class="note"><h3>Only available in &lt;Directory&gt; sections</h3>
       <code class="directive">AllowOverride</code> is valid only in
       <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
       sections, not in <code class="directive"><a href="#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="#files">&lt;Files&gt;</a></code> sections.
  @@ -459,8 +459,8 @@
       <p>This directive is used to control how Apache finds the
       interpreter used to run CGI scripts. For example, setting
       <code>CGIMapExtension sys:\foo.nlm .foo</code> will
  -    cause all CGI script files with a .foo extension to be passed to the
  -    FOO interpreter.</p>
  +    cause all CGI script files with a <code>.foo</code> extension to
  +    be passed to the FOO interpreter.</p>
   
   </div>
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
  @@ -589,7 +589,7 @@
       <p>would match directories in <code>/www/</code> that consisted of
       three numbers.</p>
   
  -    <p>If multiple (non-regular expression) directory sections
  +    <p>If multiple (non-regular expression) <code class="directive">&lt;Directory&gt;</code> sections
       match the directory (or its parents) containing a document,
       then the directives are applied in the order of shortest match
       first, interspersed with the directives from the <a href="#accessfilename">.htaccess</a> files. For example,
  @@ -619,7 +619,7 @@
         <li>Apply directive <code>AllowOverride FileInfo</code> (for
         directory <code>/home/web</code>).</li>
   
  -      <li>Apply any FileInfo directives in
  +      <li>Apply any <code>FileInfo</code> directives in
         <code>/home/web/.htaccess</code></li>
       </ul>
   
  @@ -636,7 +636,7 @@
         &lt;/Directory&gt;
       </code></p></div>
   
  -    <p>The regular expression section won't be considered until after
  +    <p>the regular expression section won't be considered until after
       all normal <code>&lt;Directory&gt;</code>s and <code>.htaccess</code>
       files have been applied. Then the regular expression will match on
       <code>/home/abc/public_html/abc</code> and be applied.</p>
  @@ -666,8 +666,8 @@
   
   <h3>See also</h3>
   <ul>
  -<li><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  +<li><a href="../sections.html">How &lt;Directory&gt;,
  +    &lt;Location&gt; and &lt;Files&gt; sections work</a> for an
       explanation of how these different sections are combined when a
       request is received</li>
   </ul>
  @@ -701,10 +701,10 @@
   <ul>
   <li><code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> for
   a description of how regular expressions are mixed in with normal
  -<code>&lt;Directory&gt;</code>s</li>
  -<li><a href="../sections.html">How Directory, Location and Files sections
  -work</a> for an explanation of how these different sections are
  -combined when a request is received</li>
  +<code class="directive">&lt;Directory&gt;</code>s</li>
  +<li><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt; and
  +&lt;Files&gt; sections work</a> for an explanation of how these different
  +sections are combined when a request is received</li>
   </ul>
   </div>
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
  @@ -783,7 +783,9 @@
   
       <div class="example"><p><code>
         &lt;Directory "/path-to-nfs-files"&gt;
  -            EnableMMAP Off
  +      <span class="indent">
  +        EnableMMAP Off
  +      </span>
         &lt;/Directory&gt;
       </code></p></div>
   
  @@ -833,8 +835,10 @@
       for the offending files by specifying:</p>
   
       <div class="example"><p><code>
  -      &lt;Directory "/path-to-nfs-files"&gt;<br />
  -            EnableSendfile Off<br />
  +      &lt;Directory "/path-to-nfs-files"&gt;
  +      <span class="indent">
  +        EnableSendfile Off
  +      </span>
         &lt;/Directory&gt;
       </code></p></div>
   
  @@ -897,7 +901,7 @@
       URL in an <code>ErrorDocument 401</code>, the client will not
       know to prompt the user for a password since it will not
       receive the 401 status code. Therefore, <strong>if you use an
  -    "ErrorDocument 401" directive then it must refer to a local
  +    <code>ErrorDocument 401</code> directive then it must refer to a local
       document.</strong></p>
   
       <p>Microsoft Internet Explorer (MSIE) will by default ignore
  @@ -922,7 +926,7 @@
   <table class="directive">
   <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location where the server will log errors</td></tr>
   <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</code></td></tr>
  -<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ErrorLog logs/error_log (Unix)
  +<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ErrorLog logs/error_log (Unix)<br />
   ErrorLog logs/error.log (Windows and OS/2)</code></td></tr>
   <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>
  @@ -1056,8 +1060,8 @@
         &lt;Files ~ "\.(gif|jpe?g|png)$"&gt;
       </code></p></div>
   
  -    <p>would match most common Internet graphics formats. In Apache 1.3
  -    and later, <code class="directive"><a href="#filesmatch">&lt;FilesMatch&gt;</a></code> is preferred, however.</p>
  +    <p>would match most common Internet graphics formats. <code class="directive"><a href="#filesmatch">&lt;FilesMatch&gt;</a></code> is preferred,
  +    however.</p>
   
       <p>Note that unlike <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> and <code class="directive"><a href="#location">&lt;Location&gt;</a></code> sections, <code class="directive">&lt;Files&gt;</code> sections can be used inside
       <code>.htaccess</code> files. This allows users to control access to
  @@ -1066,10 +1070,9 @@
   
   <h3>See also</h3>
   <ul>
  -<li><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</li>
  +<li><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</li>
   </ul>
   </div>
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
  @@ -1095,10 +1098,9 @@
   
   <h3>See also</h3>
   <ul>
  -<li><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</li>
  +<li><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</li>
   </ul>
   </div>
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
  @@ -1164,7 +1166,7 @@
       <p>This directive enables DNS lookups so that host names can be
       logged (and passed to CGIs/SSIs in <code>REMOTE_HOST</code>).
       The value <code>Double</code> refers to doing double-reverse
  -    DNS. That is, after a reverse lookup is performed, a forward
  +    DNS lookup. That is, after a reverse lookup is performed, a forward
       lookup is then performed on that result. At least one of the ip
       addresses in the forward lookup must match the original
       address. (In "tcpwrappers" terminology this is called
  @@ -1186,9 +1188,9 @@
       don't have to suffer the extra latency that a lookup entails.
       Heavily loaded sites should leave this directive
       <code>Off</code>, since DNS lookups can take considerable
  -    amounts of time. The utility <a href="../programs/logresolve.html">logresolve</a>, provided in
  -    the <var>/support</var> directory, can be used to look up host
  -    names from logged IP addresses offline.</p>
  +    amounts of time. The utility <a href="../programs/logresolve.html">logresolve</a>, compiled by default
  +    to the <code>bin</code> subdirectory of your installation directory, can
  +    be used to look up host names from logged IP addresses offline.</p>
   
   </div>
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
  @@ -1395,8 +1397,8 @@
       which allow multiple requests to be sent over the same TCP
       connection. In some cases this has been shown to result in an
       almost 50% speedup in latency times for HTML documents with
  -    many images. To enable Keep-Alive connections in Apache 1.2 and
  -    later, set <code>KeepAlive On</code>.</p>
  +    many images. To enable Keep-Alive connections, set
  +    <code>KeepAlive On</code>.</p>
   
       <p>For HTTP/1.0 clients, Keep-Alive connections will only be
       used if they are specifically requested by a client. In
  @@ -1458,11 +1460,10 @@
       <p>The purpose of the <code class="directive">&lt;Limit&gt;</code>
       directive is to restrict the effect of the access controls to the
       nominated HTTP methods. For all other methods, the access
  -    restrictions that are enclosed in the <code>&lt;Limit&gt;</code>
  -    bracket <strong>will have no effect</strong>. The following
  -    example applies the access control only to the methods <code>POST</code>,
  -    <code>PUT</code>, and <code>DELETE</code>, leaving all other methods
  -    unprotected:</p>
  +    restrictions that are enclosed in the <code class="directive">&lt;Limit&gt;</code> bracket <strong>will have no
  +    effect</strong>. The following example applies the access control
  +    only to the methods <code>POST</code>, <code>PUT</code>, and
  +    <code>DELETE</code>, leaving all other methods unprotected:</p>
   
       <div class="example"><p><code>
         &lt;Limit POST PUT DELETE&gt;<br />
  @@ -1540,8 +1541,8 @@
       response instead of servicing the request. The size of a normal
       request message body will vary greatly depending on the nature of
       the resource and the methods allowed on that resource. CGI scripts
  -    typically use the message body for passing form information to the
  -    server. Implementations of the <code>PUT</code> method will require
  +    typically use the message body for retrieving form information.
  +    Implementations of the <code>PUT</code> method will require
       a value at least as large as any representation that the server
       wishes to accept for that resource.</p>
   
  @@ -1551,7 +1552,7 @@
       attacks.</p>
   
       <p>If, for example, you are permitting file upload to a particular
  -    location, and wich to limit the size of the uploaded file to 100K,
  +    location, and wish to limit the size of the uploaded file to 100K,
       you might use the following directive:</p>
   
       <div class="example"><p><code>
  @@ -1619,7 +1620,7 @@
       distributed) that will be allowed in an HTTP request
       header.</p>
   
  -    <p>The <code class="directive">LimitRequestFieldsize</code> directive
  +    <p>The <code class="directive">LimitRequestFieldSize</code> directive
       allows the server administrator to reduce the limit on the allowed
       size of an HTTP request header field below the normal input buffer
       size compiled with the server. A server needs this value to be
  @@ -1689,7 +1690,7 @@
   <div class="directive-section"><h2><a name="LimitXMLRequestBody" id="LimitXMLRequestBody">LimitXMLRequestBody</a> <a name="limitxmlrequestbody" id="limitxmlrequestbody">Directive</a></h2>
   <table class="directive">
   <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the size of an XML-based request body</td></tr>
  -<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitXMLRequestBody <var>number</var></code></td></tr>
  +<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitXMLRequestBody <var>bytes</var></code></td></tr>
   <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitXMLRequestBody 1000000</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>
  @@ -1727,8 +1728,8 @@
       <code>.htaccess</code> files are read, and after the <code class="directive"><a href="#files">&lt;Files&gt;</a></code> sections.</p>
   
       <p>Note that URLs do not have to line up with the filesystem at
  -    all, it should be emphasized that <code>&lt;Location&gt;</code> operates
  -    completely outside the filesystem.</p>
  +    all, it should be emphasized that <code class="directive">&lt;Location&gt;</code> operates completely
  +    outside the filesystem.</p>
   
       <p>For all origin (non-proxy) requests, the URL to be matched is a
       URL-path of the form <code>/path/</code>.  No scheme, hostname,
  @@ -1737,7 +1738,7 @@
       <code>scheme://servername/path</code>, and you must include the
       prefix.</p>
   
  -    <p>The URL may use wildcards In a wild-card string, <code>?</code> matches
  +    <p>The URL may use wildcards. In a wild-card string, <code>?</code> matches
       any single character, and <code>*</code> matches any sequences of
       characters.</p>
   
  @@ -1750,10 +1751,8 @@
       </code></p></div>
   
       <p>would match URLs that contained the substring <code>/extra/data</code>
  -    or <code>/special/data</code>. In Apache 1.3 and above, a new directive
  -    <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code>
  -    exists which behaves identical to the regex version of
  -    <code class="directive">&lt;Location&gt;</code>.</p>
  +    or <code>/special/data</code>. The directive <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code> behaves
  +    identical to the regex version of <code class="directive">&lt;Location&gt;</code>.</p>
   
       <p>The <code class="directive">&lt;Location&gt;</code>
       functionality is especially useful when combined with the
  @@ -1793,10 +1792,9 @@
   
   <h3>See also</h3>
   <ul>
  -<li><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</li>
  +<li><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</li>
   </ul>
   </div>
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
  @@ -1825,10 +1823,9 @@
   
   <h3>See also</h3>
   <ul>
  -<li><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</li>
  +<li><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</li>
   </ul>
   </div>
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
  @@ -1994,11 +1991,14 @@
       servicing the requests. If you have multiple name-based hosts on
       multiple addresses, repeat the directive for each address.</p>
   
  -    <p>Note: the "main server" and any <code>_default_</code> servers will
  -    <strong>never</strong> be served for a request to a
  -    <code class="directive">NameVirtualHost</code> IP Address (unless for some
  -    reason you specify <code class="directive">NameVirtualHost</code> but then
  -    don't define any <code class="directive">VirtualHost</code>s for that address).</p>
  +    <div class="note"><h3>Note</h3>
  +      <p>Note, that the "main server" and any <code>_default_</code> servers
  +      will <strong>never</strong> be served for a request to a
  +      <code class="directive">NameVirtualHost</code> IP Address (unless for some
  +      reason you specify <code class="directive">NameVirtualHost</code> but then
  +      don't define any <code class="directive">VirtualHost</code>s for that
  +      address).</p>
  +    </div>
   
       <p>Optionally you can specify a port number on which the
       name-based virtual hosts should be used, e.g.</p>
  @@ -2061,17 +2061,17 @@
       the following:</p>
   
       <dl>
  -      <dt>All</dt>
  +      <dt><code>All</code></dt>
   
         <dd>All options except for <code>MultiViews</code>. This is the default
         setting.</dd>
   
  -      <dt>ExecCGI</dt>
  +      <dt><code>ExecCGI</code></dt>
   
         <dd>
         Execution of CGI scripts is permitted.</dd>
   
  -      <dt>FollowSymLinks</dt>
  +      <dt><code>FollowSymLinks</code></dt>
   
         <dd>
   
  @@ -2084,12 +2084,12 @@
         section.</p>
         </div></dd>
   
  -      <dt>Includes</dt>
  +      <dt><code>Includes</code></dt>
   
         <dd>
         Server-side includes are permitted.</dd>
   
  -      <dt>IncludesNOEXEC</dt>
  +      <dt><code>IncludesNOEXEC</code></dt>
   
         <dd>
   
  @@ -2098,7 +2098,7 @@
         <code>#include virtual</code> CGI scripts from
         <code class="directive">ScriptAlias</code>e'd directories.</dd>
   
  -      <dt>Indexes</dt>
  +      <dt><code>Indexes</code></dt>
   
         <dd>
         If a URL which maps to a directory is requested, and the
  @@ -2106,13 +2106,13 @@
         <code>index.html</code>) in that directory, then the server will
         return a formatted listing of the directory.</dd>
   
  -      <dt>MultiViews</dt>
  +      <dt><code>MultiViews</code></dt>
   
         <dd>
         <a href="../content-negotiation.html">Content negotiated</a>
         "MultiViews" are allowed.</dd>
   
  -      <dt>SymLinksIfOwnerMatch</dt>
  +      <dt><code>SymLinksIfOwnerMatch</code></dt>
   
         <dd>
   
  @@ -2171,9 +2171,11 @@
       directory.</p>
   
   
  -    <p><strong>Note:</strong> Using <code>-IncludesNOEXEC</code> or
  -    <code>-Includes</code> disables server-side includes completely
  -    regardless of the previous setting.</p>
  +    <div class="note"><h3>Note</h3>
  +      <p>Using <code>-IncludesNOEXEC</code> or
  +      <code>-Includes</code> disables server-side includes completely
  +      regardless of the previous setting.</p>
  +    </div>
   
       <p>The default in the absence of any other settings is
       <code>All</code>.</p>
  @@ -2197,7 +2199,7 @@
         <li>
           Require user <var>userid</var> [<var>userid</var>] ...
   
  -        <p>Only the named users can access the directory.</p>
  +        <p>Only the named users can access the resource.</p>
         </li>
   
         <li>
  @@ -2205,13 +2207,13 @@
   
   
           <p>Only users in the named groups can access the
  -        directory.</p>
  +        resource.</p>
         </li>
   
         <li>
           Require valid-user
   
  -        <p>All valid users can access the directory.</p>
  +        <p>All valid users can access the resource.</p>
         </li>
       </ul>
   
  @@ -2344,12 +2346,14 @@
   
       <p>Process limits control the number of processes per user.</p>
   
  -    <p>Note: If CGI processes are <strong>not</strong> running
  -    under userids other than the web server userid, this directive
  -    will limit the number of processes that the server itself can
  -    create. Evidence of this situation will be indicated by
  -    <strong><code>cannot fork</code></strong> messages in the
  -    error_log.</p>
  +    <div class="note"><h3>Note</h3>
  +      <p>If CGI processes are <strong>not</strong> running
  +      under userids other than the web server userid, this directive
  +      will limit the number of processes that the server itself can
  +      create. Evidence of this situation will be indicated by
  +      <strong><code>cannot fork</code></strong> messages in the
  +      <code>error_log</code>.</p>
  +    </div>
   
   <h3>See also</h3>
   <ul>
  @@ -2598,7 +2602,7 @@
       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>
  -    setting, which is the default, suppresses the error line (and is
  +    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
       server version number and <code class="directive"><a href="#servername">ServerName</a></code> of the serving virtual host,
  @@ -2701,7 +2705,7 @@
       <p>Another example: if you wanted to have the server display a
       status report whenever a URL of
       <code>http://servername/status</code> was called, you might put
  -    the following into httpd.conf:</p>
  +    the following into <code>httpd.conf</code>:</p>
   
       <div class="example"><p><code>
         &lt;Location /status&gt;<br />
  @@ -2828,7 +2832,7 @@
   </table>
       <p>In many situations Apache must construct a <em>self-referential</em>
       URL -- that is, a URL that refers back to the same server. With
  -    <code>UseCanonicalName on</code> Apache will use the hostname and port
  +    <code>UseCanonicalName On</code> Apache will use the hostname and port
       specified in the <code class="directive"><a href="#servername">ServerName</a></code>
       directive to construct the canonical name for the server. This name
       is used in all self-referential URLs, and for the values of
  @@ -2864,7 +2868,7 @@
       reverse DNS lookup on the server IP address that the client
       connected to in order to work out self-referential URLs.</p>
   
  -    <div class="warning"><h3>Warning:</h3>
  +    <div class="warning"><h3>Warning</h3>
       <p>If CGIs make assumptions about the values of <code>SERVER_NAME</code>
       they may be broken by this option. The client is essentially free
       to give whatever value they want as a hostname. But if the CGI is
  @@ -2946,7 +2950,7 @@
       in the former case the server machine must be configured to
       accept IP packets for multiple addresses. (If the machine does
       not have multiple network interfaces, then this can be
  -    accomplished with the <code>ifconfig alias</code> command (if
  +    accomplished with the <code>ifconfig alias</code> command -- if
       your OS supports it).</p>
   
       <div class="note"><h3>Note</h3>
  @@ -2989,10 +2993,9 @@
       Apache</a></li>
   <li><a href="../bind.html">Setting
       which addresses and ports Apache uses</a></li>
  -<li><a href="../sections.html">How
  -    Directory, Location and Files sections work</a> for an
  -    explanation of how these different sections are combined when a
  -    request is received</li>
  +<li><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
  +    and &lt;Files&gt; sections work</a> for an explanation of how these
  +    different sections are combined when a request is received</li>
   </ul>
   </div>
   </div>