xforms

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

6 files changed, 8 insertions, 8 deletions

diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en
index 196fa88590..8e047d249c 100644
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -274,7 +274,7 @@ sections.</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authz_core</td></tr>
 </table>
     <p>When authorization is enabled, it is normally inherited by each
-    subsequent <a href="../sections.html#mergin">configuration section</a>,
+    subsequent <a href="../sections.html#merging">configuration section</a>,
     unless a different set of authorization directives are specified.
     This is the default action, which corresponds to an explicit setting
     of <code>AuthMerging Off</code>.</p>
@@ -491,7 +491,7 @@ Require group admin
 
     <p>When multiple <code class="directive">Require</code> directives are
     used in a single
-    <a href="../sections.html#mergin">configuration section</a>
+    <a href="../sections.html#merging">configuration section</a>
     and are not contained in another authorization directive like
     <code class="directive"><a href="#requireall">&lt;RequireAll&gt;</a></code>,
     they are implicitly contained within a
@@ -504,7 +504,7 @@ Require group admin
     <p>Exercise caution when setting authorization directives in
     <code class="directive"><a href="../mod/core.html#location">Location</a></code> sections
     that overlap with content served out of the filesystem.  
-    By default, these <a href="../sections.html#mergin">configuration sections</a> overwrite authorization configuration
+    By default, these <a href="../sections.html#merging">configuration sections</a> overwrite authorization configuration
     in <code class="directive"><a href="../mod/core.html#directory">Directory</a></code>,  
     and <code class="directive"><a href="../mod/core.html#files">Files</a></code> sections.</p>
     <p>The <code class="directive"><a href="#authmerging">AuthMerging</a></code> directive 
diff --git a/docs/manual/mod/mod_so.xml.fr b/docs/manual/mod/mod_so.xml.fr
index 0d30682abe..2a88fe92ee 100644
--- a/docs/manual/mod/mod_so.xml.fr
+++ b/docs/manual/mod/mod_so.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 : 1331227 -->
+<!-- English Revision: 1331227:1433861 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_so.xml.ja b/docs/manual/mod/mod_so.xml.ja
index 7427f96679..7d7d568db4 100644
--- a/docs/manual/mod/mod_so.xml.ja
+++ b/docs/manual/mod/mod_so.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:1331227 (outdated) -->
+<!-- English Revision: 420990:1433861 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_so.xml.ko b/docs/manual/mod/mod_so.xml.ko
index 9053f0887c..0d7c87c367 100644
--- a/docs/manual/mod/mod_so.xml.ko
+++ b/docs/manual/mod/mod_so.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:1331227 (outdated) -->
+<!-- English Revision: 420990:1433861 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_so.xml.meta b/docs/manual/mod/mod_so.xml.meta
index 62a027968f..f316185f2f 100644
--- a/docs/manual/mod/mod_so.xml.meta
+++ b/docs/manual/mod/mod_so.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>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/mod/mod_so.xml.tr b/docs/manual/mod/mod_so.xml.tr
index 44e1baea0b..5e63c02eeb 100644
--- a/docs/manual/mod/mod_so.xml.tr
+++ b/docs/manual/mod/mod_so.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: 1174747:1331227 (outdated) -->
+<!-- English Revision: 1174747:1433861 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>