From c04bbf3c9b99a26d6c81b2972246d54a0c942f0e Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 17 Apr 2014 11:29:20 +0000 Subject: [PATCH] rebuild docs git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588219 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/howto/access.xml.meta | 2 +- docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.tr | 2 +- docs/manual/mod/mod_authnz_ldap.html.en | 9 +-- docs/manual/mod/mod_authnz_ldap.xml.fr | 2 +- docs/manual/mod/mod_authnz_ldap.xml.meta | 2 +- docs/manual/mod/mod_authz_dbd.html.en | 2 +- docs/manual/mod/mod_authz_dbd.xml.fr | 2 +- docs/manual/mod/mod_authz_dbd.xml.meta | 2 +- docs/manual/mod/mod_authz_dbm.html.en | 2 +- docs/manual/mod/mod_authz_dbm.xml.fr | 2 +- docs/manual/mod/mod_authz_dbm.xml.ko | 2 +- docs/manual/mod/mod_authz_dbm.xml.meta | 2 +- docs/manual/mod/mod_authz_groupfile.html.en | 2 +- docs/manual/mod/mod_authz_groupfile.xml.fr | 2 +- docs/manual/mod/mod_authz_groupfile.xml.ja | 2 +- docs/manual/mod/mod_authz_groupfile.xml.ko | 2 +- docs/manual/mod/mod_authz_groupfile.xml.meta | 2 +- docs/manual/mod/mod_authz_host.html.en | 3 +- docs/manual/mod/mod_authz_host.xml.fr | 2 +- docs/manual/mod/mod_authz_host.xml.meta | 2 +- docs/manual/mod/mod_authz_user.html.en | 2 +- docs/manual/mod/mod_authz_user.xml.fr | 2 +- docs/manual/mod/mod_authz_user.xml.ja | 2 +- docs/manual/mod/mod_authz_user.xml.ko | 2 +- docs/manual/mod/mod_authz_user.xml.meta | 2 +- docs/manual/mod/mod_deflate.xml.ja | 2 +- docs/manual/mod/mod_deflate.xml.ko | 2 +- docs/manual/mod/mod_dir.xml.ja | 2 +- docs/manual/mod/mod_dir.xml.ko | 2 +- docs/manual/mod/mod_dir.xml.tr | 2 +- docs/manual/mod/mod_headers.html.en | 28 +++++--- docs/manual/mod/mod_headers.xml.fr | 2 +- docs/manual/mod/mod_headers.xml.ja | 2 +- docs/manual/mod/mod_headers.xml.ko | 2 +- docs/manual/mod/mod_headers.xml.meta | 2 +- docs/manual/mod/mod_isapi.xml.ko | 2 +- docs/manual/mod/mod_ldap.html.en | 76 ++++++++++---------- docs/manual/mod/mod_ldap.xml.fr | 2 +- docs/manual/mod/mod_ldap.xml.meta | 2 +- docs/manual/mod/mod_log_config.xml.ja | 2 +- docs/manual/mod/mod_log_config.xml.ko | 2 +- docs/manual/mod/mod_log_config.xml.tr | 2 +- docs/manual/mod/mod_logio.xml.ja | 2 +- docs/manual/mod/mod_logio.xml.ko | 2 +- docs/manual/mod/mod_logio.xml.tr | 2 +- docs/manual/mod/mod_lua.html.en | 4 +- docs/manual/mod/mod_lua.xml.fr | 2 +- docs/manual/mod/mod_lua.xml.meta | 2 +- docs/manual/mod/mod_proxy.html.en | 31 ++++---- docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_proxy.xml.meta | 2 +- docs/manual/mod/mod_rewrite.html.en | 27 ++++--- docs/manual/mod/mod_rewrite.xml.fr | 2 +- docs/manual/mod/mod_rewrite.xml.meta | 2 +- docs/manual/mod/mod_suexec.xml.ja | 2 +- docs/manual/mod/mod_suexec.xml.ko | 2 +- docs/manual/mod/mod_suexec.xml.tr | 2 +- docs/manual/mod/mod_unixd.xml.tr | 2 +- docs/manual/rewrite/flags.xml.meta | 2 +- 63 files changed, 153 insertions(+), 137 deletions(-) diff --git a/docs/manual/howto/access.xml.meta b/docs/manual/howto/access.xml.meta index c42bb44f51..605822ecb4 100644 --- a/docs/manual/howto/access.xml.meta +++ b/docs/manual/howto/access.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 8aa896f930..80d79859f7 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + + + diff --git a/docs/manual/mod/mod_authnz_ldap.xml.meta b/docs/manual/mod/mod_authnz_ldap.xml.meta index 4ec661a32d..7a6a237d9a 100644 --- a/docs/manual/mod/mod_authnz_ldap.xml.meta +++ b/docs/manual/mod/mod_authnz_ldap.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_authz_dbd.html.en b/docs/manual/mod/mod_authz_dbd.html.en index 89110cd12a..fb6e2f5bf2 100644 --- a/docs/manual/mod/mod_authz_dbd.html.en +++ b/docs/manual/mod/mod_authz_dbd.html.en @@ -80,7 +80,7 @@ authorization types with dbd-group, dbd-login and dbd-logout.

-

Since v2.5.0, expressions are supported +

Since v2.4.8, expressions are supported within the DBD require directives.

Require dbd-group

diff --git a/docs/manual/mod/mod_authz_dbd.xml.fr b/docs/manual/mod/mod_authz_dbd.xml.fr index a5e709bded..2404be6144 100644 --- a/docs/manual/mod/mod_authz_dbd.xml.fr +++ b/docs/manual/mod/mod_authz_dbd.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_authz_dbd.xml.meta b/docs/manual/mod/mod_authz_dbd.xml.meta index 691db29ca9..8789f3f9ef 100644 --- a/docs/manual/mod/mod_authz_dbd.xml.meta +++ b/docs/manual/mod/mod_authz_dbd.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_authz_dbm.html.en b/docs/manual/mod/mod_authz_dbm.html.en index e4eae57491..624acb6959 100644 --- a/docs/manual/mod/mod_authz_dbm.html.en +++ b/docs/manual/mod/mod_authz_dbm.html.en @@ -61,7 +61,7 @@ a user is allowed to access a resource. mod_authz_dbm extends the authorization types with dbm-group.

-

Since v2.5.0, expressions are supported +

Since v2.4.8, expressions are supported within the DBM require directives.

Require dbm-group

diff --git a/docs/manual/mod/mod_authz_dbm.xml.fr b/docs/manual/mod/mod_authz_dbm.xml.fr index f9692b8215..d995f3f54b 100644 --- a/docs/manual/mod/mod_authz_dbm.xml.fr +++ b/docs/manual/mod/mod_authz_dbm.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_authz_dbm.xml.ko b/docs/manual/mod/mod_authz_dbm.xml.ko index faaf95895d..a84dba4e63 100644 --- a/docs/manual/mod/mod_authz_dbm.xml.ko +++ b/docs/manual/mod/mod_authz_dbm.xml.ko @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/mod/mod_authz_groupfile.xml.ja b/docs/manual/mod/mod_authz_groupfile.xml.ja index 3ff65f122f..cc4f4efb7d 100644 --- a/docs/manual/mod/mod_authz_groupfile.xml.ja +++ b/docs/manual/mod/mod_authz_groupfile.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_authz_host.xml.meta b/docs/manual/mod/mod_authz_host.xml.meta index 2df68a979b..c67d019aa9 100644 --- a/docs/manual/mod/mod_authz_host.xml.meta +++ b/docs/manual/mod/mod_authz_host.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_authz_user.html.en b/docs/manual/mod/mod_authz_user.html.en index cb7ffab043..6ad179854f 100644 --- a/docs/manual/mod/mod_authz_user.html.en +++ b/docs/manual/mod/mod_authz_user.html.en @@ -62,7 +62,7 @@ authorization types with user and valid-user.

-

Since v2.5.0, expressions are supported +

Since v2.4.8, expressions are supported within the user require directives.

Require user

diff --git a/docs/manual/mod/mod_authz_user.xml.fr b/docs/manual/mod/mod_authz_user.xml.fr index 3976a57ad4..61c3d17c3f 100644 --- a/docs/manual/mod/mod_authz_user.xml.fr +++ b/docs/manual/mod/mod_authz_user.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_authz_user.xml.ja b/docs/manual/mod/mod_authz_user.xml.ja index e25a52ab0b..90c0182673 100644 --- a/docs/manual/mod/mod_authz_user.xml.ja +++ b/docs/manual/mod/mod_authz_user.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + + diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja index 6cf45a904d..b63da8c51e 100644 --- a/docs/manual/mod/mod_headers.xml.ja +++ b/docs/manual/mod/mod_headers.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/mod/mod_ldap.xml.meta b/docs/manual/mod/mod_ldap.xml.meta index 92fe318361..c8ca841281 100644 --- a/docs/manual/mod/mod_ldap.xml.meta +++ b/docs/manual/mod/mod_ldap.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja index cf1f2408cc..6c6b2f4b04 100644 --- a/docs/manual/mod/mod_log_config.xml.ja +++ b/docs/manual/mod/mod_log_config.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/mod/mod_lua.xml.meta b/docs/manual/mod/mod_lua.xml.meta index b55c7710e9..8fc1a0efdf 100644 --- a/docs/manual/mod/mod_lua.xml.meta +++ b/docs/manual/mod/mod_lua.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index ff6a077aef..b641b0f0cb 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -469,6 +469,11 @@ ProxyPass /examples http://backend.example.com/examples timeout=10

See also the ProxyPreserveHost and ProxyVia directives, which control other request headers.

+

Note: If you need to specify custom request headers to be + added to the forwarded request, use the + RequestHeader + directive.

+
top

BalancerGrowth Directive

@@ -497,8 +502,7 @@ ProxyPass /examples http://backend.example.com/examples timeout=10 Context:server config, virtual host Status:Extension Module:mod_proxy -Compatibility:BalancerInherit is only available in Apache HTTP Server 2.4.4 and later. - and later. +Compatibility:BalancerInherit is only available in Apache HTTP Server 2.4.5 and later.

This directive will cause the current server/vhost to "inherit" Balancers and Workers defined in the main server. This can cause issues and @@ -544,8 +548,7 @@ ProxyPass /examples http://backend.example.com/examples timeout=10 Context:server config, virtual host Status:Extension Module:mod_proxy -Compatibility:BalancerPersist is only available in Apache HTTP Server 2.5.0 - and later. +Compatibility:BalancerPersist is only available in Apache HTTP Server 2.4.4 and later.

This directive will cause the shared memory storage associated with the balancers and balancer members to be persisted across @@ -917,7 +920,7 @@ proxied resources identical to the <Proxy> directive, except it matches URLs using regular expressions.

-

From 2.5.0 onwards, named groups and backreferences are captured and +

From 2.4.8 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of URLs to be referenced from within expressions and modules like @@ -980,7 +983,6 @@ through a local virtual path; url is a partial URL for the remote server and cannot include a query string.

-
Note: This directive cannot be used within a <Directory> context.
@@ -1306,7 +1308,8 @@ ProxyPass /mirror/foo http://backend.example.com and it depends on the backend application server that support sessions. If the backend application server uses different name for cookies and url encoded id (like servlet containers) use | to to separate them. - The first part is for the cookie the second for the path. + The first part is for the cookie the second for the path.
+ Available in Apache HTTP Server 2.4.4 and later. stickysessionsep "." @@ -1337,7 +1340,8 @@ ProxyPass /mirror/foo http://backend.example.com Off If set, an IO read timeout after a request is sent to the backend will force the worker into error state. Worker recovery behaves the same as other - worker errors. + worker errors.
+ Available in Apache HTTP Server 2.4.5 and later. nonce <auto> @@ -1363,7 +1367,8 @@ ProxyPass /mirror/foo http://backend.example.com in error state. There might be cases where an already overloaded backend can get into deeper trouble if the recovery of all workers is enforced without considering the retry parameter of each worker. In this case - set to Off. + set to Off.
+ Available in Apache HTTP Server 2.4.2 and later. @@ -1415,8 +1420,7 @@ ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover RewriteRule directive with the [P] flag.

-

The optional interpolate keyword (available in - httpd 2.2.9 and later), in combination with +

The optional interpolate keyword, in combination with ProxyPassInterpolateEnv causes the ProxyPass to interpolate environment variables, using the syntax ${VARNAME}. Note that many of the standard CGI-derived @@ -1449,7 +1453,7 @@ ProxyPassReverse /mirror/foo/ https://backend.example.com/ Context:server config, virtual host Status:Extension Module:mod_proxy -Compatibility:ProxyPassInherit is only available in Apache HTTP Server 2.5.0 and later. +Compatibility:ProxyPassInherit is only available in Apache HTTP Server 2.4.5 and later. and later.

This directive will cause the current server/vhost to "inherit" @@ -1603,8 +1607,7 @@ ProxyPassReverseCookiePath / /mirror/foo/ (RewriteRule ... [P]) from mod_rewrite because it doesn't depend on a corresponding ProxyPass directive.

-

The optional interpolate keyword (available in - httpd 2.2.9 and later), used together with +

The optional interpolate keyword, used together with ProxyPassInterpolateEnv, enables interpolation of environment variables specified using the format ${VARNAME}. Note that interpolation is not supported within the scheme portion of a diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index b5be49bc1d..c33e1a4484 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 3c31b54a01..629c237572 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e..0be21e86f4 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_suexec.xml.ja b/docs/manual/mod/mod_suexec.xml.ja index 7e091ce35c..6876e40b1b 100644 --- a/docs/manual/mod/mod_suexec.xml.ja +++ b/docs/manual/mod/mod_suexec.xml.ja @@ -1,7 +1,7 @@ - + + + +