backport changes from trunk (r1336850) and rebuild

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

diff --git a/docs/manual/mod/event.xml.meta b/docs/manual/mod/event.xml.meta
index 58ce5cc07348893d2e89c5fca873b9f46374756e..7b7fc287cfe378466fec409610a1806ae8480e4e 100644 (file)
--- a/docs/manual/mod/event.xml.meta
+++ b/docs/manual/mod/event.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/mod_auth_form.html.en b/docs/manual/mod/mod_auth_form.html.en
index 46bbdf2b58425c63c2cc6f9a7c9c0197f49000c3..d885b9f8a4fc9b894ea2a7953074b2c0ca81f570 100644 (file)
--- a/docs/manual/mod/mod_auth_form.html.en
+++ b/docs/manual/mod/mod_auth_form.html.en
@@ -307,7 +307,7 @@ SessionCryptoPassphrase secret
 
       <div class="example"><h3>CGI example</h3><pre class="prettyprint lang-config">
         AuthFormProvider file
-        <strong>ErrorDocument 401 /cgi-bin/login.cgi</strong>
+        ErrorDocument 401 /cgi-bin/login.cgi
         ...
         </pre>
 </div>

diff --git a/docs/manual/mod/mod_authn_file.html.en b/docs/manual/mod/mod_authn_file.html.en
index 6133cc4693a1f9b15dde8d9b39169306b56c784e..404db1348d199bab24258bb3be8c9ee57360089a 100644 (file)
--- a/docs/manual/mod/mod_authn_file.html.en
+++ b/docs/manual/mod/mod_authn_file.html.en
@@ -87,11 +87,11 @@ passwords for authentication</td></tr>
     use the first occurrence to verify the password.</p>
 
     <p>The encrypted password format depends on which authentication
-    frontend (e.g. <code class="module"><a href="../mod/mod_authn_basic.html">mod_authn_basic</a></code> or
-    <code class="module"><a href="../mod/mod_authn_digest.html">mod_authn_digest</a></code>) is being used.  See <a href="../misc/password_encryptions.html">Password Formats</a> for
+    frontend (e.g. <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> or
+    <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>) is being used.  See <a href="../misc/password_encryptions.html">Password Formats</a> for
     more information.</p>
 
-    <p>For <code class="module"><a href="../mod/mod_authn_basic.html">mod_authn_basic</a></code>, use the utility <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code>
+    <p>For <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>, use the utility <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code>
     which is installed as part of the binary distribution, or which
     can be found in <code>src/support</code>. See the
     <a href="../programs/htpasswd.html">man page</a> for more details.

diff --git a/docs/manual/mod/mod_authn_file.xml b/docs/manual/mod/mod_authn_file.xml
index dd530946ff0aeb95ede87ae92f8ec6b9fca5b318..be76949882f60f0e71b236a7985527c57cc788d7 100644 (file)
--- a/docs/manual/mod/mod_authn_file.xml
+++ b/docs/manual/mod/mod_authn_file.xml
@@ -73,12 +73,12 @@ passwords for authentication</description>
     use the first occurrence to verify the password.</p>
 
     <p>The encrypted password format depends on which authentication
-    frontend (e.g. <module>mod_authn_basic</module> or
-    <module>mod_authn_digest</module>) is being used.  See <a
+    frontend (e.g. <module>mod_auth_basic</module> or
+    <module>mod_auth_digest</module>) is being used.  See <a
     href="../misc/password_encryptions.html">Password Formats</a> for
     more information.</p>
 
-    <p>For <module>mod_authn_basic</module>, use the utility <program>htpasswd</program>
+    <p>For <module>mod_auth_basic</module>, use the utility <program>htpasswd</program>
     which is installed as part of the binary distribution, or which
     can be found in <code>src/support</code>. See the
     <a href="../programs/htpasswd.html">man page</a> for more details.

diff --git a/docs/manual/mod/mod_authn_file.xml.fr b/docs/manual/mod/mod_authn_file.xml.fr
index c02eab0567a2ec792743537a700a12f26b358dde..275a78186591d29aac058f70aca1ea2d062331a2 100644 (file)
--- a/docs/manual/mod/mod_authn_file.xml.fr
+++ b/docs/manual/mod/mod_authn_file.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 : 1174747 -->
+<!-- English Revision: 1174747:1336850 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/mod_authn_file.xml.ja b/docs/manual/mod/mod_authn_file.xml.ja
index bcf8af726a0803753b7f330be8d342005afe2307..3d603f3e64af99c7ae515f2cc3445747bb018861 100644 (file)
--- a/docs/manual/mod/mod_authn_file.xml.ja
+++ b/docs/manual/mod/mod_authn_file.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: 420990:1174747 (outdated) -->
+<!-- English Revision: 420990:1336850 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_authn_file.xml.ko b/docs/manual/mod/mod_authn_file.xml.ko
index e1370695c748010c098183060a5e46a8655f44f4..70660ae2eb6428765bb449824cf0b0d9b6f74fdd 100644 (file)
--- a/docs/manual/mod/mod_authn_file.xml.ko
+++ b/docs/manual/mod/mod_authn_file.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:1174747 (outdated) -->
+<!-- English Revision: 105989:1336850 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_authn_file.xml.meta b/docs/manual/mod/mod_authn_file.xml.meta
index 636d190ee0f43ef107f4bda51b74a1052bcba300..c6d32df082640d6dbb55069b5b924269e7855e42 100644 (file)
--- a/docs/manual/mod/mod_authn_file.xml.meta
+++ b/docs/manual/mod/mod_authn_file.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>

diff --git a/docs/manual/mod/mod_cern_meta.html.en b/docs/manual/mod/mod_cern_meta.html.en
index c646b2422f50d53f88975157140ef64ef1ef57a0..43b1c48219e542af2c400dd5a860c929149d457c 100644 (file)
--- a/docs/manual/mod/mod_cern_meta.html.en
+++ b/docs/manual/mod/mod_cern_meta.html.en
@@ -118,9 +118,10 @@ meta information</td></tr>
     will use its contents to generate additional MIME header
     information.</p>
 
-    <div class="example"><h3>Example:</h3><p><code>
+    <div class="example"><h3>Example:</h3><pre class="prettyprint lang-config">
       MetaSuffix .meta
-    </code></p></div>
+     </pre>
+</div>
 
 </div>
 </div>

diff --git a/docs/manual/mod/mod_cern_meta.xml.ko b/docs/manual/mod/mod_cern_meta.xml.ko
index 6c18ae9559e1b49b7e664c5d9f3c8d7a41b7e740..f01f7bb859690a846b4ebdc5c8d28705b07115f6 100644 (file)
--- a/docs/manual/mod/mod_cern_meta.xml.ko
+++ b/docs/manual/mod/mod_cern_meta.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: 420990:1334011 (outdated) -->
+<!-- English Revision: 420990:1336591 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja
index 8a1f169696407d58ee127bbd128a898dd8676818..5e818b5ad8845c57ce3d0e3330844c0f1c7938e7 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml.ja
+++ b/docs/manual/mod/mod_proxy_balancer.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: 395228:1336501 (outdated) -->
+<!-- English Revision: 395228:1336502 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more