Commit 831a4045 authored by Ken Coar's avatar Ken Coar
Browse files

Some typos and other cleanup from Martin the doc-walloper.

	(.htaccess changes reverted to generic htaccess after some
	discussion.)

Submitted by:	Martin Kraemer <Martin.Kraemer@mch.sni.de>
Reviewed by:	Paul Sutton, Marc Slemko, Ken Coar


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@78963 13f79535-47bb-0310-9956-ffa450edef68
parent 6bb29d09
Loading
Loading
Loading
Loading
+12 −12
Changes for docs/manual/mod/core.html: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ please avoid that.
<h2><A name="errordocument">ErrorDocument directive</A></h2>
<!--%plaintext &lt;?INDEX {\tt ErrorDocument} directive&gt; -->
<strong>Syntax:</strong> ErrorDocument <em>error-code document</em><br>
<strong>Context</strong> server config, virtual host, directory, .htaccess<br>
<strong>Context:</strong> server config, virtual host, directory, .htaccess<br>
<strong>Status:</strong> core<br>
<strong>Override:</strong> FileInfo<br>
<strong>Compatibility:</strong> The directory and .htaccess contexts
@@ -527,7 +527,7 @@ than the user that starts the server.
<h2><A name="files">&lt;Files&gt; directive</A></h2>
<strong>Syntax:</strong> &lt;Files <em>filename</em>&gt;
... &lt;/Files&gt;<br>
<strong>Context:</strong> server config, virtual host, htaccess<br>
<strong>Context:</strong> server config, virtual host, .htaccess<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> only available in Apache
1.2 and above.<p>
@@ -554,7 +554,7 @@ the <code>~</code> character. For example:</p>
</pre>

would match most common Internet graphics formats. In Apache 1.3 and
later, <a href="#filesmatch">&lt;FilesMatch&gt;</a> is perferred,
later, <a href="#filesmatch">&lt;FilesMatch&gt;</a> is preferred,
however.

<p>Note that unlike <a
@@ -571,7 +571,7 @@ the directory being applied will be prefixed automatically.
<h2><A name="filesmatch">&lt;FilesMatch&gt;</A></h2>
<strong>Syntax:</strong> &lt;FilesMatch <em>regex</em>&gt;
... &lt;/Files&gt;<br>
<strong>Context:</strong> server config, virtual host, htaccess<br>
<strong>Context:</strong> server config, virtual host, .htaccess<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> only available in Apache
1.3 and above.<p>
@@ -745,7 +745,7 @@ server resources. Set this to <code>0</code> to disable support.

<p><strong>Apache 1.2 and later</strong>: Set to "On" to enable
persistent connections, "Off" to disable. See also the <a
href="#maxkeepaliverequests">MaxKeepAliveRequests</a> directive.</p>
href="#maxkeepaliverequests">MaxKeepAliveRequests</a> directive.</p><hr>

<h2><a name="keepalivetimeout">KeepAliveTimeout directive</a></h2>
<strong>Syntax:</strong> KeepAliveTimeout <em>seconds</em><br>
@@ -794,7 +794,7 @@ versions after 1.2.0.<p>
The maximum length of the queue of pending connections.  Generally no
tuning is needed or desired, however on some systems it is desirable
to increase this when under a TCP SYN flood attack.  See
the backlog parameter to the <code>listen(2)</code> system call.
the backlog parameter to the <code>listen(2)</code> system call.</p><hr>

<h2><A name="limit">&lt;Limit&gt; directive</A></h2>
<!--%plaintext &lt;?INDEX {\tt Limit} section directive&gt; -->
@@ -854,7 +854,7 @@ the

<p>would match URLs that contained the substring "/extra/data" or
"/special/data". However, in Apache 1.3 and above, use of <a
href="#locationmatch">&lt;LocationMatch&gt;</a> is perferred.</p>
href="#locationmatch">&lt;LocationMatch&gt;</a> is preferred.</p>

<p>The <code>Location</code> functionality is especially useful when
combined with the <code><a
@@ -933,7 +933,7 @@ processes will be created.<p><hr>
allowed per connection when <a href="#keepalive">KeepAlive</a> is
on. If it is set to "<code>0</code>", unlimited requests will be
allowed. We recommend that this setting be kept to a high value for
maximum server performance.
maximum server performance.</p><hr>

<h2><A name="maxrequestsperchild">MaxRequestsPerChild directive</A></h2>
<!--%plaintext &lt;?INDEX {\tt MaxRequestsPerChild} directive&gt; -->
@@ -1215,7 +1215,7 @@ See also <A HREF="#accessconfig">AccessConfig</A>.<p><hr>
<H2><A name="rlimit">RLimitCPU</A> <A NAME="rlimitcpu">directive</A></H2>
<!--%plaintext &lt;?INDEX {\tt RLimitCPU} directive&gt; -->
<strong>Syntax:</strong> RLimitCPU <em># or 'max'</em> <em>[# or 'max']</em><br>
<strong>Default:</strong> <code>Unset uses operating system defaults</code><br>
<strong>Default:</strong> <e>Unset; uses operating system defaults</e><br>
<strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> RLimitCPU is only available in Apache 1.2 and later<p>
@@ -1234,7 +1234,7 @@ See also <A HREF="#rlimitmem">RLimitMEM</A> or <A HREF="#rlimitnproc">RLimitNPRO
<h2><A name="rlimitmem">RLimitMEM directive</A></h2>
<!--%plaintext &lt;?INDEX {\tt RLimitMEM} directive&gt; -->
<strong>Syntax:</strong> RLimitMEM <em># or 'max'</em> <em>[# or 'max']</em><br>
<strong>Default:</strong> <code>Unset uses operating system defaults</code><br>
<strong>Default:</strong> <e>Unset; uses operating system defaults</e><br>
<strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> RLimitMEM is only available in Apache 1.2 and later<p>
@@ -1253,7 +1253,7 @@ See also <A HREF="#rlimitcpu">RLimitCPU</A> or <A HREF="#rlimitnproc">RLimitNPRO
<h2><A name="rlimitnproc">RLimitNPROC directive</A></h2>
<!--%plaintext &lt;?INDEX {\tt RLimitNPROC} directive&gt; -->
<strong>Syntax:</strong> RLimitNPROC <em># or 'max'</em> <em>[# or 'max']</em><br>
<strong>Default:</strong> <code>Unset uses operating system defaults</code><br>
<strong>Default:</strong> <e>Unset; uses operating system defaults</e><br>
<strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> core<br>
<strong>Compatibility:</strong> RLimitNPROC is only available in Apache 1.2 and later<p>
@@ -1589,7 +1589,7 @@ TransferLog logs/host.foo.com-access_log <br>
&lt;/VirtualHost&gt;
</code></blockquote>

Each VirtualHost must correspond to a different IP address or a
Each VirtualHost must correspond to a different IP address, different port number or a
different host name for the server, in the latter case the server
machine must be configured to accept IP packets for multiple
addresses. (If the machine does not have multiple network interfaces,