XML updates.

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

diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr
index bbecffc504bca177be01c87472ab1d964b7a412d..40793f7d5c21222bfa789c4945251db70c6684d1 100644 (file)
--- a/docs/manual/expr.xml.fr
+++ b/docs/manual/expr.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision: 1689815:1721979 (outdated) -->
+<!-- English Revision: 1721979 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -619,6 +619,10 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 # Function example in string context
 Header set foo-checksum "expr=%{md5:foo}"
 
+# L'exemple suivant retarde l'&eacute;valuation de la clause de condition par rapport &agrave;
+# &lt;If&gt;
+Header always set CustomHeader my-value "expr=%{REQUEST_URI} =~ m#^/special_path.php$#"
+
        </highlight>
 </section>
 

diff --git a/docs/manual/misc/password_encryptions.xml.fr b/docs/manual/misc/password_encryptions.xml.fr
index f4538030a00072950b6870c96147cb2b7c280ba3..aba2c1ca621044dc2467773196896b199d878d45 100644 (file)
--- a/docs/manual/misc/password_encryptions.xml.fr
+++ b/docs/manual/misc/password_encryptions.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1420732:1721976 (outdated) -->
+<!-- English Revision: 1721976 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- $LastChangedRevision: 2013010601 $ -->
 

diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index 37de4b76463d23fb7b05005a93c96beab80d4d4a..f31201a736606da6ef2116bf01b35781637c1a4f 100644 (file)
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/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: 1712268:1722608 (outdated) -->
+<!-- English Revision: 1722608 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/mod_headers.xml.fr b/docs/manual/mod/mod_headers.xml.fr
index f51965b65120bd46f350dfc9baac8556b9af4c4f..c667ac2865e49cf3a8f08ca0e7990f9c961705c0 100644 (file)
--- a/docs/manual/mod/mod_headers.xml.fr
+++ b/docs/manual/mod/mod_headers.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: 1643445:1721979 (outdated) -->
+<!-- English Revision: 1721979 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -607,7 +607,13 @@ version 2.4.10</compatibility>
     <dd>La directive s'applique si et seulement si <var>expression</var>
     est &eacute;valu&eacute;e &agrave; true. Vous trouverez plus de d&eacute;tails &agrave; propos de la
     syntaxe et de l'&eacute;valuation des expressions dans la documentation <a
-    href="../expr.html">ap_expr</a>.</dd>
+    href="../expr.html">ap_expr</a>.
+    <example>
+         # Cet exemple retarde l'&eacute;valuation de la clause de condition par
+        # rapport &agrave; &lt;If&gt;
+         Header always set CustomHeader my-value "expr=%{REQUEST_URI} =~ m#^/special_path.php$#"
+        </example>
+    </dd>
     </dl>
 
     <p>Except&eacute; le cas du mode <a href="#early">pr&eacute;coce</a>, les

diff --git a/docs/manual/mod/mod_log_config.xml.fr b/docs/manual/mod/mod_log_config.xml.fr
index 5a74a0146cd42cde619fe6e3fb540417e1212175..77c6e7670a19817e5f85fd7c79a1ea83c05ddedc 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.fr
+++ b/docs/manual/mod/mod_log_config.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: 1681106:1722340 (outdated) -->
+<!-- English Revision: 1722340 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -643,4 +643,31 @@ TransferLog logs/access_log
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>GlobalLog</name>
+<description>D&eacute;finit le nom et le format du fichier journal</description>
+<syntax>GlobalLog  <var>file</var>|<var>pipe</var>|<var>provider</var>
+<var>format</var>|<var>nickname</var>
+[env=[!]<var>environment-variable</var>|
+expr=<var>expression</var>]</syntax>
+<contextlist><context>server config</context>
+</contextlist>
+
+<usage>
+
+    <p>La directive <directive>GlobalLog</directive> permet de sp&eacute;cifier un
+    journal partag&eacute; entre le serveur principal et tous les serveurs virtuels
+    d&eacute;finis.</p>
+
+    <p>Elle est identique &agrave; la directive <directive>CustomLog</directive> &agrave; ces
+    diff&eacute;rences pr&egrave;s : </p>
+    <ul>
+       <li>Elle n'est pas valide dans un contexte de serveur virtuel.</li>
+       <li>A la diff&eacute;rence d'une directive <directive>CustomLog</directive>
+       d&eacute;finie globalement, elle est prise en compte par les serveurs virtuels
+       qui d&eacute;finissent leur propre directive <directive>CustomLog</directive>.</li>
+    </ul>
+</usage>
+</directivesynopsis>
+
 </modulesynopsis>

diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr
index 41bea1efe25b376abb7ea13182f7305df016ffe2..30ce2294e3b9bf5fa708b0337e5bc8faf7bcd2cc 100644 (file)
--- a/docs/manual/rewrite/flags.xml.fr
+++ b/docs/manual/rewrite/flags.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1701409:1721962 (outdated) -->
+<!-- English Revision: 1721962 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -243,9 +243,9 @@ fonctionnement des variables d'environnement.</p>
 
 <p>La syntaxe compl&egrave;te pour ce drapeau est :</p>
 
-<example>
+<highlight language="config">
 [E=!VAR]
-</example>
+</highlight>
 
 <p><code>VAL</code> peut comporter des r&eacute;f&eacute;rences arri&egrave;res
 (<code>$N</code> ou <code>%N</code>) qui seront d&eacute;velopp&eacute;es.</p>