- <em> -> <var> (hey, that was easy :))

- add some <module>s
- add <seealso>s to suexec.html
- add explicit <seealso> from mod_cgid to mod_cgi
- add short description of the ScriptSock directive
-> update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97436 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_cgi.html.en b/docs/manual/mod/mod_cgi.html.en
index 904ce40438bf0d5cc19a36bfc34c02a18cef5e43..aefdfb113b66436c301f3e6157eece7e915ed5a7 100644 (file)
--- a/docs/manual/mod/mod_cgi.html.en
+++ b/docs/manual/mod/mod_cgi.html.en
@@ -38,7 +38,7 @@
 </div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#scriptlog">ScriptLog</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#scriptlogbuffer">ScriptLogBuffer</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#scriptloglength">ScriptLogLength</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#env">CGI Environment variables</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi-debug">CGI Debugging</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI Specification</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="env" id="env">CGI Environment variables</a></h2>
+</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#env">CGI Environment variables</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi-debug">CGI Debugging</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><a href="../suexec.html">Running CGI programs under different user IDs</a></li><li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI Specification</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="env" id="env">CGI Environment variables</a></h2>
     <p>The server will set the CGI environment variables as described
     in the <a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI
     specification</a>, with the following provisions:</p>

diff --git a/docs/manual/mod/mod_cgi.xml b/docs/manual/mod/mod_cgi.xml
index be3729421199ab64d1bd2a688e3d16b0958874ae..6c1f5b2e568cd71c77f71ba553490c781d6d2372 100644 (file)
--- a/docs/manual/mod/mod_cgi.xml
+++ b/docs/manual/mod/mod_cgi.xml
@@ -44,6 +44,7 @@
 <seealso><directive module="core">Options</directive></seealso>
 <seealso><directive module="mod_alias">ScriptAlias</directive></seealso>
 <seealso><directive module="mod_mime">AddHandler</directive></seealso>
+<seealso><a href="../suexec.html">Running CGI programs under different user IDs</a></seealso>
 <seealso><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI Specification</a></seealso>
 
 <section id="env"><title>CGI Environment variables</title>

diff --git a/docs/manual/mod/mod_cgid.html.en b/docs/manual/mod/mod_cgid.html.en
index bd8b2c9e0b2e7df8b78ee7973d8e8bea0ff1228a..fe45372e36df08b4aac6bfa6f608d3b4f0706f17 100644 (file)
--- a/docs/manual/mod/mod_cgid.html.en
+++ b/docs/manual/mod/mod_cgid.html.en
@@ -12,15 +12,15 @@
                   </a></th><td>mod_cgid.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
                   </a></th><td>Unix threaded MPMs only</td></tr></table><h3>Summary</h3>
     <p>Except for the optimizations and the additional <code class="directive"><a href="#scriptsock">ScriptSock</a></code> directive noted below,
-    mod_cgid behaves similarly to mod_cgi.  <strong>See the
-    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> Summary for additional details about
-    Apache and CGI.</strong></p>
+    <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> behaves similarly to <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>.
+    <strong>See the <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> summary for additional details
+    about Apache and CGI.</strong></p>
 
     <p>On certain unix operating systems, forking a process from a
     multi-threaded server is a very expensive operation because the
     new process will replicate all the threads of the parent
     process. In order to avoid incurring this expense on each CGI
-    invocation, mod_cgid creates an external daemon that is
+    invocation, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> creates an external daemon that is
     responsible for forking child processes to run CGI scripts. The
     main server communicates with this daemon using a unix domain
     socket.</p>
@@ -37,9 +37,10 @@
 <li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptloglength">ScriptLogLength</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#scriptsock">ScriptSock</a></li>
-</ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ScriptSock" id="ScriptSock">ScriptSock</a> <a name="scriptsock" id="scriptsock">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
-              </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
-              </a></th><td><code>ScriptSock <em>file-path</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default: 
+</ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><a href="../suexec.html">Running CGI programs under different user IDs</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ScriptSock" id="ScriptSock">ScriptSock</a> <a name="scriptsock" id="scriptsock">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
+              </a></th><td>The name of the socket to use for communication with
+the cgi daemon</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
+              </a></th><td><code>ScriptSock <var>file-path</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default: 
               </a></th><td><code>ScriptSock logs/cgisock</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
               </a></th><td>server config, virtual host</td></tr><tr><th><a href="directive-dict.html#Status">Status:
               </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">Module:
@@ -52,7 +53,7 @@
     write in the directory where the socket is located.</p>
 
     <div class="example"><h3>Example</h3><p><code>
-    ScriptSock /var/run/cgid.sock
+      ScriptSock /var/run/cgid.sock
     </code></p></div>
 
 </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file

diff --git a/docs/manual/mod/mod_cgid.xml b/docs/manual/mod/mod_cgid.xml
index 23f3e5d10c78345654620a4845e01826ccb60d16..fbfa1e101966a3cdea892137355ae13b84adbe75 100644 (file)
--- a/docs/manual/mod/mod_cgid.xml
+++ b/docs/manual/mod/mod_cgid.xml
@@ -14,15 +14,15 @@
 <summary>
     <p>Except for the optimizations and the additional <directive
     module="mod_cgid">ScriptSock</directive> directive noted below,
-    mod_cgid behaves similarly to mod_cgi.  <strong>See the
-    <module>mod_cgi</module> Summary for additional details about
-    Apache and CGI.</strong></p>
+    <module>mod_cgid</module> behaves similarly to <module>mod_cgi</module>.
+    <strong>See the <module>mod_cgi</module> summary for additional details
+    about Apache and CGI.</strong></p>
 
     <p>On certain unix operating systems, forking a process from a
     multi-threaded server is a very expensive operation because the
     new process will replicate all the threads of the parent
     process. In order to avoid incurring this expense on each CGI
-    invocation, mod_cgid creates an external daemon that is
+    invocation, <module>mod_cgid</module> creates an external daemon that is
     responsible for forking child processes to run CGI scripts. The
     main server communicates with this daemon using a unix domain
     socket.</p>
@@ -37,6 +37,9 @@
     daemon.</p>
 </summary>
 
+<seealso><module>mod_cgi</module></seealso>
+<seealso><a href="../suexec.html">Running CGI programs under different user IDs</a></seealso>
+
 <directivesynopsis location="mod_cgi">
 <name>ScriptLog</name>
 </directivesynopsis>
@@ -51,7 +54,9 @@
 
 <directivesynopsis>
 <name>ScriptSock</name>
-<syntax>ScriptSock <em>file-path</em></syntax>
+<description>The name of the socket to use for communication with
+the cgi daemon</description>
+<syntax>ScriptSock <var>file-path</var></syntax>
 <default>ScriptSock logs/cgisock</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
@@ -65,7 +70,7 @@
     write in the directory where the socket is located.</p>
 
     <example><title>Example</title>
-    ScriptSock /var/run/cgid.sock
+      ScriptSock /var/run/cgid.sock
     </example>
 
 </usage>

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 85edc49849efb5245e8eba692b69c594091b6891..7fbd33f3b8e8f358375aa7822451488b8bf52af1 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -499,7 +499,8 @@ scripts</td></tr>
 <tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
 in the scriptlog</td></tr>
 <tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
-<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <em>file-path</em></a></td><td> logs/cgisock </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">-</td></tr>
+<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">The name of the socket to use for communication with
+the cgi daemon</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP buffer size</td></tr>
 <tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Email address that the server includes in error
 messages sent to the client</td></tr>