httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r1433863 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/ docs/manual/mod/ docs/manual/mod/mod_so.html.en docs/manual/mod/mod_so.xml docs/manual/mod/quickreference.html.en
Date Wed, 16 Jan 2013 09:10:14 GMT
Author: jerenkrantz
Date: Wed Jan 16 09:10:14 2013
New Revision: 1433863

URL: http://svn.apache.org/viewvc?rev=1433863&view=rev
Log:
Merge r1433861 from trunk (w/updated quickreference.html.en transforms).

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1433861

Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual:r1433861

Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual/mod:r1433861

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.html.en?rev=1433863&r1=1433862&r2=1433863&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.html.en Wed Jan 16 09:10:14 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/branches/2.4.x/docs/manual/mod/mod_so.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.xml?rev=1433863&r1=1433862&r2=1433863&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_so.xml Wed Jan 16 09:10:14 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/branches/2.4.x/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en?rev=1433863&r1=1433862&r2=1433863&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en Wed Jan 16 09:10:14
2013
@@ -541,8 +541,8 @@ from the client</td></tr>
 <tr><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><td
class="descr" colspan="4">IP addresses and ports that the server
 listens to</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#listenbacklog">ListenBacklog
<var>backlog</var></a></td><td></td><td>s</td><td>M</td></tr><tr
class="odd"><td class="descr" colspan="4">Maximum length of the queue of pending
connections</td></tr>
-<tr><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><td
class="descr" colspan="4">Link in the named object file or library</td></tr>
-<tr class="odd"><td><a href="mod_so.html#loadmodule">LoadModule <em>module
filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr
class="odd"><td class="descr" colspan="4">Links in the object file or library, and
adds to the list
+<tr><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><td
class="descr" colspan="4">Link in the named object file or library</td></tr>
+<tr class="odd"><td><a href="mod_so.html#loadmodule">LoadModule <em>module
filename</em></a></td><td></td><td>sv</td><td>E</td></tr><tr
class="odd"><td class="descr" colspan="4">Links in the object file or library, and
adds to the list
 of active modules</td></tr>
 <tr><td><a href="core.html#location">&lt;Location
     <var>URL-path</var>|<var>URL</var>&gt; ... &lt;/Location&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr><td
class="descr" colspan="4">Applies the enclosed directives only to matching



Mime
View raw message