From 9bba315a8fc350fdae624da7472d936fc69dcfcf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Fri, 10 Feb 2012 20:17:46 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1242910 13f79535-47bb-0310-9956-ffa450edef68 --- docs/man/httpd.8 | 10 +++++----- docs/manual/convenience.map | 1 + docs/manual/mod/mod_proxy.html.en | 7 ++++++- docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_rewrite.xml.fr | 2 +- docs/manual/mod/quickreference.html.de | 2 +- docs/manual/mod/quickreference.html.en | 2 +- docs/manual/mod/quickreference.html.es | 2 +- docs/manual/mod/quickreference.html.ko.euc-kr | 2 +- docs/manual/mod/quickreference.html.tr.utf8 | 2 +- docs/manual/mod/quickreference.html.zh-cn | 2 +- docs/manual/new_features_2_4.html.fr | 2 ++ docs/manual/new_features_2_4.xml.fr | 2 +- docs/manual/new_features_2_4.xml.meta | 2 +- docs/manual/programs/httpd.xml.ko | 2 +- docs/manual/programs/httpd.xml.tr | 2 +- 17 files changed, 27 insertions(+), 19 deletions(-) diff --git a/docs/man/httpd.8 b/docs/man/httpd.8 index 203163203a..5c529a6872 100644 --- a/docs/man/httpd.8 +++ b/docs/man/httpd.8 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTTPD" 8 "2010-09-12" "Apache HTTP Server" "httpd" +.TH "HTTPD" 8 "2012-02-10" "Apache HTTP Server" "httpd" .SH NAME httpd \- Apache Hypertext Transfer Protocol Server @@ -56,7 +56,7 @@ Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This c Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is conf/httpd\&.conf\&. .TP -k start|restart|graceful|stop|graceful-stop -Signals httpd to start, restart, or stop\&. See Stopping Apache for more information\&. +Signals httpd to start, restart, or stop\&. See Stopping Apache httpd for more information\&. .TP -C \fIdirective\fR Process the configuration \fIdirective\fR before reading config files\&. @@ -88,7 +88,7 @@ Dump a list of loaded Static and Shared Modules\&. -S Show the settings as parsed from the config file (currently only shows the virtualhost settings)\&. .TP --T (Availabe in 2\&.3\&.8 and later) +-T (Available in 2\&.3\&.8 and later) Skip document root check at startup/restart\&. .TP -t @@ -109,10 +109,10 @@ The following arguments are available only on the Windows platform: .TP -k install|config|uninstall -Install Apache as a Windows NT service; change startup options for the Apache service; and uninstall the Apache service\&. +Install Apache httpd as a Windows NT service; change startup options for the Apache httpd service; and uninstall the Apache httpd service\&. .TP -n \fIname\fR -The \fIname\fR of the Apache service to signal\&. +The \fIname\fR of the Apache httpd service to signal\&. .TP -w Keep the console window open on error so that the error message can be read\&. diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index 212c77261c..7d49d325d7 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -246,6 +246,7 @@ imapbase mod/mod_imagemap.html#imapbase imapdefault mod/mod_imagemap.html#imapdefault imapmenu mod/mod_imagemap.html#imapmenu include mod/core.html#include +includeoptional mod/core.html#includeoptional indexheadinsert mod/mod_autoindex.html#indexheadinsert indexignore mod/mod_autoindex.html#indexignore indexignorereset mod/mod_autoindex.html#indexignorereset diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 25dbfaec9b..c6da16b87e 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -888,7 +888,7 @@ through + [key=value ...]] [nocanon] [interpolate] [noquery] @@ -1303,6 +1303,11 @@ through so you may still have to resort to mod_rewrite for complex rules.

+

Normally, mod_proxy will include the query string when + generating the SCRIPT_FILENAME environment variable. + The optional noquery keyword (available in + httpd 2.4.1 and later) prevents this.

+

When used inside a <Location> section, the first argument is omitted and the local directory is obtained from the <Location>. The same will occur inside a <LocationMatch> section, diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index e9240b57b8..a4fedf9fdd 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 ee8268e125..c1d1699644 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/quickreference.html.de b/docs/manual/mod/quickreference.html.de index 05a41d2762..34ec33b208 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -700,7 +700,7 @@ proxied resources

+ [key=value ...]] [nocanon] [interpolate] [noquery] diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index fd26bc1f74..8aadbd26d2 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -689,7 +689,7 @@ proxied resources + [key=value ...]] [nocanon] [interpolate] [noquery] diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index 1ee981ccf1..2cc322a52e 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -696,7 +696,7 @@ proxied resources + [key=value ...]] [nocanon] [interpolate] [noquery] diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index 88c8453f0e..a94aff8164 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -657,7 +657,7 @@ proxied resources + [key=value ...]] [nocanon] [interpolate] [noquery] diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index 82b4653384..d2ef5bde9a 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -688,7 +688,7 @@ proxied resources + [key=value ...]] [nocanon] [interpolate] [noquery] diff --git a/docs/manual/mod/quickreference.html.zh-cn b/docs/manual/mod/quickreference.html.zh-cn index 91d3733412..aae6820409 100644 --- a/docs/manual/mod/quickreference.html.zh-cn +++ b/docs/manual/mod/quickreference.html.zh-cn @@ -684,7 +684,7 @@ proxied resources + [key=value ...]] [nocanon] [interpolate] [noquery] diff --git a/docs/manual/new_features_2_4.html.fr b/docs/manual/new_features_2_4.html.fr index 469aef0144..df03fdda99 100644 --- a/docs/manual/new_features_2_4.html.fr +++ b/docs/manual/new_features_2_4.html.fr @@ -24,6 +24,8 @@ serveur HTTP Apache fr  |  tr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

Ce document décrit les modifications majeures apportées par la version 2.4 du serveur HTTP Apache. Pour les nouvelles fonctionnalités diff --git a/docs/manual/new_features_2_4.xml.fr b/docs/manual/new_features_2_4.xml.fr index 58f547e3c2..389052d7ed 100644 --- a/docs/manual/new_features_2_4.xml.fr +++ b/docs/manual/new_features_2_4.xml.fr @@ -3,7 +3,7 @@ - + + +

Description:Maps remote servers into the local server URL-space
Syntax:ProxyPass [path] !|url [key=value - [key=value ...]] [nocanon] [interpolate]
Context:server config, virtual host, directory
Status:Extension
Module:mod_proxy
ProxyMaxForwards number -1 svE
Maximium number of proxies that a request can be forwarded through
ProxyPass [path] !|url [key=value - [key=value ...]] [nocanon] [interpolate]svdE
Maps remote servers into the local server URL-space
svdE
Maps remote servers into the local server URL-space
ProxyPassInterpolateEnv On|Off Off svdE
Enable Environment Variable interpolation in Reverse Proxy configurations
ProxyPassMatch [regex] !|url [key=value [key=value ...]]svdE
Maps remote servers into the local server URL-space using regular expressions
ProxyMaxForwards number -1 svE
Maximium number of proxies that a request can be forwarded through
ProxyPass [path] !|url [key=value - [key=value ...]] [nocanon] [interpolate]svdE
Maps remote servers into the local server URL-space
svdE
Maps remote servers into the local server URL-space
ProxyPassInterpolateEnv On|Off Off svdE
Enable Environment Variable interpolation in Reverse Proxy configurations
ProxyPassMatch [regex] !|url [key=value [key=value ...]]svdE
Maps remote servers into the local server URL-space using regular expressions
ProxyMaxForwards number -1 svE
Maximium number of proxies that a request can be forwarded through
ProxyPass [path] !|url [key=value - [key=value ...]] [nocanon] [interpolate]svdE
Maps remote servers into the local server URL-space
svdE
Maps remote servers into the local server URL-space
ProxyPassInterpolateEnv On|Off Off svdE
Enable Environment Variable interpolation in Reverse Proxy configurations
ProxyPassMatch [regex] !|url [key=value [key=value ...]]svdE
Maps remote servers into the local server URL-space using regular expressions
ProxyMaxForwards number -1 svE
Maximium number of proxies that a request can be forwarded through
ProxyPass [path] !|url [key=value - [key=value ...]] [nocanon] [interpolate]svdE
Maps remote servers into the local server URL-space
svdE
Maps remote servers into the local server URL-space
ProxyPassInterpolateEnv On|Off Off svdE
Enable Environment Variable interpolation in Reverse Proxy configurations
ProxyPassMatch [regex] !|url [key=value [key=value ...]]svdE
Maps remote servers into the local server URL-space using regular expressions
ProxyMaxForwards number -1 skE
Maximium number of proxies that a request can be forwarded through
ProxyPass [path] !|url [key=value - [key=value ...]] [nocanon] [interpolate]skdE
Maps remote servers into the local server URL-space
skdE
Maps remote servers into the local server URL-space
ProxyPassInterpolateEnv On|Off Off skdE
Enable Environment Variable interpolation in Reverse Proxy configurations
ProxyPassMatch [regex] !|url [key=value [key=value ...]]skdE
Maps remote servers into the local server URL-space using regular expressions
ProxyMaxForwards number -1 svE
Maximium number of proxies that a request can be forwarded through
ProxyPass [path] !|url [key=value - [key=value ...]] [nocanon] [interpolate]svdE
Maps remote servers into the local server URL-space
svdE
Maps remote servers into the local server URL-space
ProxyPassInterpolateEnv On|Off Off svdE
Enable Environment Variable interpolation in Reverse Proxy configurations
ProxyPassMatch [regex] !|url [key=value [key=value ...]]svdE
Maps remote servers into the local server URL-space using regular expressions