Commit 21b46dbf authored by Mike Rumph's avatar Mike Rumph
Browse files

Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688767 13f79535-47bb-0310-9956-ffa450edef68
parent f12e0c88
Loading
Loading
Loading
Loading
+48 −46
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ available</td></tr>
       sends it to the server. See the
       <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_http&amp;sektion=9">
       accf_http(9)</a> man page for more details.  Since HTTPS requests are
       encrypted only the <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_data&amp;sektion=9">
       encrypted, only the <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_data&amp;sektion=9">
       accf_data(9)</a> filter is used.</p>

    <p>The default values on Linux are:</p>
@@ -245,7 +245,7 @@ available</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
</table>
    <p>While processing a request the server looks for
    <p>While processing a request, the server looks for
    the first existing configuration file from this list of names in
    every directory of the path to the document, if distributed
    configuration files are <a href="#allowoverride">enabled for that
@@ -255,11 +255,11 @@ available</td></tr>
      AccessFileName .acl
    </code></p></div>

    <p>before returning the document
    <p>Before returning the document
    <code>/usr/local/web/index.html</code>, the server will read
    <code>/.acl</code>, <code>/usr/.acl</code>,
    <code>/usr/local/.acl</code> and <code>/usr/local/web/.acl</code>
    for directives, unless they have been disabled with</p>
    for directives unless they have been disabled with:</p>

    <div class="example"><p><code>
      &lt;Directory /&gt;<br />
@@ -406,7 +406,7 @@ NoDecode option available in 2.2.18 and later.</td></tr>
</table>
    <p>The <code class="directive">AllowEncodedSlashes</code> directive allows URLs
    which contain encoded path separators (<code>%2F</code> for <code>/</code>
    and additionally <code>%5C</code> for <code>\</code> on according systems)
    and additionally <code>%5C</code> for <code>\</code> on accordant systems)
    to be used in the path info.</p>

    <p>With the default value, <code>Off</code>, such URLs are refused
@@ -445,7 +445,7 @@ NoDecode option available in 2.2.18 and later.</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
</table>
    <p>When the server finds an <code>.htaccess</code> file (as
    specified by <code class="directive"><a href="#accessfilename">AccessFileName</a></code>)
    specified by <code class="directive"><a href="#accessfilename">AccessFileName</a></code>),
    it needs to know which directives declared in that file can override
    earlier configuration directives.</p>

@@ -514,8 +514,8 @@ NoDecode option available in 2.2.18 and later.</td></tr>
      Allow use of the directives controlling specific directory
      features (<code class="directive"><a href="#options">Options</a></code> and
      <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>).
      An equal sign may be given followed by a comma (but no spaces)
      separated lists of options that may be set using the <code class="directive"><a href="#options">Options</a></code> command.
      An equal sign may be given followed by a comma-separated list,
      without spaces, of options that may be set using the <code class="directive"><a href="#options">Options</a></code> command.

      <div class="note"><h3>Implicit disabling of Options</h3>
      <p>Even though the list of options that may be used in .htaccess files
@@ -533,7 +533,7 @@ NoDecode option available in 2.2.18 and later.</td></tr>
      AllowOverride AuthConfig Indexes
    </code></p></div>

    <p>In the example above all directives that are neither in the group
    <p>In the example above, all directives that are neither in the group
    <code>AuthConfig</code> nor <code>Indexes</code> cause an internal
    server error.</p>

@@ -1120,7 +1120,7 @@ in case of an error</td></tr>
    URL in an <code>ErrorDocument 401</code>, the client will not
    know to prompt the user for a password since it will not
    receive the 401 status code. Therefore, <strong>if you use an
    <code>ErrorDocument 401</code> directive then it must refer to a local
    <code>ErrorDocument 401</code> directive, then it must refer to a local
    document.</strong></p>

    <p>Microsoft Internet Explorer (MSIE) will by default ignore
@@ -1271,7 +1271,7 @@ HTTP response header for static files</td></tr>
    changed via <code class="directive">FileETag</code>.
    </div>
    <div class="note"><h3>Server Side Includes</h3>
    An ETag is not generated for responses parsed by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>,
    An ETag is not generated for responses parsed by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
    since the response entity can change without a change of the INode, MTime, or Size
    of the static file with embedded SSI directives.
    </div>
@@ -1676,7 +1676,7 @@ the server configuration files</td></tr>
    encoding will be used in order to send content of unknown
    length over persistent connections.</p>

    <p>When a client uses a Keep-Alive connection it will be counted
    <p>When a client uses a Keep-Alive connection, it will be counted
    as a single "request" for the MaxRequestsPerChild directive, regardless
    of how many requests are sent using the connection.</p>

@@ -1751,7 +1751,7 @@ methods</td></tr>
    <code>PATCH</code>, <code>PROPFIND</code>, <code>PROPPATCH</code>,
    <code>MKCOL</code>, <code>COPY</code>, <code>MOVE</code>,
    <code>LOCK</code>, and <code>UNLOCK</code>. <strong>The method name is
    case-sensitive.</strong> If <code>GET</code> is used it will also
    case-sensitive.</strong> If <code>GET</code> is used, it will also
    restrict <code>HEAD</code> requests. The <code>TRACE</code> method
    cannot be limited.</p>

@@ -1819,8 +1819,8 @@ subrequests</td></tr>

    <p>The directive stores two different limits, which are evaluated on
    per-request basis. The first <var>number</var> is the maximum number of
    internal redirects, that may follow each other. The second <var>number</var>
    determines, how deep subrequests may be nested. If you specify only one
    internal redirects that may follow each other. The second <var>number</var>
    determines how deeply subrequests may be nested. If you specify only one
    <var>number</var>, it will be assigned to both limits.</p>

    <div class="example"><h3>Example</h3><p><code>
@@ -1863,7 +1863,7 @@ from the client</td></tr>
    attacks.</p>

    <p>If, for example, you are permitting file upload to a particular
    location, and wish to limit the size of the uploaded file to 100K,
    location and wish to limit the size of the uploaded file to 100K,
    you might use the following directive:</p>

    <div class="example"><p><code>
@@ -2121,7 +2121,7 @@ URLs</td></tr>
    <p>The <code class="directive">&lt;Location&gt;</code>
    functionality is especially useful when combined with the
    <code class="directive"><a href="#sethandler">SetHandler</a></code>
    directive. For example, to enable status requests, but allow them
    directive. For example, to enable status requests but allow them
    only from browsers at <code>example.com</code>, you might use:</p>

    <div class="example"><p><code>
@@ -2301,7 +2301,7 @@ matching URLs</td></tr>
    </code></p></div>

    <div class="note"><h3>Note</h3>
      <p>When logging to a regular file messages of the level
      <p>When logging to a regular file, messages of the level
      <code>notice</code> cannot be suppressed and thus are always
      logged. However, this doesn't apply when logging is done
      using <code>syslog</code>.</p>
@@ -2370,19 +2370,19 @@ resource </td></tr>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="MergeTrailers" id="MergeTrailers">MergeTrailers</a> <a name="mergetrailers" id="mergetrailers">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determins whether trailers are merged into headers</td></tr>
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines whether trailers are merged into headers</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MergeTrailers [on|off]</code></td></tr>
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MergeTrailers off</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>Core</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.2.29 and later</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.2.28 and later</td></tr>
</table>
    <p>This directive controls whether HTTP trailers are copied into the
    internal representation of HTTP headers. This mergeing occurs when the
    internal representation of HTTP headers. This merging occurs when the
    request body has been completely consumed, long after most header
    processing would have a chance to examine or modify request headers.</p>
    <p>This option is provided for compatibility with releases prior to 2.4.10,
    <p>This option is provided for compatibility with releases prior to 2.2.28,
    where trailers were always merged.</p>

</div>
@@ -2536,7 +2536,7 @@ directory</td></tr>
      <dt><code>Indexes</code></dt>

      <dd>
      If a URL which maps to a directory is requested, and there
      If a URL which maps to a directory is requested and there
      is no <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
      (<em>e.g.</em>, <code>index.html</code>) in that directory, then
      <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> will return a formatted listing
@@ -2579,7 +2579,7 @@ directory</td></tr>

    <div class="warning"><h3>Warning</h3>
    <p>Mixing <code class="directive">Options</code> with a <code>+</code> or
    <code>-</code> with those without is not valid syntax, and is likely
    <code>-</code> with those without is not valid syntax and is likely
    to cause unexpected results.</p>
    </div>

@@ -2641,14 +2641,16 @@ directory</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.1.5 and later.
On Windows from Apache 2.3.3 and later.</td></tr>
On Windows, from Apache 2.3.3 and later.</td></tr>
</table>
    <p>This directive specifies the protocol used for a specific listening socket.
       The protocol is used to determine which module should handle a request, and
       The protocol is used to determine which module should handle a request and
       to apply protocol specific optimizations with the <code class="directive">AcceptFilter</code>
       directive.</p>

    <p>You only need to set the protocol if you are running on non-standard ports, otherwise <code>http</code> is assumed for port 80 and <code>https</code> for port 443.</p>
    <p>You only need to set the protocol if you are running on non-standard ports;
       otherwise, <code>http</code> is assumed for port 80 and <code>https</code>
       for port 443.</p>

    <p>For example, if you are running <code>https</code> on a non-standard port, specify the protocol explicitly:</p>

@@ -2786,13 +2788,13 @@ by Apache children</td></tr>
    or <code>max</code> to indicate to the server that the limit should
    be set to the maximum allowed by the operating system
    configuration. Raising the maximum resource limit requires that
    the server is running as <code>root</code>, or in the initial startup
    the server is running as <code>root</code> or in the initial startup
    phase.</p>

    <p>This applies to processes forked off from Apache children
    <p>This applies to processes forked from Apache children
    servicing requests, not the Apache children themselves. This
    includes CGI scripts and SSI exec commands, but not any
    processes forked off from the Apache parent such as piped
    processes forked from the Apache parent, such as piped
    logs.</p>

    <p>CPU resource limits are expressed in seconds per
@@ -2822,13 +2824,13 @@ by Apache children</td></tr>
    or <code>max</code> to indicate to the server that the limit should
    be set to the maximum allowed by the operating system
    configuration. Raising the maximum resource limit requires that
    the server is running as <code>root</code>, or in the initial startup
    the server is running as <code>root</code> or in the initial startup
    phase.</p>

    <p>This applies to processes forked off from Apache children
    <p>This applies to processes forked from Apache children
    servicing requests, not the Apache children themselves. This
    includes CGI scripts and SSI exec commands, but not any
    processes forked off from the Apache parent such as piped
    processes forked from the Apache parent, such as piped
    logs.</p>

    <p>Memory resource limits are expressed in bytes per
@@ -2853,18 +2855,18 @@ processes launched by Apache children</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
</table>
    <p>Takes 1 or 2 parameters. The first parameter sets the soft
    resource limit for all processes and the second parameter sets
    resource limit for all processes, and the second parameter sets
    the maximum resource limit. Either parameter can be a number,
    or <code>max</code> to indicate to the server that the limit
    should be set to the maximum allowed by the operating system
    configuration. Raising the maximum resource limit requires that
    the server is running as <code>root</code>, or in the initial startup
    the server is running as <code>root</code> or in the initial startup
    phase.</p>

    <p>This applies to processes forked off from Apache children
    <p>This applies to processes forked from Apache children
    servicing requests, not the Apache children themselves. This
    includes CGI scripts and SSI exec commands, but not any
    processes forked off from the Apache parent such as piped
    processes forked from the Apache parent, such as piped
    logs.</p>

    <p>Process limits control the number of processes per user.</p>
@@ -3277,7 +3279,7 @@ header</td></tr>
      (Unix) PHP/4.2.2 MyMod/1.2</code></dd>
    </dl>

    <p>This setting applies to the entire server, and cannot be
    <p>This setting applies to the entire server and cannot be
    enabled or disabled on a virtualhost-by-virtualhost basis.</p>

    <p>After version 2.0.44, this directive also controls the
@@ -3515,9 +3517,9 @@ port</td></tr>
    <p>An example where this may be useful is on an intranet server
    where you have users connecting to the machine using short
    names such as <code>www</code>. You'll notice that if the users
    type a shortname, and a URL which is a directory, such as
    type a shortname and a URL which is a directory, such as
    <code>http://www/splat</code>, <em>without the trailing
    slash</em> then Apache will redirect them to
    slash</em>, then Apache will redirect them to
    <code>http://www.domain.com/splat/</code>. If you have
    authentication enabled, this will cause the user to have to
    authenticate twice (once for <code>www</code> and once again
@@ -3529,15 +3531,15 @@ port</td></tr>
    <p>There is a third option, <code>UseCanonicalName DNS</code>,
    which is intended for use with mass IP-based virtual hosting to
    support ancient clients that do not provide a
    <code>Host:</code> header. With this option Apache does a
    <code>Host:</code> header. With this option, Apache does a
    reverse DNS lookup on the server IP address that the client
    connected to in order to work out self-referential URLs.</p>

    <div class="warning"><h3>Warning</h3>
    <p>If CGIs make assumptions about the values of <code>SERVER_NAME</code>
    <p>If CGIs make assumptions about the values of <code>SERVER_NAME</code>,
    they may be broken by this option. The client is essentially free
    to give whatever value they want as a hostname. But if the CGI is
    only using <code>SERVER_NAME</code> to construct self-referential URLs
    only using <code>SERVER_NAME</code> to construct self-referential URLs,
    then it should be just fine.</p>
    </div>

@@ -3561,11 +3563,11 @@ port</td></tr>
</table>
    <p>In many situations Apache must construct a <em>self-referential</em>
    URL -- that is, a URL that refers back to the same server. With
    <code>UseCanonicalPhysicalPort On</code> Apache will, when
    <code>UseCanonicalPhysicalPort On</code>, Apache will, when
    constructing the canonical port for the server to honor
    the <code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code> directive,
    provide the actual physical port number being used by this request
    as a potential port. With <code>UseCanonicalPhysicalPort Off</code>
    as a potential port. With <code>UseCanonicalPhysicalPort Off</code>,
    Apache will not ever use the actual physical port number, instead
    relying on all configured information to construct a valid port number.</p>

@@ -3661,7 +3663,7 @@ hostname or IP address</td></tr>
    </code></p></div>

    <p>Each Virtual Host must correspond to a different IP address,
    different port number or a different host name for the server,
    different port number, or a different host name for the server,
    in the former case the server machine must be configured to
    accept IP packets for multiple addresses. (If the machine does
    not have multiple network interfaces, then this can be
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
<!-- English Revision: 167959:1631518 (outdated) -->
<!-- English Revision: 167959:1688765 (outdated) -->

<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
<!-- English Revision: 1631518 -->
<!-- English Revision: 1631518:1688765 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<!-- English Revision: 608059:1631518 (outdated) -->
<!-- English Revision: 608059:1688765 (outdated) -->

<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
  <variants>
    <variant outdated="yes">de</variant>
    <variant>en</variant>
    <variant>fr</variant>
    <variant outdated="yes">fr</variant>
    <variant outdated="yes">ja</variant>
    <variant outdated="yes">tr</variant>
  </variants>
Loading