From: Daniel Gruno <humbedooh@apache.org>
Date: Fri, 4 May 2012 06:55:50 +0000 (+0000)
Subject: Change RemoteIPTrustedProxy to RemoteIPInternalProxy.
X-Git-Tag: 2.5.0-alpha~6910
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=315a8f7db399a9df5de6678bd26effc2e3095e20;p=thirdparty%2Fapache%2Fhttpd.git

Change RemoteIPTrustedProxy to RemoteIPInternalProxy.
Thanks to Ken Dreyer for this fix.

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

diff --git a/docs/manual/mod/mod_remoteip.xml b/docs/manual/mod/mod_remoteip.xml
index 63634e3769f..bb764d33eb6 100644
--- a/docs/manual/mod/mod_remoteip.xml
+++ b/docs/manual/mod/mod_remoteip.xml
@@ -148,8 +148,8 @@ via the request headers.
     <example><title>Internal (Load Balancer) Example</title>
     <highlight language="config">
 RemoteIPHeader X-Client-IP
-RemoteIPTrustedProxy 10.0.2.0/24
-RemoteIPTrustedProxy gateway.localdomain
+RemoteIPInternalProxy 10.0.2.0/24
+RemoteIPInternalProxy gateway.localdomain
         </highlight>
     </example>
 </usage>
@@ -171,8 +171,10 @@ RemoteIPTrustedProxy gateway.localdomain
     the <directive>RemoteIPInternalProxy</directive> directive.</p>
 
     <example><title>Internal (Load Balancer) Example</title>
-        RemoteIPHeader X-Client-IP<br/>
-        RemoteIPTrustedProxyList conf/trusted-proxies.lst
+        <highlight language="config">
+RemoteIPHeader X-Client-IP
+RemoteIPInternalProxyList conf/trusted-proxies.lst
+        </highlight>
     </example>
 
     <example><title>conf/trusted-proxies.lst contents</title>
diff --git a/docs/manual/mod/mod_remoteip.xml.fr b/docs/manual/mod/mod_remoteip.xml.fr
index d70b60e27d9..b5ff50265f8 100644
--- a/docs/manual/mod/mod_remoteip.xml.fr
+++ b/docs/manual/mod/mod_remoteip.xml.fr
@@ -138,11 +138,11 @@ du client</description>
 
     <example><title>Exemple &agrave; usage interne (r&eacute;partiteur de
     charge)</title>
-        RemoteIPHeader X-Client-IP
+    <highlight language="config">RemoteIPHeader X-Client-IP</highlight>
     </example>
 
     <example><title>Exemple dans le cas d'un mandataire</title>
-        RemoteIPHeader X-Forwarded-For
+        <highlight language="config">RemoteIPHeader X-Forwarded-For</highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -167,9 +167,11 @@ confiance pour pr&eacute;senter la valeur RemoteIPHeader</description>
 
     <example><title>Exemple &agrave; usage interne (r&eacute;partiteur de
     charge)</title>
-        RemoteIPHeader X-Client-IP<br/>
-        RemoteIPTrustedProxy 10.0.2.0/24<br/>
-        RemoteIPTrustedProxy passerelle.domaine-local
+    <highlight language="config">
+RemoteIPHeader X-Client-IP
+RemoteIPInternalProxy 10.0.2.0/24
+RemoteIPInternalProxy passerelle.domaine-local
+    </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -197,8 +199,10 @@ confiance pour pr&eacute;senter la valeur RemoteIPHeader</description>
 
     <example><title>Exemple &agrave; usage interne (r&eacute;partiteur de
     charge)</title>
-        RemoteIPHeader X-Client-IP<br/>
-        RemoteIPTrustedProxyList conf/mandataires-de-confiance.lst
+    <highlight language="config">
+RemoteIPHeader X-Client-IP
+RemoteIPInternalProxyList conf/mandataires-de-confiance.lst
+    </highlight>
     </example>
 
     <example><title>contenu de conf/mandataires-de-confiance.lst</title>
@@ -227,8 +231,10 @@ adresses IP interm&eacute;diaires</description>
     <directive>RemoteIPInternalProxy</directive> est omise.</p>
 
     <example><title>Exemple</title>
-        RemoteIPHeader X-Forwarded-For<br/>
-        RemoteIPProxiesHeader X-Forwarded-By
+        <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPProxiesHeader X-Forwarded-By
+        </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -256,9 +262,11 @@ confiance pour pr&eacute;senter la valeur RemoteIPHeader</description>
 
     <example><title>Exemple d'adresse de confiance (r&eacute;partiteur de
     charge</title>
-        RemoteIPHeader X-Forwarded-For<br/>
-        RemoteIPTrustedProxy 10.0.2.16/28<br/>
-        RemoteIPTrustedProxy proxy.example.com
+        <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxy 10.0.2.16/28
+RemoteIPTrustedProxy proxy.example.com
+        </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -285,8 +293,10 @@ confiance pour pr&eacute;senter la valeur RemoteIPHeader</description>
 
     <example><title>Exemple d'adresse de confiance (r&eacute;partiteur de
     charge</title>
-        RemoteIPHeader X-Forwarded-For<br/>
-        RemoteIPTrustedProxyList conf/mandataires-de-confiance.lst
+        <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxyList conf/mandataires-de-confiance.lst
+        </highlight>
     </example>
 
     <example><title>conf/mandataires-de-confiance.lst contents</title>