From: Joe Orton Date: Wed, 22 Nov 2006 11:36:32 +0000 (+0000) Subject: * docs/manual/mod/mpm_common.xml: s/depreciated/deprecated/ X-Git-Tag: 2.3.0~2013 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcc098b3419fc40ddce91cc03912687f7f060019;p=thirdparty%2Fapache%2Fhttpd.git * docs/manual/mod/mpm_common.xml: s/depreciated/deprecated/ * server/core.c: Likewise. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@478131 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index 90e2d4e562c..08774d506c1 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -61,14 +61,14 @@ accepting requests on network sockets file defined by the optional /path/to/lockfile parameter. One can also use the LockFile directive to specify the lockfile, - although this is depreciated. + although this is deprecated.
fcntl<:/path/to/lockfile>
uses the fcntl(2) system call to lock the file defined by the optional /path/to/lockfile parameter. One can also use the LockFile directive to specify the lockfile, - although this is depreciated.
+ although this is deprecated.
file<:/path/to/lockfile>
This directive tells Apache to pick the "best" file locking @@ -404,7 +404,7 @@ The protocol argument was added in 2.1.5 LockFile -Location of the accept serialization lock file (depreciated) +Location of the accept serialization lock file (deprecated) LockFile filename LockFile logs/accept.lock server config @@ -430,8 +430,8 @@ The protocol argument was added in 2.1.5 creating a lockfile with the same name as the one the server will try to create.

- Depreciated -

This directive is depreciated. It is strongly suggested that + Deprecated +

This directive is deprecated. It is strongly suggested that you use AcceptMutex to specify both the mutex locking implementation as well as the lockfile location.

diff --git a/server/core.c b/server/core.c index 5f7d3241cd7..918aa0abf5e 100644 --- a/server/core.c +++ b/server/core.c @@ -3323,7 +3323,7 @@ AP_INIT_TAKE1("ScoreBoardFile", ap_mpm_set_scoreboard, NULL, RSRC_CONF, #endif #ifdef AP_MPM_WANT_SET_LOCKFILE AP_INIT_TAKE1("LockFile", ap_mpm_set_lockfile, NULL, RSRC_CONF, - "The lockfile used when Apache needs to lock the accept() call (depreciated)"), + "The lockfile used when Apache needs to lock the accept() call (deprecated)"), #endif #ifdef AP_MPM_WANT_SET_MAX_REQUESTS AP_INIT_TAKE1("MaxRequestsPerChild", ap_mpm_set_max_requests, NULL, RSRC_CONF,