httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikab...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod core.xml core.html.en
Date Sat, 17 Aug 2002 23:52:12 GMT
erikabele    2002/08/17 16:52:12

  Modified:    docs/manual/mod core.xml core.html.en
  Log:
  Correct/add some syntax, context, default and override issues in core.xml
  
  Submitted by: Andre Malo <nd@perlig.de>
  
  Revision  Changes    Path
  1.23      +21 -11    httpd-2.0/docs/manual/mod/core.xml
  
  Index: core.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- core.xml	17 Aug 2002 17:04:03 -0000	1.22
  +++ core.xml	17 Aug 2002 23:52:12 -0000	1.23
  @@ -16,6 +16,7 @@
   <contextlist><context>server config</context>
   <context>virtual host</context><context>directory</context>
   <context>.htaccess</context></contextlist>
  +<override>FileInfo</override>
   <compatibility>Available in Apache 2.0.30 and later</compatibility>
   
   <usage>
  @@ -733,6 +734,7 @@
   <description>File attributes used to create the ETag
   HTTP response header</description>
   <syntax>FileETag <em>component</em> ...</syntax>
  +<default>FileETag INode MTime Size</default>
   <contextlist><context>server config</context><context>virtual host</context>
   <context>directory</context><context>.htaccess</context>
   </contextlist>
  @@ -1130,7 +1132,8 @@
   <description>Enables HTTP persistent connections</description>
   <syntax>KeepAlive on|off</syntax>
   <default>KeepAlive On</default>
  -<contextlist><context>server config</context></contextlist>
  +<contextlist><context>server config</context><context>virtual host</context>
  +</contextlist>
   
   <usage>
       <p>The Keep-Alive extension to HTTP/1.0 and the persistent
  @@ -1163,7 +1166,8 @@
   requests on a persistent connection</description>
   <syntax>KeepAliveTimeout <em>seconds</em></syntax>
   <default>KeepAliveTimeout 15</default>
  -<contextlist><context>server config</context></contextlist>
  +<contextlist><context>server config</context><context>virtual host</context>
  +</contextlist>
   
   <usage>
       <p>The number of seconds Apache will wait for a subsequent
  @@ -1424,7 +1428,9 @@
   <description>Limits the size of an XML-based request body</description>
   <syntax>LimitXMLRequestBody <em>number</em></syntax>
   <default>LimitXMLRequestBody 1000000</default>
  -<contextlist><context>server config</context></contextlist>
  +<contextlist><context>server config</context><context>virtual host</context>
  +<context>directory</context><context>.htaccess</context></contextlist>
  +<override>All</override>
   
   <usage>
       <p>Limit (in bytes) on maximum size of an XML-based request
  @@ -1672,7 +1678,8 @@
   connection</description>
   <syntax>MaxKeepAliveRequests <em>number</em></syntax>
   <default>MaxKeepAliveRequests 100</default>
  -<contextlist><context>server config</context></contextlist>
  +<contextlist><context>server config</context><context>virtual host</context>
  +</contextlist>
   
   <usage>
       <p>The <directive>MaxKeepAliveRequests</directive> directive
  @@ -1949,7 +1956,8 @@
   <syntax>RLimitCPU <em>number</em>|max [<em>number</em>|max]</syntax>
   <default>Unset; uses operating system defaults</default>
   <contextlist><context>server config</context><context>virtual host</context>
  -</contextlist>
  +<context>directory</context><context>.htaccess</context></contextlist>
  +<override>All</override>
   
   <usage>
       <p>Takes 1 or 2 parameters. The first parameter sets the soft
  @@ -1981,7 +1989,8 @@
   <syntax>RLimitMEM <em>number</em>|max [<em>number</em>|max]</syntax>
   <default>Unset; uses operating system defaults</default>
   <contextlist><context>server config</context><context>virtual host</context>
  -</contextlist>
  +<context>directory</context><context>.htaccess</context></contextlist>
  +<override>All</override>
   
   <usage>
       <p>Takes 1 or 2 parameters. The first parameter sets the soft
  @@ -2013,7 +2022,8 @@
   <syntax>RLimitNPROC <em>number</em>|max [<em>number</em>|max]</syntax>
   <default>Unset; uses operating system defaults</default>
   <contextlist><context>server config</context><context>virtual host</context>
  -</contextlist>
  +<context>directory</context><context>.htaccess</context></contextlist>
  +<override>All</override>
   
   <usage>
       <p>Takes 1 or 2 parameters. The first parameter sets the soft
  @@ -2091,8 +2101,8 @@
   scripts</description>
   <syntax>ScriptInterpreterSource registry|script</syntax>
   <default>ScriptInterpreterSource script</default>
  -<contextlist><context>directory</context><context>.htaccess</context>
  -</contextlist>
  +<contextlist><context>server config</context><context>virtual host</context>
  +<context>directory</context><context>.htaccess</context></contextlist>
   <override>FileInfo</override>
   <compatibility>Win32 only</compatibility>
   
  @@ -2207,7 +2217,7 @@
   <name>ServerPath</name>
   <description>Legacy URL pathname for a name-virtual host that
   is accessed by an incompatible browser</description>
  -<syntax>ServerPath <em>directory-path</em></syntax>
  +<syntax>ServerPath <em>URL-path</em></syntax>
   <contextlist><context>virtual host</context></contextlist>
   
   <usage>
  @@ -2386,7 +2396,7 @@
   <name>SetOutputFilter</name>
   <description>Sets the filters that will process responses from the
   server</description>
  -<syntax>SetOutputFilter <em>filter</em> [<em>filter</em>]
...</syntax>
  +<syntax>SetOutputFilter <em>filter</em>[<em>;filter</em>...]</syntax>
   <contextlist><context>server config</context><context>virtual host</context>
   <context>directory</context><context>.htaccess</context>
   </contextlist>
  
  
  
  1.19      +18 -12    httpd-2.0/docs/manual/mod/core.html.en
  
  Index: core.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.html.en,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- core.html.en	17 Aug 2002 17:04:03 -0000	1.18
  +++ core.html.en	17 Aug 2002 23:52:12 -0000	1.19
  @@ -9,7 +9,8 @@
                     </strong></td><td>Resources accept trailing pathname
information</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
                     </a></td><td>AcceptPathInfo On|Off|Default</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>AcceptPathInfo Default</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
  -                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status"
class="help">Status:
  +                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
  +                    </a></td><td>FileInfo</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr><tr><td
nowrap="nowrap" align="left" valign="top"><a href="directive-dict.html#Compatibility"
class="help">Compatibility:
                       </a></td><td>Available in Apache 2.0.30 and later</td></tr></table></td></tr></table>
  @@ -592,7 +593,8 @@
   <p><strong>See also </strong></p><ul><li><a href="#loglevel"
class="directive"><code class="directive">LogLevel</code></a></li><li><a
href="../logs.html">Apache Log Files</a></li></ul><hr><h2><a
name="FileETag">FileETag</a> <a name="fileetag">Directive</a></h2><table
cellpadding="1" cellspacing="0" border="0" bgcolor="#cccccc"><tr><td><table
bgcolor="#ffffff"><tr><td nowrap="nowrap"><strong>Description: 
                     </strong></td><td>File attributes used to create the
ETag
   HTTP response header</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
  -                  </a></td><td>FileETag <em>component</em>
...</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context"
class="help">Context:
  +                  </a></td><td>FileETag <em>component</em>
...</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Default"
class="help">Default: 
  +                    </a></td><td><code>FileETag INode MTime Size</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
                     </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
                       </a></td><td>FileInfo</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
  @@ -922,7 +924,7 @@
                     </strong></td><td>Enables HTTP persistent connections</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Syntax" class="help">Syntax:
                     </a></td><td>KeepAlive on|off</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>KeepAlive On</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
  -                  </a></td><td>server config</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>server config, virtual host</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr></table></td></tr></table>
       <p>The Keep-Alive extension to HTTP/1.0 and the persistent
  @@ -949,7 +951,7 @@
   requests on a persistent connection</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Syntax" class="help">Syntax:
                     </a></td><td>KeepAliveTimeout <em>seconds</em></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>KeepAliveTimeout 15</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
  -                  </a></td><td>server config</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>server config, virtual host</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr></table></td></tr></table>
       <p>The number of seconds Apache will wait for a subsequent
  @@ -1174,7 +1176,8 @@
                     </strong></td><td>Limits the size of an XML-based request
body</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
                     </a></td><td>LimitXMLRequestBody <em>number</em></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>LimitXMLRequestBody 1000000</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
  -                  </a></td><td>server config</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
  +                    </a></td><td>All</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr></table></td></tr></table>
       <p>Limit (in bytes) on maximum size of an XML-based request
  @@ -1392,7 +1395,7 @@
   connection</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
                     </a></td><td>MaxKeepAliveRequests <em>number</em></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>MaxKeepAliveRequests 100</code></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
  -                  </a></td><td>server config</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>server config, virtual host</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr></table></td></tr></table>
       <p>The <code class="directive">MaxKeepAliveRequests</code> directive
  @@ -1640,7 +1643,8 @@
   by Apache children</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
                     </a></td><td>RLimitCPU <em>number</em>|max
[<em>number</em>|max]</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>Unset; uses operating system
defaults</code></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context"
class="help">Context:
  -                  </a></td><td>server config, virtual host</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
  +                    </a></td><td>All</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr></table></td></tr></table>
       <p>Takes 1 or 2 parameters. The first parameter sets the soft
  @@ -1665,7 +1669,8 @@
   by Apache children</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
                     </a></td><td>RLimitMEM <em>number</em>|max
[<em>number</em>|max]</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>Unset; uses operating system
defaults</code></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context"
class="help">Context:
  -                  </a></td><td>server config, virtual host</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
  +                    </a></td><td>All</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr></table></td></tr></table>
       <p>Takes 1 or 2 parameters. The first parameter sets the soft
  @@ -1690,7 +1695,8 @@
   processes launched by Apache children</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Syntax" class="help">Syntax:
                     </a></td><td>RLimitNPROC <em>number</em>|max
[<em>number</em>|max]</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>Unset; uses operating system
defaults</code></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context"
class="help">Context:
  -                  </a></td><td>server config, virtual host</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
  +                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
  +                    </a></td><td>All</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr></table></td></tr></table>
       <p>Takes 1 or 2 parameters. The first parameter sets the soft
  @@ -1753,7 +1759,7 @@
   scripts</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
                     </a></td><td>ScriptInterpreterSource registry|script</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                       </a></td><td><code>ScriptInterpreterSource
script</code></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context"
class="help">Context:
  -                  </a></td><td>directory, .htaccess</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Override" class="help">Override:
  +                  </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
                       </a></td><td>FileInfo</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr><tr><td
nowrap="nowrap" align="left" valign="top"><a href="directive-dict.html#Compatibility"
class="help">Compatibility:
  @@ -1841,7 +1847,7 @@
       documentation</a></li><li><a href="#usecanonicalname" class="directive"><code
class="directive">UseCanonicalName</code></a></li><li><a href="#namevirtualhost"
class="directive"><code class="directive">NameVirtualHost</code></a></li><li><a
href="#serveralias" class="directive"><code class="directive">ServerAlias</code></a></li></ul><hr><h2><a
name="ServerPath">ServerPath</a> <a name="serverpath">Directive</a></h2><table
cellpadding="1" cellspacing="0" border="0" bgcolor="#cccccc"><tr><td><table
bgcolor="#ffffff"><tr><td nowrap="nowrap"><strong>Description: 
                     </strong></td><td>Legacy URL pathname for a name-virtual
host that
   is accessed by an incompatible browser</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Syntax" class="help">Syntax:
  -                  </a></td><td>ServerPath <em>directory-path</em></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
  +                  </a></td><td>ServerPath <em>URL-path</em></td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
                     </a></td><td>virtual host</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                     </a></td><td>core</td></tr></table></td></tr></table>
  @@ -1978,7 +1984,7 @@
   <p><strong>See also </strong></p><ul><li><a href="../filter.html">Filters</a>
documentation</li></ul><hr><h2><a name="SetOutputFilter">SetOutputFilter</a>
<a name="setoutputfilter">Directive</a></h2><table cellpadding="1" cellspacing="0"
border="0" bgcolor="#cccccc"><tr><td><table bgcolor="#ffffff"><tr><td
nowrap="nowrap"><strong>Description: 
                     </strong></td><td>Sets the filters that will process
responses from the
   server</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax"
class="help">Syntax:
  -                  </a></td><td>SetOutputFilter <em>filter</em>
[<em>filter</em>] ...</td></tr><tr><td nowrap="nowrap"><a
href="directive-dict.html#Context" class="help">Context:
  +                  </a></td><td>SetOutputFilter <em>filter</em>[<em>;filter</em>...]</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
                     </a></td><td>server config, virtual host, directory,
.htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override"
class="help">Override:
                       </a></td><td>FileInfo</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                     </a></td><td>Core</td></tr><tr><td
nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
  
  
  

Mime
View raw message