summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Slive <slive@apache.org>2000-11-04 02:37:21 +0000
committerJoshua Slive <slive@apache.org>2000-11-04 02:37:21 +0000
commite54e1b6712ce78c4697127d8ba949e6eab9bfa0d (patch)
treefd880d27522c6af03f2b2680ec222f7989777e25
parent231c702237d4241dc588c95fcded506fd18a6513 (diff)
downloadhttpd-e54e1b6712ce78c4697127d8ba949e6eab9bfa0d.tar.gz
Minor content and spelling fixes to two recently added docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86831 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/configuring.html14
-rw-r--r--docs/manual/configuring.html.en14
-rw-r--r--docs/manual/server-wide.html10
-rw-r--r--docs/manual/server-wide.html.en10
4 files changed, 24 insertions, 24 deletions
diff --git a/docs/manual/configuring.html b/docs/manual/configuring.html
index 26302c3df7..88d65eaae6 100644
--- a/docs/manual/configuring.html
+++ b/docs/manual/configuring.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<HTML>
<HEAD>
-<TITLE>Configuring Apache</TITLE>
+<TITLE>Configuration Files</TITLE>
</HEAD>
<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
@@ -13,7 +13,7 @@
ALINK="#FF0000"
>
<!--#include virtual="header.html" -->
-<H1 ALIGN="CENTER">Configuring Apache</H1>
+<H1 ALIGN="CENTER">Configuration Files</H1>
<ul>
<li><a href="#main">Main Configuration Files</a></li>
@@ -68,8 +68,7 @@ filename is set by the <A HREF="mod/mod_mime.html#typesconfig"
back-slash "\" may be used as the last character on a line to indicate
that the directive continues onto the next line. There must be no
other characters or white space between the back-slash and the end of
-the line. To end a line with a literal back-slash, you can escape it
-by preceding it with a second back-slash "\\".
+the line.
<P>Directives in the configuration files are case-insensitive, but
arguments to directives are often case sensitive. Lines which begin
@@ -102,7 +101,7 @@ or the <CODE>-t</CODE> command line option.
functionality is included in the core server. Extended features are
available through <A HREF="mod/index-bytype.html">modules</A> which
can be loaded into Apache. By default, a <A
-HREF="mod/directive-dict.html#Status">base</A> set of modules is
+HREF="mod/module-dict.html#Status">base</A> set of modules is
included in the server at compile-time. If the server is compiled to
use <A HREF="dso.html">dynamically loaded</A> modules, then modules
can be compiled separately and added at any time using the <A
@@ -180,9 +179,8 @@ in the <A HREF="mod/core.html#accessfilename"><CODE
<CODE>.htaccess</CODE> files apply to the directory where you place
the file, and all sub-directories. The <CODE>.htaccess</CODE> files
follow the same syntax as the main configuration files. Since
-<CODE>.htaccess</CODE> files are read on every request, rather than
-only at server startup, changes made in these files take immediate
-effect.
+<CODE>.htaccess</CODE> files are read on every request, changes made
+in these files take immediate effect.
<P>To find which directives can be placed in <CODE>.htaccess</CODE>
files, check the <A HREF="mod/directive-dict.html#Context">Context</A>
diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index 26302c3df7..88d65eaae6 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<HTML>
<HEAD>
-<TITLE>Configuring Apache</TITLE>
+<TITLE>Configuration Files</TITLE>
</HEAD>
<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
@@ -13,7 +13,7 @@
ALINK="#FF0000"
>
<!--#include virtual="header.html" -->
-<H1 ALIGN="CENTER">Configuring Apache</H1>
+<H1 ALIGN="CENTER">Configuration Files</H1>
<ul>
<li><a href="#main">Main Configuration Files</a></li>
@@ -68,8 +68,7 @@ filename is set by the <A HREF="mod/mod_mime.html#typesconfig"
back-slash "\" may be used as the last character on a line to indicate
that the directive continues onto the next line. There must be no
other characters or white space between the back-slash and the end of
-the line. To end a line with a literal back-slash, you can escape it
-by preceding it with a second back-slash "\\".
+the line.
<P>Directives in the configuration files are case-insensitive, but
arguments to directives are often case sensitive. Lines which begin
@@ -102,7 +101,7 @@ or the <CODE>-t</CODE> command line option.
functionality is included in the core server. Extended features are
available through <A HREF="mod/index-bytype.html">modules</A> which
can be loaded into Apache. By default, a <A
-HREF="mod/directive-dict.html#Status">base</A> set of modules is
+HREF="mod/module-dict.html#Status">base</A> set of modules is
included in the server at compile-time. If the server is compiled to
use <A HREF="dso.html">dynamically loaded</A> modules, then modules
can be compiled separately and added at any time using the <A
@@ -180,9 +179,8 @@ in the <A HREF="mod/core.html#accessfilename"><CODE
<CODE>.htaccess</CODE> files apply to the directory where you place
the file, and all sub-directories. The <CODE>.htaccess</CODE> files
follow the same syntax as the main configuration files. Since
-<CODE>.htaccess</CODE> files are read on every request, rather than
-only at server startup, changes made in these files take immediate
-effect.
+<CODE>.htaccess</CODE> files are read on every request, changes made
+in these files take immediate effect.
<P>To find which directives can be placed in <CODE>.htaccess</CODE>
files, check the <A HREF="mod/directive-dict.html#Context">Context</A>
diff --git a/docs/manual/server-wide.html b/docs/manual/server-wide.html
index 4636e49ab0..0adc2ab440 100644
--- a/docs/manual/server-wide.html
+++ b/docs/manual/server-wide.html
@@ -15,7 +15,7 @@
<!--#include virtual="header.html" -->
<h1 align="center">Server-Wide Configuration</h1>
-<p>This document explains some of the directives provided by
+<p>This document explains some of the directives provided by the
<a href="mod/core.html">core</A> server which are used to configure
the basic operations of the server.</p>
@@ -118,7 +118,9 @@ these directives from their default values. Sites which need to serve
more than 256 simultaneous requests may need to increase
<code>MaxClients</code>, while sites with limited memory may need to
decrease <code>MaxClients</code> to keep the server from thrashing
-(swapping memory to disk and back).</p>
+(swapping memory to disk and back). More information about tuning
+process creation is provided in the <a
+href="misc/perf-tuning.html">performance hints</a> documentation.</p>
<p>While the parent process is usually started as root under Unix
in order to bind to port 80, the child processes are launched
@@ -197,7 +199,7 @@ configure how Apache handles persistent connections.</p>
<a href="mod/core.html#threadstacksize">ThreadStackSize</a><br>
</td></tr></table>
-<p>The <code>Limit</code>* directives are used to place limits
+<p>The <code>LimitRequest</code>* directives are used to place limits
on the amount of resources Apache will use in reading requests
from clients. By limiting these values, some kinds of denial
of service attacks can be mitigated.</p>
@@ -208,7 +210,7 @@ the Apache children. In particular, this will control
resources used by CGI scripts and SSI exec commands.</p>
<p>The <code>ThreadStackSize</code> directive is used only
-on Netware to control the stock size.</p>
+on Netware to control the stack size.</p>
<!--#include virtual="footer.html" -->
</BODY>
diff --git a/docs/manual/server-wide.html.en b/docs/manual/server-wide.html.en
index 4636e49ab0..0adc2ab440 100644
--- a/docs/manual/server-wide.html.en
+++ b/docs/manual/server-wide.html.en
@@ -15,7 +15,7 @@
<!--#include virtual="header.html" -->
<h1 align="center">Server-Wide Configuration</h1>
-<p>This document explains some of the directives provided by
+<p>This document explains some of the directives provided by the
<a href="mod/core.html">core</A> server which are used to configure
the basic operations of the server.</p>
@@ -118,7 +118,9 @@ these directives from their default values. Sites which need to serve
more than 256 simultaneous requests may need to increase
<code>MaxClients</code>, while sites with limited memory may need to
decrease <code>MaxClients</code> to keep the server from thrashing
-(swapping memory to disk and back).</p>
+(swapping memory to disk and back). More information about tuning
+process creation is provided in the <a
+href="misc/perf-tuning.html">performance hints</a> documentation.</p>
<p>While the parent process is usually started as root under Unix
in order to bind to port 80, the child processes are launched
@@ -197,7 +199,7 @@ configure how Apache handles persistent connections.</p>
<a href="mod/core.html#threadstacksize">ThreadStackSize</a><br>
</td></tr></table>
-<p>The <code>Limit</code>* directives are used to place limits
+<p>The <code>LimitRequest</code>* directives are used to place limits
on the amount of resources Apache will use in reading requests
from clients. By limiting these values, some kinds of denial
of service attacks can be mitigated.</p>
@@ -208,7 +210,7 @@ the Apache children. In particular, this will control
resources used by CGI scripts and SSI exec commands.</p>
<p>The <code>ThreadStackSize</code> directive is used only
-on Netware to control the stock size.</p>
+on Netware to control the stack size.</p>
<!--#include virtual="footer.html" -->
</BODY>