From: Jim Jagielski <jim@apache.org>
Date: Tue, 13 Dec 2016 14:29:41 +0000 (+0000)
Subject: xform
X-Git-Tag: 2.5.0-alpha~914
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f06fac5b154dfd597b712f77c8b98d850aeb30e6;p=thirdparty%2Fapache%2Fhttpd.git

xform


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

diff --git a/docs/manual/mod/mod_proxy_express.html.en b/docs/manual/mod/mod_proxy_express.html.en
index 649da68f383..1130b58c69f 100644
--- a/docs/manual/mod/mod_proxy_express.html.en
+++ b/docs/manual/mod/mod_proxy_express.html.en
@@ -43,7 +43,7 @@
     than <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>, which also provides
     dynamic growth, but is intended to handle much, much
     larger numbers of backends. It is ideally suited as a
-    front-end HTTP switch.</p>
+    front-end HTTP switch and for micro-services architectures.</p>
 
     <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>.</p>
 
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index fb72e31d5ce..dc449070c04 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -257,7 +257,7 @@ AuthUserFile /example.com/conf/users.passwd
 AuthName secure
 &lt;RequireAll&gt;
   Require valid-user
-  require ip 127.0.0.1
+  Require ip 127.0.0.1
 &lt;/RequireAll&gt;</pre>
 </div>
 
diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr
index f115b639e9c..5a3aa230d1e 100644
--- a/docs/manual/upgrading.html.fr
+++ b/docs/manual/upgrading.html.fr
@@ -26,6 +26,8 @@
 <p><span>Langues Disponibles: </span><a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/upgrading.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>
 
   <p>Afin d'assister les utilisateurs lors de leurs opérations de mise à
   jour, nous maintenons un document
diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr
index 15adde3d30e..86c4acb2c0e 100644
--- a/docs/manual/upgrading.xml.fr
+++ b/docs/manual/upgrading.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1738217 -->
+<!-- English Revision: 1738217:1772763 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index aba29996bbd..1d2a68a225a 100644
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>