XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1678385 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_authn_anon.xml.fr b/docs/manual/mod/mod_authn_anon.xml.fr
index 0e14dd5c66380daec389826438c724802fd930f0..655236cb65c5fe5572efe26755f84cdb6b73b6a2 100644 (file)
--- a/docs/manual/mod/mod_authn_anon.xml.fr
+++ b/docs/manual/mod/mod_authn_anon.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: 1334008:1673563 (outdated) -->
+<!-- English Revision: 1673563 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -90,11 +90,11 @@ prot&eacute;g&eacute;es</description>
 
     <example><title>Exemple</title>
       <highlight language="config">
-&lt;Directory /var/www/html/private&gt;
+&lt;Directory "/var/www/html/private"&gt;
     AuthName "Use 'anonymous' &amp; Email address for guest entry"
     AuthType Basic
     AuthBasicProvider file anon
-    AuthUserFile /path/to/your/.htpasswd
+    AuthUserFile "/path/to/your/.htpasswd"
 
     Anonymous_NoUserID off
     Anonymous_MustGiveEmail on

diff --git a/docs/manual/mod/mod_authn_core.xml.fr b/docs/manual/mod/mod_authn_core.xml.fr
index 4c5d1f059a3ec3b3fe247a0a56a811a124fb3f04..e0c45c9ae4aeac4273d9f885f895e2be0db3d122 100644 (file)
--- a/docs/manual/mod/mod_authn_core.xml.fr
+++ b/docs/manual/mod/mod_authn_core.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: 1613319:1674612 (outdated) -->
+<!-- English Revision: 1674612 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -64,15 +64,15 @@ d'authentification</title>
         <highlight language="config">
 # Premi&egrave;re v&eacute;rification
 &lt;AuthnProviderAlias file file1&gt;
-    AuthUserFile /www/conf/passwords1
+    AuthUserFile "/www/conf/passwords1"
 &lt;/AuthnProviderAlias&gt;
 
 # V&eacute;rification suivante
 &lt;AuthnProviderAlias file file2&gt;   
-    AuthUserFile /www/conf/passwords2
+    AuthUserFile "/www/conf/passwords2"
 &lt;/AuthnProviderAlias&gt;
 
-&lt;Directory /var/web/pages/secure&gt;
+&lt;Directory "/var/web/pages/secure"&gt;
     AuthBasicProvider file1 file2
     
     AuthType Basic
@@ -104,10 +104,8 @@ d'authentification</title>
     AuthLDAPURL ldap://other.ldap.host/o=dev?cn
 &lt;/AuthnProviderAlias&gt;
 
-Alias /secure /webpages/secure
-&lt;Directory /webpages/secure&gt;
-    Order deny,allow
-    Allow from all
+Alias "/secure" "/webpages/secure"
+&lt;Directory "/webpages/secure"&gt;
     
     AuthBasicProvider ldap-other-alias  ldap-alias1
     
@@ -202,15 +200,15 @@ l'authentification HTTP</description>
     <code>/www/docs/public</code> sans devoir s'authentifier :</p>
 
     <highlight language="config">
-&lt;Directory /www/docs&gt;
+&lt;Directory "/www/docs"&gt;
     AuthType Basic
     AuthName Documents
     AuthBasicProvider file
-    AuthUserFile /usr/local/apache/passwd/passwords
+    AuthUserFile "/usr/local/apache/passwd/passwords"
     Require valid-user
 &lt;/Directory&gt;
 
-&lt;Directory /www/docs/public&gt;
+&lt;Directory "/www/docs/public"&gt;
     AuthType None
     Require all granted
 &lt;/Directory&gt;

diff --git a/docs/manual/mod/mod_charset_lite.xml.fr b/docs/manual/mod/mod_charset_lite.xml.fr
index cb2c7bf6637bfe8d57b3687cecb8018cd93cc850..029d7fdf1d948e639fd627ae62a6ae6985a36a60 100644 (file)
--- a/docs/manual/mod/mod_charset_lite.xml.fr
+++ b/docs/manual/mod/mod_charset_lite.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: 1334011:1673563 (outdated) -->
+<!-- English Revision: 1673563 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -112,7 +112,7 @@ traductions ou les r&eacute;encodages</description>
 
     <example><title>Exemple</title>
       <highlight language="config">
-&lt;Directory /export/home/trawick/apacheinst/htdocs/convert&gt;
+&lt;Directory "/export/home/trawick/apacheinst/htdocs/convert"&gt;
     CharsetSourceEnc  UTF-16BE
     CharsetDefault    ISO-8859-1
 &lt;/Directory&gt;
@@ -156,7 +156,7 @@ s'effectuer</description>
 
     <example><title>Exemple</title>
       <highlight language="config">
-&lt;Directory /export/home/trawick/apacheinst/htdocs/convert&gt;
+&lt;Directory "/export/home/trawick/apacheinst/htdocs/convert"&gt;
     CharsetSourceEnc  UTF-16BE
     CharsetDefault    ISO-8859-1
 &lt;/Directory&gt;

diff --git a/docs/manual/mod/mod_data.xml.fr b/docs/manual/mod/mod_data.xml.fr
index b7037bdf251899260f79af6fc0bd4c43e1df2272..227d42b33592de37fa2beb49fc9c84a56ca69613 100644 (file)
--- a/docs/manual/mod/mod_data.xml.fr
+++ b/docs/manual/mod/mod_data.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: 1334011:1673563 (outdated) -->
+<!-- English Revision: 1673563 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -61,7 +61,7 @@
 
     <example><title>Configuration du filtre</title>
         <highlight language="config">
-&lt;Location /data/images&gt;
+&lt;Location "/data/images"&gt;
     SetOutputFilter DATA
 &lt;/Location&gt;
         </highlight>

diff --git a/docs/manual/mod/mod_logio.xml.fr b/docs/manual/mod/mod_logio.xml.fr
index 77f61a2a14e339630342c043bd737cd05c48663b..70b8fa3f2e32659aeeb06160064d60f75cea1d78 100644 (file)
--- a/docs/manual/mod/mod_logio.xml.fr
+++ b/docs/manual/mod/mod_logio.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: 1588345:1674532 (outdated) -->
+<!-- English Revision : 1674532 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/mod_mime.xml.fr b/docs/manual/mod/mod_mime.xml.fr
index 48e7148b938ca97ddebb05a0ad52bd49fe600a38..72b0d815a28fa3fffc0ca9368992ed6e5b7dc768 100644 (file)
--- a/docs/manual/mod/mod_mime.xml.fr
+++ b/docs/manual/mod/mod_mime.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: 1421892:1675432 (outdated) -->
+<!-- English Revision: 1675432 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -154,7 +154,7 @@ multiples</title>
     <example><title>Configuration du gestionnaire en se basant seulement
     sur la derni&egrave;re extension</title>
     <highlight language="config">
-&lt;FilesMatch \.cgi$&gt;
+&lt;FilesMatch "[^.]+\.cgi$"&gt;
   SetHandler cgi-script
 &lt;/FilesMatch&gt;
     </highlight>
@@ -549,19 +549,19 @@ serveur</description>
     <highlight language="config">
 # Filtre sp&eacute;cifi&eacute; "DEFLATE"
 AddOutputFilter DEFLATE shtml
-&lt;Location /foo&gt;
+&lt;Location "/foo"&gt;
   # Filtre sp&eacute;cifi&eacute; "INCLUDES", remplace "DEFLATE"
   AddOutputFilter INCLUDES shtml
 &lt;/Location&gt;
-&lt;Location /bar&gt;
+&lt;Location "/bar"&gt;
   # Filtre sp&eacute;cifi&eacute; "INCLUDES;DEFLATE", remplace "DEFLATE"
   AddOutputFilter INCLUDES;DEFLATE shtml
 &lt;/Location&gt;
-&lt;Location /bar/baz&gt;
+&lt;Location "/bar/baz"&gt;
   # Filtre sp&eacute;cifi&eacute; "BUFFER", remplace "INCLUDES;DEFLATE"
   AddOutputFilter BUFFER shtml
 &lt;/Location&gt;
-&lt;Location /bar/baz/buz&gt;
+&lt;Location "/bar/baz/buz"&gt;
   # Pas de filtre sp&eacute;cifi&eacute;, suppression de "BUFFER"
   RemoveOutputFilter shtml
 &lt;/Location&gt;
@@ -641,6 +641,22 @@ contenu sp&eacute;cifi&eacute;</description>
     lesquelles le g&eacute;n&eacute;rateur de la r&eacute;ponse sp&eacute;cifie en g&eacute;n&eacute;ral un
     Content-Type, cette directive n'a aucun effet.</p>
 
+    <note><title>Note</title>
+    <p>Lorsqu'aucune directive comme <directive
+    module="core">SetHandler</directive> ou
+    <directive>module="mod_mime">AddHandler</directive> ne s'applique &agrave;
+    une requ&ecirc;te, le nom de gestionnaire interne qui aurait du &ecirc;tre
+    d&eacute;fini par une de ces directives correspond alors au type de contenu
+    sp&eacute;cifi&eacute; par la directive AddType.
+    Pour des raisons historiques, certains modules tiers comme mod_php
+    peuvent rechercher un type de contenu "synth&eacute;tique" ne servant qu'&agrave;
+    forcer le module &agrave; prendre en compte la requ&ecirc;te concern&eacute;e.
+    Il est conseill&eacute; d'&eacute;viter les configurations qui reposent sur de
+    tels types "synth&eacute;tiques" en utilisant les directives <directive
+    module="core">SetHandler</directive> ou <directive
+    module="mod_mime">AddHandler</directive>.</p>
+    </note>
+
 </usage>
 <seealso><directive module="core">ForceType</directive></seealso>
 <seealso><module>mod_negotiation</module></seealso>
@@ -845,7 +861,7 @@ ensemble d'extensions de noms de fichiers</description>
       <highlight language="config">
 AddEncoding x-gzip .gz
 AddType text/plain .asc
-&lt;Files *.gz.asc&gt;
+&lt;Files "*.gz.asc"&gt;
     RemoveEncoding .gz
 &lt;/Files&gt;
       </highlight>

diff --git a/docs/manual/mod/mod_proxy_balancer.xml.fr b/docs/manual/mod/mod_proxy_balancer.xml.fr
index 7a066f3dba74d61659423da85d0872e984594f1b..30c379f19137495cabb178a415c1d40dba4f040d 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml.fr
+++ b/docs/manual/mod/mod_proxy_balancer.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: 1660188:1673563 (outdated) -->
+<!-- English Revision: 1673563 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -107,12 +107,12 @@ la r&eacute;partition de charge</description>
     </p>
 
     <highlight language="config">
-&lt;Proxy balancer://mycluster&gt;
-    BalancerMember http://192.168.1.50:80
-    BalancerMember http://192.168.1.51:80
+&lt;Proxy "balancer://mycluster"&gt;
+    BalancerMember "http://192.168.1.50:80"
+    BalancerMember "http://192.168.1.51:80"
 &lt;/Proxy&gt;
-ProxyPass /test balancer://mycluster
-ProxyPassReverse /test balancer://mycluster
+ProxyPass "/test" "balancer://mycluster"
+ProxyPassReverse "/test" "balancer://mycluster"
     </highlight>
 
 
@@ -124,13 +124,13 @@ ProxyPassReverse /test balancer://mycluster
 
     <highlight language="config">
 Header add Set-Cookie "ROUTEID=.%{BALANCER_WORKER_ROUTE}e; path=/" env=BALANCER_ROUTE_CHANGED
-&lt;Proxy balancer://mycluster&gt;
-    BalancerMember http://192.168.1.50:80 route=1
-    BalancerMember http://192.168.1.51:80 route=2
+&lt;Proxy "balancer://mycluster"&gt;
+    BalancerMember "http://192.168.1.50:80" route=1
+    BalancerMember "http://192.168.1.51:80" route=2
     ProxySet stickysession=ROUTEID
 &lt;/Proxy&gt;
-ProxyPass /test balancer://mycluster
-ProxyPassReverse /test balancer://mycluster
+ProxyPass "/test" "balancer://mycluster"
+ProxyPassReverse "/test" "balancer://mycluster"
     </highlight>
 
 </section>
@@ -213,7 +213,7 @@ ProxyPassReverse /test balancer://mycluster
     navigateurs appartenant au domaine example.com, ajoutez ces lignes &agrave;
     votre fichier de configuration <code>httpd.conf</code> :</p>
 <highlight language="config">
-&lt;Location /balancer-manager&gt;
+&lt;Location "/balancer-manager"&gt;
     SetHandler balancer-manager
     Require host example.com
 &lt;/Location&gt;
@@ -288,10 +288,10 @@ ProxyPassReverse /test balancer://mycluster
     s&eacute;par&eacute;s par une barre verticale (<code>|</code>) comme dans
     l'exemple suivant :</p>
     <highlight language="config">
-ProxyPass /test balancer://mycluster stickysession=JSESSIONID|jsessionid scolonpathdelim=On
-&lt;Proxy balancer://mycluster&gt;
-    BalancerMember http://192.168.1.50:80 route=node1
-    BalancerMember http://192.168.1.51:80 route=node2
+ProxyPass "/test" "balancer://mycluster" stickysession=JSESSIONID|jsessionid scolonpathdelim=On
+&lt;Proxy "balancer://mycluster"&gt;
+    BalancerMember "http://192.168.1.50:80" route=node1
+    BalancerMember "http://192.168.1.51:80" route=node2
 &lt;/Proxy&gt;
     </highlight>
     <p>Si le cookie et le param&egrave;tre de requ&ecirc;te fournissent tous deux une

diff --git a/docs/manual/mod/mod_proxy_express.xml.fr b/docs/manual/mod/mod_proxy_express.xml.fr
index 1e2efbd7cebc3806c752316128b7c7624a1657f3..4cbd92aeaa0ec90bef6a54c3711165075e1b86a6 100644 (file)
--- a/docs/manual/mod/mod_proxy_express.xml.fr
+++ b/docs/manual/mod/mod_proxy_express.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: 1598284:1673563 (outdated) -->
+<!-- English Revision: 1673563 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -69,8 +69,8 @@ dynamique inverse de masse</description>
       <highlight language="config">
 &lt;VirtualHost *:80&gt;
    ServerName front.end.server
-   ProxyPass / back.end.server:port
-   ProxyPassReverse / back.end.server:port
+   ProxyPass "/" "back.end.server:port"
+   ProxyPassReverse "/" "back.end.server:port"
 &lt;/VirtualHost&gt;
       </highlight>
       En d'autres termes, l'URL dans son ensemble est ajoutée à l'URL