From fd03095d60a76a5b130674e34c688440a5d88b1a Mon Sep 17 00:00:00 2001
From: Rainer Jung <rjung@apache.org>
Date: Sun, 24 Feb 2013 19:32:21 +0000
Subject: [PATCH] Update xforms.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1449536 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/index.html.de            |  3 +++
 docs/manual/index.html.fr            |  2 ++
 docs/manual/index.html.tr.utf8       |  1 +
 docs/manual/index.html.zh-cn         |  1 +
 docs/manual/index.xml.de             |  2 +-
 docs/manual/index.xml.es             |  2 +-
 docs/manual/index.xml.fr             |  2 +-
 docs/manual/index.xml.ja             |  2 +-
 docs/manual/index.xml.ko             |  2 +-
 docs/manual/index.xml.meta           |  8 ++++----
 docs/manual/index.xml.pt-br          |  2 +-
 docs/manual/index.xml.tr             |  2 +-
 docs/manual/index.xml.zh-cn          |  2 +-
 docs/manual/mod/mod_rewrite.html.fr  | 13 +++++++++++--
 docs/manual/mod/mod_rewrite.xml.meta |  2 +-
 15 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/docs/manual/index.html.de b/docs/manual/index.html.de
index 678be5ab6bc..b851220a4d1 100644
--- a/docs/manual/index.html.de
+++ b/docs/manual/index.html.de
@@ -35,6 +35,9 @@
 <a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="./zh-cn/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+            die neuesten Änderungen.</div>
 <form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google-Suche" type="submit" /><input value="10" name="num" type="hidden" /><input value="de" name="hl" type="hidden" /><input value="ISO-8859-1" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Version 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Hinweise zur Version</a></h2>
 <ul><li><a href="new_features_2_2.html">Neue Funktionen in Version 2.1/2.2</a></li>
diff --git a/docs/manual/index.html.fr b/docs/manual/index.html.fr
index c002f20eabd..fecd573a750 100644
--- a/docs/manual/index.html.fr
+++ b/docs/manual/index.html.fr
@@ -35,6 +35,8 @@
 <a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="./zh-cn/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&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>
 <form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Recherche Google" type="submit" /><input value="10" name="num" type="hidden" /><input value="fr" name="hl" type="hidden" /><input value="ISO-8859-1" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Version 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Notes de version</a></h2>
 <ul><li><a href="new_features_2_2.html">Nouvelles fonctionnalités d'Apache 2.1/2.2</a></li>
diff --git a/docs/manual/index.html.tr.utf8 b/docs/manual/index.html.tr.utf8
index 869679f666d..b56e3c53ed1 100644
--- a/docs/manual/index.html.tr.utf8
+++ b/docs/manual/index.html.tr.utf8
@@ -35,6 +35,7 @@ Belgeleri</h1>
 <a href="./tr/" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="./zh-cn/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
 <form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google’de Ara" type="submit" /><input value="10" name="num" type="hidden" /><input value="tr" name="hl" type="hidden" /><input value="UTF-8" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Sürüm 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Sürümlerin Dağıtım Bilgileri</a></h2>
 <ul><li><a href="new_features_2_2.html">Apache 2.1/2.2’deki yeni özellikler</a></li>
diff --git a/docs/manual/index.html.zh-cn b/docs/manual/index.html.zh-cn
index 7aeb391c8ed..9161b48e914 100644
--- a/docs/manual/index.html.zh-cn
+++ b/docs/manual/index.html.zh-cn
@@ -33,6 +33,7 @@
 <a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="./zh-cn/" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">此翻译可能过期。要了解最近的更改，请阅读英文版。</div>
 <form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google 搜索" type="submit" /><input value="10" name="num" type="hidden" /><input value="zh-cn" name="hl" type="hidden" /><input value="UTF-8" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="版本 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">发行说明</a></h2>
 <ul><li><a href="new_features_2_2.html">Apache 2.1/2.2 的新特性</a></li>
diff --git a/docs/manual/index.xml.de b/docs/manual/index.xml.de
index 72b6864d52e..720fb0351d1 100644
--- a/docs/manual/index.xml.de
+++ b/docs/manual/index.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 1044382 -->
+<!-- English Revision: 1044382:1449511 (outdated) -->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
diff --git a/docs/manual/index.xml.es b/docs/manual/index.xml.es
index 184ca461338..d24d0437848 100644
--- a/docs/manual/index.xml.es
+++ b/docs/manual/index.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 105989:1044382 (outdated) -->
+<!-- English Revision: 105989:1449511 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.fr b/docs/manual/index.xml.fr
index 7bb112450ed..4727a97b8ea 100644
--- a/docs/manual/index.xml.fr
+++ b/docs/manual/index.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English revision : 1044382 -->
+<!-- English Revision: 1044382:1449511 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja
index 9d9dc0d67d4..4f5afba3c7e 100644
--- a/docs/manual/index.xml.ja
+++ b/docs/manual/index.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 421100:1044382 (outdated) -->
+<!-- English Revision: 421100:1449511 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.ko b/docs/manual/index.xml.ko
index d62eff131fc..c54c68cdd61 100644
--- a/docs/manual/index.xml.ko
+++ b/docs/manual/index.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1044382 (outdated) -->
+<!-- English Revision: 105989:1449511 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.meta b/docs/manual/index.xml.meta
index cbf59a54af8..95d391c05ba 100644
--- a/docs/manual/index.xml.meta
+++ b/docs/manual/index.xml.meta
@@ -7,14 +7,14 @@
   <relpath>.</relpath>
 
   <variants>
-    <variant>de</variant>
+    <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">ko</variant>
     <variant outdated="yes">pt-br</variant>
-    <variant>tr</variant>
-    <variant>zh-cn</variant>
+    <variant outdated="yes">tr</variant>
+    <variant outdated="yes">zh-cn</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/index.xml.pt-br b/docs/manual/index.xml.pt-br
index 44523ca65c2..a42bf54d89a 100644
--- a/docs/manual/index.xml.pt-br
+++ b/docs/manual/index.xml.pt-br
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:1044382 (outdated) -->
+<!-- English Revision: 151408:1449511 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.tr b/docs/manual/index.xml.tr
index 7aafd36e5b5..838a51985f7 100644
--- a/docs/manual/index.xml.tr
+++ b/docs/manual/index.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1044382 -->
+<!-- English Revision: 1044382:1449511 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/index.xml.zh-cn b/docs/manual/index.xml.zh-cn
index 1d15e1083ef..cc9aa0630e3 100644
--- a/docs/manual/index.xml.zh-cn
+++ b/docs/manual/index.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE indexpage SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.zh-cn.xsl"?>
-<!-- English revision : 1044382 -->
+<!-- English Revision: 1044382:1449511 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_rewrite.html.fr b/docs/manual/mod/mod_rewrite.html.fr
index 7254da75372..afd9a19902e 100644
--- a/docs/manual/mod/mod_rewrite.html.fr
+++ b/docs/manual/mod/mod_rewrite.html.fr
@@ -27,8 +27,6 @@
 <p><span>Langues Disponibles: </span><a href="../en/mod/mod_rewrite.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/mod/mod_rewrite.html" title="Français">&nbsp;fr&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>Ce module fournit un moteur de réécriture à base de
 règles permettant de réécrire les URLs des requêtes
 à la volée</td></tr>
@@ -1181,7 +1179,18 @@ la version version 2.1</td></tr>
       l'URI transformé, comme indiqué dans les CVE ci-dessus.</p>
       </div>
       </dd>
+	
+	<dt><code>MergeBase</code></dt>
+      <dd>
 
+      <p>Avec cette option, la valeur de <code class="directive"><a href="#rewritebase">RewriteBase</a></code> est copiée depuis une
+      origine explicitement définie dans tout sous-répertoire qui ne
+      définit pas sa propre <code class="directive"><a href="#rewritebase">RewriteBase</a></code>. Par défaut, jusqu'à
+      la version 2.2.22, cette valeur n'était pas copiée, alors qu'elle
+      l'était avec la version 2.2.23 du serveur HTTP Apache. Le drapeau
+      permettant de contrôler explicitement ce comportement est
+      disponible depuis la version 2.2.24.</p>
+      </dd>
      </dl>
 
 
diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta
index 0be21e86f4d..decc0a7b1e8 100644
--- a/docs/manual/mod/mod_rewrite.xml.meta
+++ b/docs/manual/mod/mod_rewrite.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>
-- 
2.47.3