Documentation rebuild for mod_remoteip

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

diff --git a/docs/manual/mod/mod_remoteip.html.en b/docs/manual/mod/mod_remoteip.html.en
index 7da43c00900dc17ce55749048872acf507a5adc2..255ee5105aead6ee861c8102471726adc639b8d1 100644 (file)
--- a/docs/manual/mod/mod_remoteip.html.en
+++ b/docs/manual/mod/mod_remoteip.html.en
@@ -49,8 +49,8 @@ via the request headers.
 
     <p>Additionally, this module implements the server side of
     HAProxy's
-    <a href="http://blog.haproxy.com/haproxy/proxy-protocol/">Proxy Protocol</a> when
-    using the <code class="directive"><a href="#remoteipproxyprotocolenable">RemoteIPProxyProtocolEnable</a></code>
+    <a href="http://blog.haproxy.com/haproxy/proxy-protocol/">PROXY Protocol</a> when
+    using the <code class="directive"><a href="#remoteipproxyprotocol">RemoteIPProxyProtocol</a></code>
     directive.</p>
 
     <p>Once replaced as instructed, this overridden useragent IP address is
@@ -229,26 +229,26 @@ RemoteIPProxiesHeader X-Forwarded-By</pre>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="RemoteIPProxyProtocol" id="RemoteIPProxyProtocol">RemoteIPProxyProtocol</a> <a name="remoteipproxyprotocol" id="remoteipproxyprotocol">Directive</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable, optionally enable or disable the proxy protocol handling</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyProtocol On|Optional|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable, optionally enable or disable the PROXY protocol handling</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RemoteIPProxyProtocol On|Optional|Off</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_remoteip</td></tr>
 </table>
-    <p>The <code class="directive">RemoteIPProxyProtocolEnable</code> enables or 
-    disables the reading and handling of the proxy protocol connection header.
+    <p>The <code class="directive">RemoteIPProxyProtocol</code> enables or 
+    disables the reading and handling of the PROXY protocol connection header.
     If enabled with the <code>On</code> flag, the upstream client <em>must</em>
     send the header every time it opens a connection or the connection will
     be aborted. If enabled with the <code>Optional</code> flag, the upstream
     client <em>may</em> send the header.</p>
 
     <p>While this directive may be specified in any virtual host, it is
-    important to understand that because the proxy protocol is connection
+    important to understand that because the PROXY protocol is connection
     based and protocol agnostic, the enabling and disabling is actually based
     on ip-address and port. This means that if you have multiple name-based
     virtual hosts for the same host and port, and you enable it any one of
     them, then it is enabled for all them (with that host and port). It also
-    means that if you attempt to enable the proxy protocol in one and disable
+    means that if you attempt to enable the PROXY protocol in one and disable
     in the other, that won't work; in such a case the last one wins and a
     notice will be logged indicating which setting was being overridden.</p>
 
@@ -263,26 +263,26 @@ RemoteIPProxiesHeader X-Forwarded-By</pre>
     <pre class="prettyprint lang-config">Listen 80
 &lt;VirtualHost *:80&gt;
     ServerName www.example.com
-    RemoteIPProxyProtocolEnable Optional
+    RemoteIPProxyProtocol Optional
 
     #Requests to this virtual host may optionally not have
-    # a proxy protocol header provided
+    # a PROXY protocol header provided
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost *:80&gt;
     ServerName www.example.com
-    RemoteIPProxyProtocolEnable On
+    RemoteIPProxyProtocol On
 
-    #Requests to this virtual host must have a proxy protocol
+    #Requests to this virtual host must have a PROXY protocol
     # header provided. If it is missing, a 400 will result
 &lt;/VirtualHost&gt;
 
 Listen 8080
 &lt;VirtualHost *:8080&gt;
     ServerName www.example.com
-    RemoteIPProxyProtocolEnable On
+    RemoteIPProxyProtocol On
 
-    #Requests to this virtual host must have a proxy protocol
+    #Requests to this virtual host must have a PROXY protocol
     # header provided. If it is missing, the connection will
     # be aborted
 &lt;/VirtualHost&gt;</pre>

diff --git a/docs/manual/mod/mod_remoteip.xml.fr b/docs/manual/mod/mod_remoteip.xml.fr
index 6655e17feb786159d0d8f9f2fb516cfb6b464bfe..5456d48d23ffe3d58b6f22c652ba94a222dc9f4d 100644 (file)
--- a/docs/manual/mod/mod_remoteip.xml.fr
+++ b/docs/manual/mod/mod_remoteip.xml.fr
@@ -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.fr.xsl"?>
-<!-- English Revision: 1704683:1776578 (outdated) -->
+<!-- English Revision: 1704683:1776624 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->