Rebuild html, metadata

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1932815 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.html.en.utf8 b/docs/manual/mod/core.html.en.utf8
index 3d8af2778a0d7f4f775c029f1442b8a1d70aee4b..95ecffa12d110630945a08555be6a1d66b842546 100644 (file)
--- a/docs/manual/mod/core.html.en.utf8
+++ b/docs/manual/mod/core.html.en.utf8
@@ -611,6 +611,11 @@ NoDecode option available in 2.3.12 and later.</td></tr>
     ignored.  In this case, the server will not even attempt to read
     <code>.htaccess</code> files in the filesystem.</p>
 
+    <div class="note">
+    <p>A value of <code>None</code> cannot be combined with other values. 
+    Doing so will result in an error that aborts config parsing.</p>
+    </div>
+
     <p>Example:</p>
 
     <pre class="prettyprint lang-config">AllowOverride None

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 7a1b0cd864355f2e40aeb472da6440f5b45b2737..304675b795855783e204f2f08fc64b91a908fd9b 100644 (file)
--- a/docs/manual/mod/core.xml.de
+++ b/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:1932797 (outdated) -->
+<!-- English Revision: 344972:1932811 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index 883eea3d774e4badcac5122fbca317923572cf02..5973964ddd75525427808b7f9e31c3869d0e793a 100644 (file)
--- a/docs/manual/mod/core.xml.es
+++ b/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:1932797 (outdated) -->
+<!-- English Revision: 1741251:1932811 (outdated) -->
 <!-- Translated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
 <!-- Reviewed by Sergio Ramos-->
 <!--

diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index 333de82c295555c3c1b4e421c0e3749a5bbe0328..a7542c7914a4ae5e9bc631d599ddc3c8fe2191b7 100644 (file)
--- a/docs/manual/mod/core.xml.fr
+++ b/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:1932797 (outdated) -->
+<!-- English Revision: 1932317:1932811 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index f47d97fafd80d9195d8ddc8fead3b827ca85b176..184bc1cc72d47719136698b79e8a13bb8791f468 100644 (file)
--- a/docs/manual/mod/core.xml.ja
+++ b/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:1932797 (outdated) -->
+<!-- English Revision: 669847:1932811 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index e9997d7ad99bc75972f27bc947b1628ab7c28691..195a46bdc18b4a24446c53215850050979f801ec 100644 (file)
--- a/docs/manual/mod/core.xml.tr
+++ b/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:1932797 (outdated) -->
+<!-- English Revision: 1302855:1932811 (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_log_config.html.en.utf8 b/docs/manual/mod/mod_log_config.html.en.utf8
index 97624423815b4e1a8292571a37318b1f00b1df90..fbdfd57f549f96fb64b45b2d6ab9f0871bf3613a 100644 (file)
--- a/docs/manual/mod/mod_log_config.html.en.utf8
+++ b/docs/manual/mod/mod_log_config.html.en.utf8
@@ -177,7 +177,9 @@
         <td>The query string (prepended with a <code>?</code> if a query
         string exists, otherwise an empty string).</td></tr>
 <tr><td><code>%r</code></td>
-        <td>First line of request.</td></tr>
+        <td>First line of request. Does not adhere to 
+        <code class="directive"><a href="../mod/core.html#mergeslashes">MergeSlashes</a></code>. (i.e. no merging
+        even if ON)</td></tr>
 <tr class="odd"><td><code>%R</code></td>
         <td>The handler generating the response (if any).</td></tr>
 <tr><td><code>%s</code></td>
@@ -236,7 +238,9 @@
         <td>Remote user if the request was authenticated. May be bogus if return status
         (<code>%s</code>) is 401 (unauthorized).</td></tr>
 <tr><td><code>%U</code></td>
-        <td>The URL path requested, not including any query string.</td></tr>
+        <td>The URL path requested, not including any query string. 
+        Adheres to <code class="directive"><a href="../mod/core.html#mergeslashes">MergeSlashes</a></code>.
+        (i.e. slashes are merged if <code>ON</code>)</td></tr>
 <tr class="odd"><td><code>%v</code></td>
         <td>The canonical <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
         of the server serving the request.</td></tr>

diff --git a/docs/manual/mod/mod_log_config.xml.fr b/docs/manual/mod/mod_log_config.xml.fr
index f6b2516ca9e1136ead71376ff57bc3c40c445700..3d66588fa6351d74f030d8b18b3665f6a2d7a5c3 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" encoding="UTF-8"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1900557:1932803 (outdated) -->
+<!-- English Revision: 1900557:1932809 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index 640a95d9a2bf14adf810f25d1cb24559dcf329fa..1d0927163ed8cb4baa90527d610df2dfce60f5bd 100644 (file)
--- 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:1932803 (outdated) -->
+<!-- English Revision: 579425:1932809 (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 816e2d045c9c1ae0787399fe65843760cde0a1e1..ddeb7603501a0860f20cd0352238ab5991717a2f 100644 (file)
--- 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:1932803 (outdated) -->
+<!-- English Revision: 105989:1932809 (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 ab958b5b2db9d4e1a47be5d8f94be2b8dc066ec6..283139fd1080d18a82231382f982bc2b6052c841 100644 (file)
--- 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:1932803 (outdated) -->
+<!-- English Revision: 1310330:1932809 (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_mime.html.en.utf8 b/docs/manual/mod/mod_mime.html.en.utf8
index 36705496ab0c9d1e4974767fb47373635b7bd8c2..c12c07d73f433b6f12f699caeb5115f0546fa9b5 100644 (file)
--- a/docs/manual/mod/mod_mime.html.en.utf8
+++ b/docs/manual/mod/mod_mime.html.en.utf8
@@ -156,12 +156,13 @@
     <p>If you would prefer only the last dot-separated part of the
     filename to be mapped to a particular piece of meta-data, then do
     not use the <code>Add*</code> directives. For example, if you wish
-    to have the file <code>foo.html.cgi</code> processed as a CGI
-    script, but not the file <code>bar.cgi.html</code>, then instead
-    of using <code>AddHandler cgi-script .cgi</code>, use</p>
+    to have the file <code>foo.html.asis</code> served by the <code>send-as-is</code>
+    handler provided by <code class="module"><a href="../mod/mod_asis.html">mod_asis</a></code>
+    script, but not the file <code>bar.asis.html</code>, then instead
+    of using <code>AddHandler send-asis .asis</code>, use</p>
 
-    <div class="example"><h3>Configure handler based on final extension only</h3><pre class="prettyprint lang-config">&lt;FilesMatch "[^.]+\.cgi$"&gt;
-  SetHandler cgi-script
+    <div class="example"><h3>Configure handler based on final extension only</h3><pre class="prettyprint lang-config">&lt;FilesMatch "[^.]+\.asis$"&gt;
+  SetHandler send-asis
 &lt;/FilesMatch&gt;</pre>
 </div>
 
@@ -361,16 +362,13 @@ handler</td></tr>
     <p>Files having the name <var>extension</var> will be served by the
     specified <var><a href="../handler.html">handler-name</a></var>. This
     mapping is added to any already in force, overriding any mappings that
-    already exist for the same <var>extension</var>. For example, to
-    activate CGI scripts with the file extension <code>.cgi</code>, you
-    might use:</p>
+    already exist for the same <var>extension</var>. For example, to associate 
+    <code>.var</code> files with the <code>type-map</code> handler provided by
+    <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>, you might use:</p>
 
-    <pre class="prettyprint lang-config">AddHandler cgi-script .cgi</pre>
+    <pre class="prettyprint lang-config">AddHandler type-map .var</pre>
 
 
-    <p>Once that has been put into your httpd.conf file, any file containing
-    the <code>.cgi</code> extension will be treated as a CGI program.</p>
-
     <p>The <var>extension</var> argument is case-insensitive and can
     be specified with or without a leading dot. Filenames may have <a href="#multipleext">multiple extensions</a> and the
     <var>extension</var> argument will be compared against each of

diff --git a/docs/manual/mod/mod_mime.html.fr.utf8 b/docs/manual/mod/mod_mime.html.fr.utf8
index 8b8d0dfa48a0a5f25fd5c527243d22d9c4e36b6b..1d55bb24d68573bce22e39b75c5268c5a93b4320 100644 (file)
--- a/docs/manual/mod/mod_mime.html.fr.utf8
+++ b/docs/manual/mod/mod_mime.html.fr.utf8
@@ -30,6 +30,8 @@
 <a href="../fr/mod/mod_mime.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/mod/mod_mime.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&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>Associe les extensions des fichiers demandés avec l'action
 déclenchée par ces fichiers et avec leur contenu (type MIME, langage,
 jeu de caractère et codage)</td></tr>

diff --git a/docs/manual/mod/mod_mime.xml.fr b/docs/manual/mod/mod_mime.xml.fr
index c1bc0d80e2befb46ada9a277590bf5fcc477d65d..a295e611111390e8246d8fc1ed75535fe5b8f7f6 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" encoding="UTF-8"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1924775 -->
+<!-- English Revision: 1924775:1932814 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 
 <!--

diff --git a/docs/manual/mod/mod_mime.xml.ja b/docs/manual/mod/mod_mime.xml.ja
index c83ef1df7b1e44234fb89ebe13fcfaf2a7a2004e..49a54ff2bfdc53c6a6d076c9e27ab4af70be9090 100644 (file)
--- a/docs/manual/mod/mod_mime.xml.ja
+++ b/docs/manual/mod/mod_mime.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: 659902:1924775 (outdated) -->
+<!-- English Revision: 659902:1932814 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_mime.xml.meta b/docs/manual/mod/mod_mime.xml.meta
index b01d57d49d68735668f0ff03b563252b87720368..043b7c05326b6999b414a4ac0e20adb4b30574e7 100644 (file)
--- a/docs/manual/mod/mod_mime.xml.meta
+++ b/docs/manual/mod/mod_mime.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/mod_ssl.html.en.utf8 b/docs/manual/mod/mod_ssl.html.en.utf8
index 9a339f80d9cda722b4676e024b9d485ac7cec7a1..6ac849d330417b09c3c87a36ed41cf1bb16b7d3e 100644 (file)
--- a/docs/manual/mod/mod_ssl.html.en.utf8
+++ b/docs/manual/mod/mod_ssl.html.en.utf8
@@ -1768,7 +1768,7 @@ The available (case-insensitive) <em>protocol</em>s are:</p>
     <p>
     This is a shortcut for ``<code>+SSLv3 +TLSv1</code>'' or
     - when using OpenSSL 1.0.1 and later -
-    ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>'', respectively
+    ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2 +TLSv1.3</code>'', respectively
     (except for OpenSSL versions compiled with the ``no-ssl3'' configuration
     option, where <code>all</code> does not include <code>+SSLv3</code>).</p></li>
 </ul>

diff --git a/docs/manual/mod/mod_ssl.xml.es b/docs/manual/mod/mod_ssl.xml.es
index 16f2d8de607fffef7ee3f765cb25aa258f97cf70..15361150cfcd2e833bb4dcafe634eb72833f351e 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml.es
+++ b/docs/manual/mod/mod_ssl.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1817381:1932748 (outdated) -->
+<!-- English Revision: 1817381:1932807 (outdated) -->
 <!-- Spanish Translation: Daniel Ferradal <dferradal@apache.org> -->
 <!-- Updated and reviewed: Luis Gil de bernabe <lgilbernabe@apache.org> -->
 

diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr
index 436d52bb90b462f1a58819a7d11e685460910b60..fa9caa4485936b39d3161326b1060656c20bc8d8 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml.fr
+++ b/docs/manual/mod/mod_ssl.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: 1932312:1932748 (outdated) -->
+<!-- English Revision: 1932312:1932807 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->