summaryrefslogtreecommitdiffstats
path: root/docs/manual/server-wide.xml
diff options
context:
space:
mode:
authorRich Bowen <rbowen@apache.org>2010-03-12 13:21:49 +0100
committerRich Bowen <rbowen@apache.org>2010-03-12 13:21:49 +0100
commita12b88d9919e17c34a5818a590c3701533214a51 (patch)
tree6a6cae13acb96a06eb4e57350b04584f77984a80 /docs/manual/server-wide.xml
parentA temporary solution to an outdated link. Would be nice to have this (diff)
downloadapache2-a12b88d9919e17c34a5818a590c3701533214a51.tar.xz
apache2-a12b88d9919e17c34a5818a590c3701533214a51.zip
Correct usage of 'Apache' vs 'httpd' and 'Apache HTTP Server'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@922232 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/server-wide.xml')
-rw-r--r--docs/manual/server-wide.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/manual/server-wide.xml b/docs/manual/server-wide.xml
index 161bb41871..b22f9b3c04 100644
--- a/docs/manual/server-wide.xml
+++ b/docs/manual/server-wide.xml
@@ -57,7 +57,7 @@ the basic operations of the server.</p>
directives are used by the server to determine how to construct
self-referential URLs. For example, when a client requests a
directory, but does not include the trailing slash in the
- directory name, Apache must redirect the client to the full
+ directory name, httpd must redirect the client to the full
name including the trailing slash so that the client will
correctly resolve relative references in the document.</p>
</section>
@@ -78,7 +78,7 @@ the basic operations of the server.</p>
</related>
<p>These directives control the locations of the various files
- that Apache needs for proper operation. When the pathname used
+ that httpd needs for proper operation. When the pathname used
does not begin with a slash (/), the files are located relative
to the <directive module="core">ServerRoot</directive>. Be careful
about locating files in paths which are writable by non-root users.
@@ -104,13 +104,13 @@ the basic operations of the server.</p>
<p>The <directive>LimitRequest</directive>*
directives are used to place limits on the amount of resources
- Apache will use in reading requests from clients. By limiting
+ httpd will use in reading requests from clients. By limiting
these values, some kinds of denial of service attacks can be
mitigated.</p>
<p>The <directive>RLimit</directive>* directives
are used to limit the amount of resources which can be used by
- processes forked off from the Apache children. In particular,
+ processes forked off from the httpd children. In particular,
this will control resources used by CGI scripts and SSI exec
commands.</p>