From: Rich Bowen Date: Mon, 22 Mar 2010 23:43:11 +0000 (+0000) Subject: 'Apache' -> 'Apache HTTP Server' and 'Apache httpd' X-Git-Tag: 2.3.6~313 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dfdb795d9c509bdc6d541eaeea290a9a984df80;p=apache 'Apache' -> 'Apache HTTP Server' and 'Apache httpd' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@926402 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index 917840e8e9..f02e4be616 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -58,7 +58,7 @@ more than one multi-processing module (MPM)
top

CoreDumpDirectory Directive

- @@ -66,7 +66,7 @@ switch before dumping core
Description:Directory where Apache attempts to +
Description:Directory where Apache HTTP Server attempts to switch before dumping core
Syntax:CoreDumpDirectory directory
Default:See usage for the default setting
Status:MPM
Module:mpm_winnt, prefork, worker
-

This controls the directory to which Apache attempts to +

This controls the directory to which Apache httpd attempts to switch before dumping core. If your operating system is configured to create core files in the working directory of the crashing process, CoreDumpDirectory is necessary to change working @@ -79,9 +79,9 @@ switch before dumping core of the crashing processes.

Core Dumps on Linux

-

If Apache starts as root and switches to another user, the +

If Apache httpd starts as root and switches to another user, the Linux kernel disables core dumps even if the directory is - writable for the process. Apache (2.0.46 and later) reenables core dumps + writable for the process. Apache httpd (2.0.46 and later) reenables core dumps on Linux 2.4 and beyond, but only if you explicitly configure a CoreDumpDirectory.

@@ -148,15 +148,15 @@ listens to Context:server config Status:MPM Module:mpm_netware, mpm_winnt, mpmt_os2, prefork, worker, event -Compatibility:Required directive since Apache 2.0
+Compatibility:Required directive since Apache HTTP Server 2.0
The protocol argument was added in 2.1.5 -

The Listen directive instructs Apache to +

The Listen directive instructs Apache httpd to listen to only specific IP addresses or ports; by default it responds to requests on all IP interfaces. Listen is now a required directive. If it is not in the config file, the server will fail to start. This is a change from previous versions - of Apache.

+ of Apache httpd.

The Listen directive tells the server to accept incoming requests on the specified port or address-and-port @@ -216,7 +216,7 @@ The protocol argument was added in 2.1.5

See also

diff --git a/docs/manual/mod/mpm_netware.xml b/docs/manual/mod/mpm_netware.xml index 1685c008e5..11e4a94f17 100644 --- a/docs/manual/mod/mpm_netware.xml +++ b/docs/manual/mod/mpm_netware.xml @@ -35,7 +35,7 @@

The main thread is responsible for launching child worker threads which listen for connections and serve them when they - arrive. Apache always tries to maintain several spare + arrive. Apache HTTP Server always tries to maintain several spare or idle worker threads, which stand ready to serve incoming requests. In this way, clients do not need to wait for a new child threads to be spawned before their requests can be @@ -46,7 +46,7 @@ MaxSpareThreads, and MaxThreads regulate how the main thread creates worker threads to serve - requests. In general, Apache is very self-regulating, so most + requests. In general, Apache httpd is very self-regulating, so most sites do not need to adjust these directives from their default values. Sites with limited memory may need to decrease MaxThreads to keep the server from @@ -62,7 +62,7 @@ threads to continue servicing requests indefinitely.

Setting which addresses and - ports Apache uses + ports Apache httpd uses Listen diff --git a/docs/manual/mod/prefork.xml.de b/docs/manual/mod/prefork.xml.de index 0c8e425c43..0883e92586 100644 --- a/docs/manual/mod/prefork.xml.de +++ b/docs/manual/mod/prefork.xml.de @@ -1,7 +1,7 @@ - + + +