From: Mike Rumph <mrumph@apache.org>
Date: Tue, 18 Aug 2015 18:48:34 +0000 (+0000)
Subject: Generated doc changes
X-Git-Tag: 2.5.0-alpha~2948
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17512740b32a12aac6575e9699cbdc56cf448671;p=apache

Generated doc changes

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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index b0dd888379..8abe679615 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -978,7 +978,7 @@ through</td></tr>
     setting <code>Max-Forwards</code> if the Client didn't set it.
     Earlier Apache httpd versions would always set it.  A negative
     <code class="directive">ProxyMaxForwards</code> value, including the
-    default -1, gives you protocol-compliant behavior, but may
+    default -1, gives you protocol-compliant behavior but may
     leave you open to loops.</p>
 
 </div>
@@ -995,7 +995,7 @@ through</td></tr>
 </table>
     <p>This directive allows remote servers to be mapped into the
     space of the local server. The local server does not act as a
-    proxy in the conventional sense, but appears to be a mirror of the
+    proxy in the conventional sense but appears to be a mirror of the
     remote server. The local server is often called a <dfn>reverse
     proxy</dfn> or <dfn>gateway</dfn>. The <var>path</var> is the name of
     a local virtual path; <var>url</var> is a partial URL for the
@@ -1195,7 +1195,7 @@ ProxyPass "/mirror/foo"   "http://backend.example.com"</pre>
     <tr><td>keepalive</td>
         <td>Off</td>
         <td><p>This parameter should be used when you have a firewall between your
-    Apache httpd and the backend server, which tend to drop inactive connections.
+    Apache httpd and the backend server, which tends to drop inactive connections.
     This flag will tell the Operating System to send <code>KEEP_ALIVE</code>
     messages on inactive connections and thus prevent the firewall 
     from dropping the connection. 
@@ -1716,7 +1716,7 @@ request</td></tr>
 context in 2.3.3 and later.</td></tr>
 </table>
     <p>When enabled, this option will pass the Host: line from the incoming
-    request to the proxied host instead of the hostname specified in the
+    request to the proxied host, instead of the hostname specified in the
     <code class="directive"><a href="#proxypass">ProxyPass</a></code> line.</p>
 
     <p>This option should normally be turned <code>Off</code>. It is mostly
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index acfeb62e76..169fd246b8 100644
--- a/docs/manual/mod/mod_proxy.xml.fr
+++ b/docs/manual/mod/mod_proxy.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: 1695913 -->
+<!-- English Revision: 1695913:1696480 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 1a4447b6b1..913c7a39c8 100644
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.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: 344971:1695913 (outdated) -->
+<!-- English Revision: 344971:1696480 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta
index 38a79fdda7..f0185375d4 100644
--- a/docs/manual/mod/mod_proxy.xml.meta
+++ b/docs/manual/mod/mod_proxy.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>