Merge branch 'apache:trunk' into lock-token-length-check

Author: metsw24-max

docs/manual/mod/core.html.en.utf8

@@ -4109,6 +4109,10 @@ directory</td></tr>
     <p>The default in the absence of any other settings is
     <code>FollowSymlinks</code>.</p>
 
+    <p>When using the <code>All</code> and <code>None</code>, they must
+    be the first option listed. The + and - modifiers cannot be used with
+    the <code>All</code> and <code>None</code> options.</p>
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Protocol" id="Protocol">Protocol</a> <a name="protocol" id="protocol">Directive</a> <a title="Permanent link" href="#protocol" class="permalink">&para;</a></h2>

docs/manual/mod/core.html.fr.utf8

@@ -33,6 +33,8 @@
 <a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Fonctionnalités de base du serveur HTTP Apache toujours
 disponibles</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Noyau httpd</td></tr></table>

docs/manual/mod/core.xml

@@ -4119,6 +4119,10 @@ directory</description>
 
     <p>The default in the absence of any other settings is
     <code>FollowSymlinks</code>.</p>
+
+    <p>When using the <code>All</code> and <code>None</code>, they must
+    be the first option listed. The + and - modifiers cannot be used with
+    the <code>All</code> and <code>None</code> options.</p>
 </usage>
 </directivesynopsis>
 

docs/manual/mod/core.xml.de

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1932317 (outdated) -->
+<!-- English Revision: 344972:1932752 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/mod/core.xml.es

@@ -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.es.xsl"?>
-<!-- English Revision: 1741251:1932317 (outdated) -->
+<!-- English Revision: 1741251:1932752 (outdated) -->
 <!-- Translated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 <!-- Reviewed by Sergio Ramos-->
 <!--

docs/manual/mod/core.xml.fr

@@ -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.fr.xsl"?>
-<!-- English Revision: 1932317 -->
+<!-- English Revision: 1932317:1932752 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

docs/manual/mod/core.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: 669847:1932317 (outdated) -->
+<!-- English Revision: 669847:1932752 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/mod/core.xml.meta

@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">tr</variant>
   </variants>

docs/manual/mod/core.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: 1302855:1932317 (outdated) -->
+<!-- English Revision: 1302855:1932752 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

docs/manual/mod/mod_cache.html.en.utf8

@@ -662,6 +662,13 @@ header.</td></tr>
     <code class="directive"><a href="#cachedefaultexpire">CacheDefaultExpire</a></code> directive will be used to
     generate an expiration date.</p>
 
+    <div class="note">More precisely, a 200 OK response is only cached if it includes
+    at least one of the <code>Last-Modified</code>, <code>ETag</code>,
+    or <code>Expires</code> headers, or a <code>Cache-Control: max-age</code>
+    or <code>s-maxage</code> directive. This directive bypasses that
+    requirement entirely. When any of those headers are already present,
+    this directive has no effect.</div>
+
     <pre class="prettyprint lang-config">CacheIgnoreNoLastMod On</pre>