XML updates.

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

diff --git a/docs/manual/caching.xml.fr b/docs/manual/caching.xml.fr
index 43f4d9f407a14025734e999b38979a42fbb499fc..46d9041bd032a6d265d3334e8e4c713838e98324 100644 (file)
--- a/docs/manual/caching.xml.fr
+++ b/docs/manual/caching.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1766106 -->
+<!-- English Revision: 1836061 -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -366,8 +366,9 @@
         module="mod_cache">CacheEnable</directive> et <directive
         module="mod_cache">CacheDisable</directive>.</li>
 
-        <li>La reponse doit avoir un code de statut HTTP de 200, 203, 300, 301
-       ou 410.</li>
+        <li>Si la reponse possède un code de statut HTTP autre que 200, 203, 300, 301
+       ou 410, elle doit aussi comporter un en-tête "Expires" ou
+       "Cache-Control".</li>
 
         <li>La requête doit être de type HTTP GET.</li>
 

diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr
index 5b670cc0b876775191c0d93beae800621fbff560..a9d09bfe691c466f6bb06d12365ec92050d597e5 100644 (file)
--- a/docs/manual/expr.xml.fr
+++ b/docs/manual/expr.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision: 1834256 -->
+<!-- English Revision: 1836760 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -667,6 +667,10 @@ Header set foo-checksum "expr=%{md5:foo}"
 # &lt;If&gt;
 Header always set CustomHeader my-value "expr=%{REQUEST_URI} =~ m#^/special_path\.php$#"
 
+# Journalisation conditionnelle
+CustomLog logs/access-errors.log common "expr=%{REQUEST_STATUS} >= 400"
+CustomLog logs/access-errors-specific.log common "expr=%{REQUEST_STATUS} -in {'405','410'}"
+
        </highlight>
 </section>