From 0e25e07a90a2cc09107e1e91c02ffeb2f9e51a5e Mon Sep 17 00:00:00 2001
From: Jeff Trawick <trawick@apache.org>
Date: Sun, 5 Aug 2012 14:35:48 +0000
Subject: [PATCH] merge r1364709 from trunk:

doc fixes for r1299718:

The value of ScriptSock is relative to DefaultRuntimeDir.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1369607 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/conf/httpd.conf.in      | 2 +-
 docs/manual/mod/mod_cgid.xml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index 83dd6b89a7..3e01d4fd77 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -255,7 +255,7 @@ LogLevel warn
     # ScriptSock: On threaded servers, designate the path to the UNIX
     # socket used to communicate with the CGI daemon of mod_cgid.
     #
-    #Scriptsock @rel_runtimedir@/cgisock
+    #Scriptsock cgisock
 </IfModule>
 
 #
diff --git a/docs/manual/mod/mod_cgid.xml b/docs/manual/mod/mod_cgid.xml
index 75c5be58f3..d49bcc2a72 100644
--- a/docs/manual/mod/mod_cgid.xml
+++ b/docs/manual/mod/mod_cgid.xml
@@ -77,7 +77,7 @@
 <description>The filename prefix of the socket to use for communication with
 the cgi daemon</description>
 <syntax>ScriptSock <var>file-path</var></syntax>
-<default>ScriptSock logs/cgisock</default>
+<default>ScriptSock cgisock</default>
 <contextlist><context>server config</context></contextlist>
 
 <usage>
@@ -89,6 +89,10 @@ the cgi daemon</description>
     scripts, it is important that no other user has permission to
     write in the directory where the socket is located.</p>
 
+    <p>If <var>file-path</var> is not an absolute path, the location specified
+    will be relative to the value of 
+    <directive module="core">DefaultRuntimeDir</directive>.</p>
+
     <example><title>Example</title>
     <highlight language="config">
       ScriptSock /var/run/cgid.sock
-- 
2.50.1