You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2013/01/16 10:03:17 UTC
svn commit: r1433861 - in /httpd/httpd/trunk/docs/manual/mod: mod_so.html.en
mod_so.xml quickreference.html.en
Author: jerenkrantz
Date: Wed Jan 16 09:03:17 2013
New Revision: 1433861
URL: http://svn.apache.org/viewvc?rev=1433861&view=rev
Log:
Make documentation reflect reality of what the code does - in that LoadModule
and LoadFile can be declared inside a vhost configuration.
minfrin vetoed restricting LoadModule to server context as we do in 1.3.
See Message-ID: <DE...@sharp.fm>
* docs/manual/mod/mod_so.xml: Denote virtual host context.
* docs/manual/mod/mod_so.html.en, docs/manual/quickreference.html.en: Update
transformations.
Modified:
httpd/httpd/trunk/docs/manual/mod/mod_so.html.en
httpd/httpd/trunk/docs/manual/mod/mod_so.xml
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
Modified: httpd/httpd/trunk/docs/manual/mod/mod_so.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_so.html.en?rev=1433861&r1=1433860&r2=1433861&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_so.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_so.html.en Wed Jan 16 09:03:17 2013
@@ -146,7 +146,7 @@ Windows</td></tr></table>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Link in the named object file or library</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</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>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_so</td></tr>
</table>
@@ -170,7 +170,7 @@ Windows</td></tr></table>
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Links in the object file or library, and adds to the list
of active modules</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</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>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_so</td></tr>
</table>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_so.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_so.xml?rev=1433861&r1=1433860&r2=1433861&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_so.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_so.xml Wed Jan 16 09:03:17 2013
@@ -132,6 +132,7 @@ Windows</compatibility>
<syntax>LoadFile <em>filename</em> [<em>filename</em>] ...</syntax>
<contextlist>
<context>server config</context>
+<context>virtual host</context>
</contextlist>
<usage>
@@ -156,6 +157,7 @@ of active modules</description>
<syntax>LoadModule <em>module filename</em></syntax>
<contextlist>
<context>server config</context>
+<context>virtual host</context>
</contextlist>
<usage>
Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/quickreference.html.en?rev=1433861&r1=1433860&r2=1433861&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.en Wed Jan 16 09:03:17 2013
@@ -566,8 +566,8 @@ from the client</td></tr>
<tr class="odd"><td><a href="mpm_common.html#listen">Listen [<var>IP-address</var>:]<var>portnumber</var> [<var>protocol</var>]</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">IP addresses and ports that the server
listens to</td></tr>
<tr><td><a href="mpm_common.html#listenbacklog">ListenBacklog <var>backlog</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum length of the queue of pending connections</td></tr>
-<tr class="odd"><td><a href="mod_so.html#loadfile">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Link in the named object file or library</td></tr>
-<tr><td><a href="mod_so.html#loadmodule">LoadModule <em>module filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Links in the object file or library, and adds to the list
+<tr class="odd"><td><a href="mod_so.html#loadfile">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Link in the named object file or library</td></tr>
+<tr><td><a href="mod_so.html#loadmodule">LoadModule <em>module filename</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Links in the object file or library, and adds to the list
of active modules</td></tr>
<tr class="odd"><td><a href="core.html#location"><Location
<var>URL-path</var>|<var>URL</var>> ... </Location></a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Applies the enclosed directives only to matching