You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2010/12/03 18:37:43 UTC
svn commit: r1041924 - in /httpd/httpd/branches/2.2.x/docs/manual/mod:
core.xml core.xml.fr
Author: nilgun
Date: Fri Dec 3 17:37:42 2010
New Revision: 1041924
URL: http://svn.apache.org/viewvc?rev=1041924&view=rev
Log:
fixed validation error
Modified:
httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.fr
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?rev=1041924&r1=1041923&r2=1041924&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Fri Dec 3 17:37:42 2010
@@ -35,12 +35,12 @@ available</description>
<compatibility>Available in Apache 2.1.5 and later</compatibility>
<usage>
- <p>This directive enables operating system specific optimizations for a
- listening socket by the Protocol type. The basic premise is for the
- kernel to not send a socket to the server process until either data
+ <p>This directive enables operating system specific optimizations for a
+ listening socket by the Protocol type. The basic premise is for the
+ kernel to not send a socket to the server process until either data
is received or an entire HTTP Request is buffered. Only
<a href="http://www.freebsd.org/cgi/man.cgi?query=accept_filter&sektion=9">
- FreeBSD's Accept Filters</a> and Linux's more primitive
+ FreeBSD's Accept Filters</a> and Linux's more primitive
<code>TCP_DEFER_ACCEPT</code> are currently supported.</p>
<p>The default values on FreeBSD are:</p>
@@ -48,12 +48,12 @@ available</description>
AcceptFilter http httpready <br/>
AcceptFilter https dataready
</example>
-
+
<p>The <code>httpready</code> accept filter buffers entire HTTP requests at
- the kernel level. Once an entire request is received, the kernel then
- sends it to the server. See the
+ the kernel level. Once an entire request is received, the kernel then
+ sends it to the server. See the
<a href="http://www.freebsd.org/cgi/man.cgi?query=accf_http&sektion=9">
- accf_http(9)</a> man page for more details. Since HTTPS requests are
+ 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&sektion=9">
accf_data(9)</a> filter is used.</p>
@@ -64,13 +64,13 @@ available</description>
</example>
<p>Linux's <code>TCP_DEFER_ACCEPT</code> does not support buffering http
- requests. Any value besides <code>none</code> will enable
+ requests. Any value besides <code>none</code> will enable
<code>TCP_DEFER_ACCEPT</code> on that listener. For more details
- see the Linux
+ see the Linux
<a href="http://homepages.cwi.nl/~aeb/linux/man2html/man7/tcp.7.html">
tcp(7)</a> man page.</p>
- <p>Using <code>none</code> for an argument will disable any accept filters
+ <p>Using <code>none</code> for an argument will disable any accept filters
for that protocol. This is useful for protocols that require a server
send data first, such as <code>nntp</code>:</p>
<example>AcceptFilter nntp none</example>
@@ -464,7 +464,7 @@ be passed through</description>
server error.</p>
<note><p>For security and performance reasons, do not set
- <code>AllowOverride</code> to anything other than <code>None</code>
+ <code>AllowOverride</code> to anything other than <code>None</code>
in your <code><Directory /></code> block. Instead, find (or
create) the <code><Directory></code> block that refers to the
directory where you're actually planning to place a
@@ -534,10 +534,10 @@ authentication</description>
server must have an authentication-provider module such as
<module>mod_authn_file</module> and an authorization module such
as <module>mod_authz_user</module>.</p>
-</usage>
+</usage>
<seealso><a href="../howto/auth.html">Authentication, Authorization,
- and Access Control</a></seealso>
+ and Access Control</a></seealso>
</directivesynopsis>
<directivesynopsis>
@@ -660,7 +660,7 @@ named file-system directory, sub-directo
<p><directive type="section">Directory</directive> and
<code></Directory></code> are used to enclose a group of
directives that will apply only to the named directory,
- sub-directories of that directory, and the files within the respective
+ sub-directories of that directory, and the files within the respective
directories. Any directive that is allowed
in a directory context may be used. <var>Directory-path</var> is
either the full path to a directory, or a wild-card string using
@@ -805,7 +805,7 @@ subdirectories</description>
of directives which will apply only to the named directory and
<em>sub-directories of that directory</em> (and the files within), the same as <directive
module="core" type="section">Directory</directive>. However, it
- takes as an argument a <glossary ref="regex">regular
+ takes as an argument a <glossary ref="regex">regular
expression</glossary>. For example:</p>
<example>
@@ -851,8 +851,8 @@ from the web</description>
<p>then an access to
<code>http://www.my.host.com/index.html</code> refers to
- <code>/usr/web/index.html</code>. If the <var>directory-path</var> is
- not absolute then it is assumed to be relative to the <directive
+ <code>/usr/web/index.html</code>. If the <var>directory-path</var> is
+ not absolute then it is assumed to be relative to the <directive
module="core">ServerRoot</directive>.</p>
<p>The <directive>DocumentRoot</directive> should be specified without
@@ -1098,7 +1098,7 @@ in case of an error</description>
<usage>
<p>The <directive>ErrorLog</directive> directive sets the name of
the file to which the server will log any errors it encounters. If
- the <var>file-path</var> is not absolute then it is assumed to be
+ the <var>file-path</var> is not absolute then it is assumed to be
relative to the <directive module="core">ServerRoot</directive>.</p>
<example><title>Example</title>
@@ -1135,7 +1135,7 @@ in case of an error</description>
<note type="warning"><title>Note</title>
<p>When entering a file path on non-Unix platforms, care should be taken
to make sure that only forward slashes are used even though the platform
- may allow the use of back slashes. In general it is a good idea to always
+ may allow the use of back slashes. In general it is a good idea to always
use forward slashes throughout the configuration files.</p>
</note>
</usage>
@@ -1203,8 +1203,8 @@ HTTP response header for static files</d
changed via <directive>FileETag</directive>.
</note>
<note><title>Server Side Includes</title>
- An ETag is not generated for responses parsed by <module>mod_include</module>,
- since the response entity can change without a change of the INode, MTime, or Size
+ An ETag is not generated for responses parsed by <module>mod_include</module>,
+ since the response entity can change without a change of the INode, MTime, or Size
of the static file with embedded SSI directives.
</note>
@@ -1243,7 +1243,7 @@ filenames</description>
<p>The <var>filename</var> argument should include a filename, or
a wild-card string, where <code>?</code> matches any single character,
and <code>*</code> matches any sequences of characters.
- <glossary ref="regex">Regular expressions</glossary>
+ <glossary ref="regex">Regular expressions</glossary>
can also be used, with the addition of the
<code>~</code> character. For example:</p>
@@ -1282,7 +1282,7 @@ filenames</description>
<p>The <directive type="section">FilesMatch</directive> directive
limits the scope of the enclosed directives by filename, just as the
<directive module="core" type="section">Files</directive> directive
- does. However, it accepts a <glossary ref="regex">regular
+ does. However, it accepts a <glossary ref="regex">regular
expression</glossary>. For example:</p>
<example>
@@ -1360,7 +1360,7 @@ MIME content-type</description>
argument ends with a percent symbol ('%'), subdirectories are created
for each process id.</p>
- <p>This directive currently only works with the <module>prefork</module>
+ <p>This directive currently only works with the <module>prefork</module>
MPM.</p>
</usage>
</directivesynopsis>
@@ -1557,7 +1557,7 @@ the server configuration files</descript
files in a directory that can cause <program>httpd</program> to
fail.</p>
- <p>The file path specified may be an absolute path, or may be relative
+ <p>The file path specified may be an absolute path, or may be relative
to the <directive module="core">ServerRoot</directive> directory.</p>
<p>Examples:</p>
@@ -1635,7 +1635,7 @@ requests on a persistent connection</des
may cause performance problems in heavily loaded servers. The
higher the timeout, the more server processes will be kept
occupied waiting on connections with idle clients.</p>
-
+
<p>In a name-based virtual host context, the value of the first
defined virtual host (the default host) in a set of <directive
module="core">NameVirtualHost</directive> will be used.
@@ -1853,7 +1853,7 @@ will be accepted from the client</descri
</example>
<note type="warning"><title>Warning</title>
- <p> When name-based virtual hosting is used, the value for this
+ <p> When name-based virtual hosting is used, the value for this
directive is taken from the default (first-listed) virtual host for the
<directive>NameVirtualHost</directive> the connection was mapped to.</p>
</note>
@@ -1874,11 +1874,11 @@ client</description>
that will be allowed in an HTTP request header.</p>
<p>The <directive>LimitRequestFieldSize</directive> directive
- allows the server administrator to reduce or increase the limit
+ allows the server administrator to reduce or increase the limit
on the allowed size of an HTTP request header field. A server
- needs this value to be large enough to hold any one header field
- from a normal client request. The size of a normal request header
- field will vary greatly among different client implementations,
+ needs this value to be large enough to hold any one header field
+ from a normal client request. The size of a normal request header
+ field will vary greatly among different client implementations,
often depending upon the extent to which a user has configured
their browser to support detailed content negotiation. SPNEGO
authentication headers can be up to 12392 bytes.</p>
@@ -1897,7 +1897,7 @@ client</description>
the default.</note>
<note type="warning"><title>Warning</title>
- <p> When name-based virtual hosting is used, the value for this
+ <p> When name-based virtual hosting is used, the value for this
directive is taken from the default (first-listed) virtual host for the
<directive>NameVirtualHost</directive> the connection was mapped to.</p>
</note>
@@ -1914,7 +1914,7 @@ from the client</description>
<contextlist><context>server config</context><context>virtual host</context></contextlist>
<usage>
- <p>This directive sets the number of <var>bytes</var> that will be
+ <p>This directive sets the number of <var>bytes</var> that will be
allowed on the HTTP request-line.</p>
<p>The <directive>LimitRequestLine</directive> directive allows
@@ -1941,7 +1941,7 @@ from the client</description>
the default.</note>
<note type="warning"><title>Warning</title>
- <p> When name-based virtual hosting is used, the value for this
+ <p> When name-based virtual hosting is used, the value for this
directive is taken from the default (first-listed) virtual host for the
<directive>NameVirtualHost</directive> the connection was mapped to.</p>
</note>
@@ -2000,34 +2000,33 @@ URLs</description>
filesystem location, such access controls may by circumvented.</p>
<p>The enclosed directives will be applied to the request if the path component
- of the URL meets <em>any</em> of the following criteria:
+ of the URL meets <em>any</em> of the following criteria:</p>
<ul>
<li>The specified location matches exactly the path component of the URL.
</li>
- <li>The specified location, which ends in a forward slash, is a prefix
+ <li>The specified location, which ends in a forward slash, is a prefix
of the path component of the URL (treated as a context root).
</li>
- <li>The specified location, with the addition of a trailing slash, is a
+ <li>The specified location, with the addition of a trailing slash, is a
prefix of the path component of the URL (also treated as a context root).
</li>
</ul>
- In the example below, where no trailing slash is used, requests to
+ <p>In the example below, where no trailing slash is used, requests to
/private1, /private1/ and /private1/file.txt will have the enclosed
- directives applied, but /private1other would not.
+ directives applied, but /private1other would not.</p>
<example>
<Location /private1>
...
</example>
- In the example below, where a trailing slash is used, requests to
+ <p>In the example below, where a trailing slash is used, requests to
/private2/ and /private2/file.txt will have the enclosed
- directives applied, but /private2 and /private2other would not.
+ directives applied, but /private2 and /private2other would not.</p>
<example>
<Location /private2<em>/</em>>
...
</example>
- </p>
- <note><title>When to use <directive
+ <note><title>When to use <directive
type="section">Location</directive></title>
<p>Use <directive type="section">Location</directive> to apply
@@ -2035,7 +2034,7 @@ URLs</description>
content that lives in the filesystem, use <directive
type="section" module="core">Directory</directive> and <directive
type="section" module="core">Files</directive>. An exception is
- <code><Location /></code>, which is an easy way to
+ <code><Location /></code>, which is an easy way to
apply a configuration to the entire server.</p>
</note>
@@ -2538,7 +2537,7 @@ a resource</description>
<usage>
<p>This directive selects which authenticated users can access a
resource. Multipe instances of this directive are combined with a logical
- "OR", such that a user matching any <directive>Require </directive>line is
+ "OR", such that a user matching any <directive>Require </directive>line is
granted access. The restrictions are processed by authorization
modules. Some of the allowed syntaxes provided by
<module>mod_authz_user</module> and
@@ -2584,8 +2583,8 @@ a resource</description>
place the <directive>Require</directive> statement into a
<directive module="core" type="section">Limit</directive>
section.</p>
-
- <p>If <directive>Require</directive> is used together with
+
+ <p>If <directive>Require</directive> is used together with
the <directive module="mod_authz_host">Allow</directive> or
<directive module="mod_authz_host">Deny</directive> directives,
then the interaction of these restrictions is controlled by
@@ -2614,11 +2613,11 @@ a resource</description>
</Directory><br />
</example>
</note>
-
+
</usage>
<seealso><a href="../howto/auth.html">Authentication, Authorization,
- and Access Control</a></seealso>
+ and Access Control</a></seealso>
<seealso><directive module="core">Satisfy</directive></seealso>
<seealso><module>mod_authz_host</module></seealso>
</directivesynopsis>
@@ -2955,7 +2954,7 @@ itself</description>
<p>Additionally, <directive>ServerName</directive> is used (possibly
in conjunction with <directive>ServerAlias</directive>) to uniquely
identify a virtual host, when using <a href="../vhosts/name-based.html">name-based virtual hosts</a>.</p>
-
+
<p>For example, if the name of the
machine hosting the web server is <code>simple.example.com</code>,
but the machine also has the DNS alias <code>www.example.com</code>
@@ -2988,7 +2987,7 @@ itself</description>
<code>https://</code> scheme and the port number to which the
clients connect in the <directive>ServerName</directive> directive
to make sure that the server generates the correct
- self-referential URLs.
+ self-referential URLs.
</p>
<p>See the description of the
@@ -3039,7 +3038,7 @@ is accessed by an incompatible browser</
subdirectories <code>conf/</code> and <code>logs/</code>. Relative
paths in other configuration directives (such as <directive
module="core">Include</directive> or <directive
- module="mod_so">LoadModule</directive>, for example) are taken as
+ module="mod_so">LoadModule</directive>, for example) are taken as
relative to this directory.</p>
<example><title>Example</title>
@@ -3310,7 +3309,7 @@ requests</description>
allowed) error to the client.</p>
<p>Finally, for testing and diagnostic purposes only, request
- bodies may be allowed using the non-compliant <code>TraceEnable
+ bodies may be allowed using the non-compliant <code>TraceEnable
extended</code> directive. The core (as an origin server) will
restrict the request body to 64k (plus 8k for chunk headers if
<code>Transfer-Encoding: chunked</code> is used). The core will
@@ -3417,7 +3416,7 @@ port</description>
<li>Port provided in <code>Servername</code></li>
<li>Default port</li>
</ul>
-
+
<p>With <code>UseCanonicalPhysicalPort Off</code>, the
physical ports are removed from the ordering.</p>
</note>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.fr?rev=1041924&r1=1041923&r2=1041924&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.fr (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.fr Fri Dec 3 17:37:42 2010
@@ -987,7 +987,7 @@ lire les fichiers pendant qu'ils sont se
</example>
-
+
</usage>
</directivesynopsis>
@@ -2195,7 +2195,7 @@ spécifiées</description>
<p>Les directives que contient cette section seront appliquées aux
requêtes si la partie chemin de l'URL satisfait à l'un au moins de
- ces critères :
+ ces critères :</p>
<ul>
<li>Le chemin spécifié correspond exactement à la partie chemin de
l'URL.
@@ -2209,21 +2209,20 @@ spécifiées</description>
contexte).
</li>
</ul>
- Dans l'exemple ci-dessous, où aucun slash de fin n'est utilisé, les
+ <p>Dans l'exemple ci-dessous, où aucun slash de fin n'est utilisé, les
directives contenues dans la section s'appliqueront à /private1,
- /private1/ et /private1/file.txt, mais pas à /private1other.
+ /private1/ et /private1/file.txt, mais pas à /private1other.</p>
<example>
<Location /private1>
...
</example>
- De même, dans l'exemple ci-dessous, où l'on utilise un slash de fin, les
+ <p>De même, dans l'exemple ci-dessous, où l'on utilise un slash de fin, les
directives contenues dans la section s'appliqueront à /private2/ et
- à /private2/file.txt, mais pas à /private2other.
+ à /private2/file.txt, mais pas à /private2other.</p>
<example>
<Location /private2<em>/</em>>
...
</example>
- </p>
<note><title>Quand utiliser la section <directive
type="section">Location</directive></title>