From 7af19191be844b4c9c758b337bd7982fedcad4f1 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 14 Aug 2012 21:20:40 +0000 Subject: [PATCH] update xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373119 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.html.en | 10 ++++++---- docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.fr | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.tr | 2 +- docs/manual/mod/mod_ldap.html.en | 11 +++++++---- docs/manual/mod/mod_ldap.xml.fr | 2 +- docs/manual/mod/mod_socache_dbm.html.en | 3 +++ docs/manual/mod/mod_socache_shmcb.html.en | 3 +++ docs/manual/mod/mpm_common.html.en | 10 +++++++--- docs/manual/mod/mpm_common.xml.de | 2 +- docs/manual/mod/mpm_common.xml.ja | 2 +- docs/manual/mod/mpm_common.xml.tr | 2 +- docs/manual/mod/quickreference.html.de | 2 +- docs/manual/mod/quickreference.html.en | 6 +++--- docs/manual/mod/quickreference.html.es | 6 +++--- docs/manual/mod/quickreference.html.ja.utf8 | 2 +- docs/manual/mod/quickreference.html.ko.euc-kr | 6 +++--- docs/manual/mod/quickreference.html.tr.utf8 | 2 +- docs/manual/mod/quickreference.html.zh-cn | 6 +++--- 21 files changed, 50 insertions(+), 35 deletions(-) diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index a87273fc61..41baae1c64 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -462,7 +462,7 @@ NoDecode option available in 2.3.12 and later. SetOutputFilter, and mod_mime Add* and Remove* directives), document meta data (Header, RequestHeader, SetEnvIf, SetEnvIfNoCase, BrowserMatch, CookieExpires, CookieDomain, CookieStyle, CookieTracking, CookieName), - mod_rewrite directives RewriteEngine, RewriteOptions, RewriteBase, RewriteCond, RewriteRule) and + mod_rewrite directives (RewriteEngine, RewriteOptions, RewriteBase, RewriteCond, RewriteRule) and Action from mod_actions. @@ -3220,9 +3220,11 @@ or specified mutexes

With the file-based mechanisms fcntl and flock, the path, if provided, is a directory where the lock file will be created. - The default directory is httpd's run-time file directory relative to - ServerRoot. Always use a local disk - filesystem for /path/to/mutex and never a directory residing + The default directory is httpd's run-time file directory, + DefaultRuntimeDir. If a relative + path is provided, it is relative to + DefaultRuntimeDir. Always use a local + disk filesystem for /path/to/mutex and never a directory residing on a NFS- or AFS-filesystem. The basename of the file will be the mutex type, an optional instance string provided by the module, and unless the OmitPID keyword is specified, the process id of the httpd diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 0aa9d9eba9..2080b85a4c 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index d9e65eca43..a152f91588 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_socache_dbm.html.en b/docs/manual/mod/mod_socache_dbm.html.en index baac279c4d..134ef4cabb 100644 --- a/docs/manual/mod/mod_socache_dbm.html.en +++ b/docs/manual/mod/mod_socache_dbm.html.en @@ -41,6 +41,9 @@ dbm:/path/to/datafile

+

If the path is not absolute then it is assumed to be relative to + the DefaultRuntimeDir.

+

Details of other shared object cache providers can be found here.

diff --git a/docs/manual/mod/mod_socache_shmcb.html.en b/docs/manual/mod/mod_socache_shmcb.html.en index ae2676e335..95600e9fa5 100644 --- a/docs/manual/mod/mod_socache_shmcb.html.en +++ b/docs/manual/mod/mod_socache_shmcb.html.en @@ -41,6 +41,9 @@ shmcb:/path/to/datafile(512000)

+

If the path is not absolute then it is assumed to be relative to + the DefaultRuntimeDir.

+

Details of other shared object cache providers can be found here.

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index 4fd6d0c1ce..685b629827 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -430,7 +430,7 @@ spikes Description:File where the server records the process ID of the daemon Syntax:PidFile filename -Default:PidFile logs/httpd.pid +Default:PidFile httpd.pid Context:server config Status:MPM Module:event, mpm_winnt, mpmt_os2, prefork, worker @@ -438,7 +438,7 @@ of the daemon

The PidFile directive sets the file to which the server records the process id of the daemon. If the filename is not absolute then it is assumed to be relative to the - ServerRoot.

+ DefaultRuntimeDir.

Example

       PidFile /var/run/apache.pid
@@ -483,7 +483,7 @@ of the daemon
 Description:Location of the file used to store coordination data for
 the child processes
 Syntax:ScoreBoardFile file-path
-Default:ScoreBoardFile logs/apache_runtime_status
+Default:ScoreBoardFile apache_runtime_status
 Context:server config
 Status:MPM
 Module:event, mpm_winnt, prefork, worker
@@ -496,6 +496,10 @@ the child processes
     disk (using file-based shared memory). Specifying this directive causes
     Apache httpd to always create the file on the disk.

 
+    
If file-path is not an absolute path, the location specified
+    will be relative to the value of 
+    DefaultRuntimeDir.

+
     
Example
       ScoreBoardFile /var/run/apache_runtime_status
       

diff --git a/docs/manual/mod/mpm_common.xml.de b/docs/manual/mod/mpm_common.xml.de
index e91aff9e6c..a8a471c206 100644
--- a/docs/manual/mod/mpm_common.xml.de
+++ b/docs/manual/mod/mpm_common.xml.de
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
+
 
 
+