summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucien Gentis <lgentis@apache.org>2015-05-02 18:37:06 +0200
committerLucien Gentis <lgentis@apache.org>2015-05-02 18:37:06 +0200
commit6cd90c00feb08be3cc9feabe2c7b4673c59d1627 (patch)
treee72fe066a013b3ca9b99e73ba9ee44f0462de1c3
parentNew file. (diff)
downloadapache2-6cd90c00feb08be3cc9feabe2c7b4673c59d1627.tar.xz
apache2-6cd90c00feb08be3cc9feabe2c7b4673c59d1627.zip
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677330 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/mod/mod_authz_owner.xml.fr14
-rw-r--r--docs/manual/mod/mod_cern_meta.xml.fr2
-rw-r--r--docs/manual/mod/mod_cgid.xml.fr2
-rw-r--r--docs/manual/mod/mod_dialup.xml.fr10
-rw-r--r--docs/manual/mod/mod_example_hooks.xml.fr4
-rw-r--r--docs/manual/mod/mod_ext_filter.xml.fr10
-rw-r--r--docs/manual/mod/mod_log_config.xml.ja2
-rw-r--r--docs/manual/mod/mod_log_config.xml.ko2
-rw-r--r--docs/manual/mod/mod_log_config.xml.tr2
-rw-r--r--docs/manual/mod/mod_proxy.xml.fr67
10 files changed, 58 insertions, 57 deletions
diff --git a/docs/manual/mod/mod_authz_owner.xml.fr b/docs/manual/mod/mod_authz_owner.xml.fr
index 1a9acfdb87..f040145ab3 100644
--- a/docs/manual/mod/mod_authz_owner.xml.fr
+++ b/docs/manual/mod/mod_authz_owner.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1421821:1673582 (outdated) -->
+<!-- English Revision: 1673582 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -96,11 +96,11 @@ fichiers</description>
<code>smith</code>.</p>
<highlight language="config">
-&lt;Directory /home/*/public_html/private&gt;
+&lt;Directory "/home/*/public_html/private"&gt;
AuthType Basic
- AuthName MyPrivateFiles
+ AuthName "MyPrivateFiles"
AuthBasicProvider dbm
- AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all
+ AuthDBMUserFile "/usr/local/apache2/etc/.htdbm-all"
Require file-owner
&lt;/Directory&gt;
</highlight>
@@ -121,14 +121,14 @@ fichiers</description>
r&eacute;pertoires <code>project-foo</code> de chacun d'entre eux.</p>
<highlight language="config">
-&lt;Directory /home/*/public_html/project-foo&gt;
+&lt;Directory "/home/*/public_html/project-foo"&gt;
AuthType Basic
AuthName "Project Foo Files"
AuthBasicProvider dbm
# combined user/group database
- AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all
- AuthDBMGroupFile /usr/local/apache2/etc/.htdbm-all
+ AuthDBMUserFile "/usr/local/apache2/etc/.htdbm-all"
+ AuthDBMGroupFile "/usr/local/apache2/etc/.htdbm-all"
Satisfy All
Require file-group
diff --git a/docs/manual/mod/mod_cern_meta.xml.fr b/docs/manual/mod/mod_cern_meta.xml.fr
index d360901961..99c8b8adda 100644
--- a/docs/manual/mod/mod_cern_meta.xml.fr
+++ b/docs/manual/mod/mod_cern_meta.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1336590:1673932 (outdated) -->
+<!-- English Revision: 1673932 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_cgid.xml.fr b/docs/manual/mod/mod_cgid.xml.fr
index 5b4d61fe30..61885c5fdf 100644
--- a/docs/manual/mod/mod_cgid.xml.fr
+++ b/docs/manual/mod/mod_cgid.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1535125:1673947 (outdated) -->
+<!-- English Revision : 1673947 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_dialup.xml.fr b/docs/manual/mod/mod_dialup.xml.fr
index 074586f1aa..3ab854f2bc 100644
--- a/docs/manual/mod/mod_dialup.xml.fr
+++ b/docs/manual/mod/mod_dialup.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1330980:1673945 (outdated) -->
+<!-- English Revision: 1673945 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -41,8 +41,8 @@ modems. Ainsi, il est possible de naviguer sur votre site avec un modem
56k V.92 en positionnant une configuration de ce type :</p>
<highlight language="config">
-&lt;Location /mysite&gt;
- ModemStandard V.92
+&lt;Location "/mysite"&gt;
+ ModemStandard "V.92"
&lt;/Location&gt;
</highlight>
@@ -67,8 +67,8 @@ client.</p>
souhaitez simuler.</p>
<highlight language="config">
-&lt;Location /mysite&gt;
- ModemStandard V.26bis
+&lt;Location "/mysite"&gt;
+ ModemStandard "V.26bis"
&lt;/Location&gt;
</highlight>
diff --git a/docs/manual/mod/mod_example_hooks.xml.fr b/docs/manual/mod/mod_example_hooks.xml.fr
index 062c9a1d25..b8f12c2add 100644
--- a/docs/manual/mod/mod_example_hooks.xml.fr
+++ b/docs/manual/mod/mod_example_hooks.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1629244:1673892 (outdated) -->
+<!-- English Revision: 1673892 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -110,7 +110,7 @@
<p>Pour activer le module example_hooks, ajoutez &agrave; votre fichier
<code>httpd.conf</code> un bloc du style :</p>
<highlight language="config">
-&lt;Location /example-hooks-info&gt;
+&lt;Location "/example-hooks-info"&gt;
SetHandler example-hooks-handler
&lt;/Location&gt;
</highlight>
diff --git a/docs/manual/mod/mod_ext_filter.xml.fr b/docs/manual/mod/mod_ext_filter.xml.fr
index 69834d44df..f70bbf83d6 100644
--- a/docs/manual/mod/mod_ext_filter.xml.fr
+++ b/docs/manual/mod/mod_ext_filter.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1669200:1673945 (outdated) -->
+<!-- English Revision: 1673945 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -98,7 +98,7 @@ ExtFilterDefine c-to-html mode=output \
# la directive de mod_ext_filter qui d&eacute;finit le filtre externe
ExtFilterDefine gzip mode=output cmd=/bin/gzip
-&lt;Location /gzipped&gt;
+&lt;Location "/gzipped"&gt;
# directive de base permettant de traiter la sortie avec le
# filtre gzip
@@ -122,7 +122,7 @@ ExtFilterDefine gzip mode=output cmd=/bin/gzip
ExtFilterDefine slowdown mode=output cmd=/bin/cat \
preservescontentlength
-&lt;Location /&gt;
+&lt;Location "/"&gt;
# directive de base permettant de traiter plusieurs fois la
# sortie avec le filtre slowdown
#
@@ -141,7 +141,7 @@ ExtFilterDefine slowdown mode=output cmd=/bin/cat \
ExtFilterDefine fixtext mode=output intype=text/html \
cmd="/bin/sed s/verdana/arial/g"
-&lt;Location /&gt;
+&lt;Location "/"&gt;
# directive de base permettant de traiter la sortie avec le
# filtre fixtext
SetOutputFilter fixtext
@@ -177,7 +177,7 @@ ExtFilterDefine traceafter \
cmd="/bin/tracefilter.pl /tmp/traceafter" \
EnableEnv=trace_this_client ftype=21
-&lt;Directory /usr/local/docs&gt;
+&lt;Directory "/usr/local/docs"&gt;
SetEnvIf Remote_Addr 192.168.1.31 trace_this_client
SetOutputFilter tracebefore;deflate;traceafter
&lt;/Directory&gt;
diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index 07618b1455..702d78d982 100644
--- a/docs/manual/mod/mod_log_config.xml.ja
+++ b/docs/manual/mod/mod_log_config.xml.ja
@@ -1,7 +1,7 @@
<?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: 579425:1675533 (outdated) -->
+<!-- English Revision: 579425:1677210 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_log_config.xml.ko b/docs/manual/mod/mod_log_config.xml.ko
index be4c66f8a1..ea10faa77c 100644
--- a/docs/manual/mod/mod_log_config.xml.ko
+++ b/docs/manual/mod/mod_log_config.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1675533 (outdated) -->
+<!-- English Revision: 105989:1677210 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_log_config.xml.tr b/docs/manual/mod/mod_log_config.xml.tr
index f253313e09..0ea02ee2b4 100644
--- a/docs/manual/mod/mod_log_config.xml.tr
+++ b/docs/manual/mod/mod_log_config.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1310330:1675533 (outdated) -->
+<!-- English Revision: 1310330:1677210 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index 88ce6baa00..2cff30cb76 100644
--- a/docs/manual/mod/mod_proxy.xml.fr
+++ b/docs/manual/mod/mod_proxy.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1659902:1673932 (outdated) -->
+<!-- English Revision: 1673932 -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
@@ -168,8 +168,8 @@
<example><title>Mandataire inverse</title>
<highlight language="config">
-ProxyPass /foo http://foo.example.com/bar
-ProxyPassReverse /foo http://foo.example.com/bar
+ProxyPass "/foo" "http://foo.example.com/bar"
+ProxyPassReverse "/foo" "http://foo.example.com/bar"
</highlight>
</example>
@@ -196,7 +196,7 @@ ProxyVia On
<example><title>Scripts PHP et mandataire inverse</title>
<highlight language="config">
-&lt;FilesMatch \.php$&gt;
+&lt;FilesMatch "\.php$"&gt;
SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/"
&lt;/FilesMatch&gt;
</highlight>
@@ -231,7 +231,7 @@ ProxyVia On
<example>
<highlight language="config">
- ProxyPass /example http://backend.example.com connectiontimeout=5 timeout=30
+ ProxyPass "/example" "http://backend.example.com" connectiontimeout=5 timeout=30
</highlight>
</example>
@@ -277,8 +277,8 @@ ProxyVia On
original, y compris un &eacute;ventuel chemin donn&eacute; :</p>
<highlight language="config">
-ProxyPass /examples http://backend.example.com/examples
-ProxyPass /docs http://backend.example.com/docs
+ProxyPass "/examples" "http://backend.example.com/examples"
+ProxyPass "/docs" "http://backend.example.com/docs"
</highlight>
<p>Dans cet exemple, deux workers diff&eacute;rents sont d&eacute;finis, chacun
@@ -292,8 +292,8 @@ ProxyPass /docs http://backend.example.com/docs
dans le fichier de configuration. Dans l'exemple suivant,</p>
<highlight language="config">
-ProxyPass /apps http://backend.example.com/ timeout=60
-ProxyPass /examples http://backend.example.com/examples timeout=10
+ProxyPass "/apps" "http://backend.example.com/" timeout=60
+ProxyPass "/examples" "http://backend.example.com/examples" timeout=10
</highlight>
<p>le second worker n'est pas vraiment cr&eacute;&eacute;. C'est le premier
@@ -431,8 +431,8 @@ ProxyPass /examples http://backend.example.com/examples timeout=10
<code>proxy-nokeepalive</code>.</p>
<highlight language="config">
-&lt;Location /buggyappserver/&gt;
- ProxyPass http://buggyappserver:7001/foo/
+&lt;Location "/buggyappserver/"&gt;
+ ProxyPass "http://buggyappserver:7001/foo/"
SetEnv force-proxy-request-1.0 1
SetEnv proxy-nokeepalive 1
&lt;/Location&gt;
@@ -1004,8 +1004,8 @@ de la version 2.4.7 du serveur HTTP Apache</compatibility>
<code>http://example.com/</code> ; alors la ligne</p>
<highlight language="config">
-&lt;Location /mirror/foo/&gt;
- ProxyPass http://backend.example.com/
+&lt;Location "/mirror/foo/"&gt;
+ ProxyPass "http://backend.example.com/"
&lt;/Location&gt;
</highlight>
@@ -1020,7 +1020,7 @@ de la version 2.4.7 du serveur HTTP Apache</compatibility>
href="mod_proxy_balancer.html#balancer_manager">Balancer Manager</a> :</p>
<highlight language="config">
- ProxyPass /miroir/foo/ http://backend.example.com/
+ ProxyPass "/miroir/foo/" "http://backend.example.com/"
</highlight>
<note type="warning">
@@ -1036,17 +1036,17 @@ de la version 2.4.7 du serveur HTTP Apache</compatibility>
du mandat inverse, comme dans l'exemple suivant :</p>
<highlight language="config">
-&lt;Location /mirror/foo/&gt;
- ProxyPass http://backend.example.com/
+&lt;Location "/mirror/foo/"&gt;
+ ProxyPass "http://backend.example.com/"
&lt;/Location&gt;
-&lt;Location /mirror/foo/i&gt;
- ProxyPass !
+&lt;Location "/mirror/foo/i"&gt;
+ ProxyPass "!"
&lt;/Location&gt;
</highlight>
<highlight language="config">
-ProxyPass /mirror/foo/i !
-ProxyPass /mirror/foo http://backend.example.com
+ProxyPass "/mirror/foo/i" "!"
+ProxyPass "/mirror/foo" "http://backend.example.com"
</highlight>
<p>va mandater toutes les requ&ecirc;tes pour <code>/miroir/foo</code>
@@ -1105,7 +1105,7 @@ ProxyPass /mirror/foo http://backend.example.com
<example><title>Exemple</title>
<highlight language="config">
- ProxyPass /example http://backend.example.com max=20 ttl=120 retry=300
+ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
</highlight>
</example>
@@ -1451,8 +1451,8 @@ ProxyPass /mirror/foo http://backend.example.com
</table>
<p>Exemple de configuration d'un r&eacute;partiteur de charge</p>
<highlight language="config">
-ProxyPass /special-area http://special.example.com smax=5 max=10
-ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
+ProxyPass "/special-area" "http://special.example.com" smax=5 max=10
+ProxyPass "/" "balancer://mycluster/" stickysession=JSESSIONID|jsessionid nofailover=On
&lt;Proxy balancer://mycluster&gt;
BalancerMember ajp://1.2.3.4:8009
BalancerMember ajp://1.2.3.5:8009 loadfactor=20
@@ -1464,7 +1464,7 @@ ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover
<p>Configuration d'un serveur cible de r&eacute;serve qui ne sera utilis&eacute; que si
aucun autre serveur cible n'est disponible</p>
<highlight language="config">
-ProxyPass / balancer://hotcluster/
+ProxyPass "/" "balancer://hotcluster/ "
&lt;Proxy balancer://hotcluster&gt;
BalancerMember ajp://1.2.3.4:8009 loadfactor=1
BalancerMember ajp://1.2.3.5:8009 loadfactor=2
@@ -1531,8 +1531,8 @@ RewriteCond %{HTTPS} =on
RewriteRule . - [E=protocol:https]
RewriteRule ^/mirror/foo/(.*) %{ENV:protocol}://backend.example.com/$1 [P]
-ProxyPassReverse /mirror/foo/ http://backend.example.com/
-ProxyPassReverse /mirror/foo/ https://backend.example.com/
+ProxyPassReverse "/mirror/foo/" "http://backend.example.com/"
+ProxyPassReverse "/mirror/foo/" "https://backend.example.com/"
</highlight>
</usage>
@@ -1565,7 +1565,7 @@ du serveur local en utilisant des expressions rationnelles</description>
<code>http://example.com/</code> ; alors</p>
<highlight language="config">
- ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com/$1
+ ProxyPassMatch "^(/.*\.gif)$" "http://backend.example.com/$1"
</highlight>
<p>va provoquer la conversion interne de la requ&ecirc;te locale
@@ -1578,14 +1578,15 @@ du serveur local en utilisant des expressions rationnelles</description>
doit aussi l'&ecirc;tre apr&egrave;s). Ceci limite les correspondances que vous
pouvez utiliser. Par exemple, si l'on avait utilis&eacute;</p>
<highlight language="config">
- ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com:8000$1
+ ProxyPassMatch "^(/.*\.gif)$"
+ "http://backend.example.com:8000$1"
</highlight>
<p>dans l'exemple pr&eacute;c&eacute;dent, nous aurions provoqu&eacute; une erreur de
syntaxe au d&eacute;marrage du serveur. C'est une bogue (PR 46665 dans
ASF bugzilla), et il est possible de la contourner en reformulant
la correspondance :</p>
<highlight language="config">
- ProxyPassMatch ^/(.*\.gif)$ http://backend.example.com:8000/$1
+ ProxyPassMatch "^/(.*\.gif)$" "http://backend.example.com:8000/$1"
</highlight>
</note>
@@ -1661,10 +1662,10 @@ par un serveur mandat&eacute; en inverse</description>
<code>http://example.com/</code> ; alors</p>
<highlight language="config">
-ProxyPass /mirror/foo/ http://backend.example.com/
-ProxyPassReverse /mirror/foo/ http://backend.example.com/
+ProxyPass "/mirror/foo/" "http://backend.example.com/"
+ProxyPassReverse "/mirror/foo/" "http://backend.example.com/"
ProxyPassReverseCookieDomain backend.example.com public.example.com
-ProxyPassReverseCookiePath / /mirror/foo/
+ProxyPassReverseCookiePath "/" "/mirror/foo/"
</highlight>
<p>ne va pas seulement provoquer la conversion interne d'une requ&ecirc;te
@@ -1758,7 +1759,7 @@ Dans l'exemple fourni avec la directive <directive
module="mod_proxy">ProxyPassReverse</directive>, la directive :
</p>
<highlight language="config">
- ProxyPassReverseCookiePath / /mirror/foo/
+ ProxyPassReverseCookiePath "/" "/mirror/foo/"
</highlight>
<p>
va r&eacute;&eacute;crire un cookie poss&eacute;dant un chemin d'arri&egrave;re-plan <code>/</code>