From: Daniel Gruno <humbedooh@apache.org>
Date: Fri, 4 May 2012 06:57:58 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.5.0-alpha~6909
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11f3230110942f3c01e1a2c3dcc54b124503e59f;p=thirdparty%2Fapache%2Fhttpd.git

xforms

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

diff --git a/docs/manual/mod/mod_remoteip.html.en b/docs/manual/mod/mod_remoteip.html.en
index 383ede00e69..8233dd6fc64 100644
--- a/docs/manual/mod/mod_remoteip.html.en
+++ b/docs/manual/mod/mod_remoteip.html.en
@@ -165,8 +165,8 @@ via the request headers.
 
     <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
 RemoteIPHeader X-Client-IP
-RemoteIPTrustedProxy 10.0.2.0/24
-RemoteIPTrustedProxy gateway.localdomain
+RemoteIPInternalProxy 10.0.2.0/24
+RemoteIPInternalProxy gateway.localdomain
         </pre>
 </div>
 
@@ -188,10 +188,11 @@ RemoteIPTrustedProxy gateway.localdomain
     each whitespace or newline separated entry is processed identically to
     the <code class="directive">RemoteIPInternalProxy</code> directive.</p>
 
-    <div class="example"><h3>Internal (Load Balancer) Example</h3><p><code>
-        RemoteIPHeader X-Client-IP<br />
-        RemoteIPTrustedProxyList conf/trusted-proxies.lst
-    </code></p></div>
+    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
+RemoteIPHeader X-Client-IP
+RemoteIPInternalProxyList conf/trusted-proxies.lst
+        </pre>
+</div>
 
     <div class="example"><h3>conf/trusted-proxies.lst contents</h3><div class="example"><pre>
 # Our internally trusted proxies;
diff --git a/docs/manual/mod/mod_remoteip.html.fr b/docs/manual/mod/mod_remoteip.html.fr
index 1edcf9e3b8e..8297ff09013 100644
--- a/docs/manual/mod/mod_remoteip.html.fr
+++ b/docs/manual/mod/mod_remoteip.html.fr
@@ -153,13 +153,11 @@ du client</td></tr>
     <code class="directive">RemoteIPHeader</code> comme hôte de confiance.</p>
 
     <div class="example"><h3>Exemple à usage interne (répartiteur de
-    charge)</h3><p><code>
-        RemoteIPHeader X-Client-IP
-    </code></p></div>
+    charge)</h3><pre class="prettyprint lang-config">RemoteIPHeader X-Client-IP</pre>
+</div>
 
-    <div class="example"><h3>Exemple dans le cas d'un mandataire</h3><p><code>
-        RemoteIPHeader X-Forwarded-For
-    </code></p></div>
+    <div class="example"><h3>Exemple dans le cas d'un mandataire</h3><pre class="prettyprint lang-config">RemoteIPHeader X-Forwarded-For</pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -183,11 +181,12 @@ confiance pour pr
     sont indiquées par ces mandataires.</p>
 
     <div class="example"><h3>Exemple à usage interne (répartiteur de
-    charge)</h3><p><code>
-        RemoteIPHeader X-Client-IP<br />
-        RemoteIPTrustedProxy 10.0.2.0/24<br />
-        RemoteIPTrustedProxy passerelle.domaine-local
-    </code></p></div>
+    charge)</h3><pre class="prettyprint lang-config">
+RemoteIPHeader X-Client-IP
+RemoteIPInternalProxy 10.0.2.0/24
+RemoteIPInternalProxy passerelle.domaine-local
+    </pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -214,10 +213,11 @@ confiance pour pr
     <code class="directive">RemoteIPInternalProxy</code>.</p>
 
     <div class="example"><h3>Exemple à usage interne (répartiteur de
-    charge)</h3><p><code>
-        RemoteIPHeader X-Client-IP<br />
-        RemoteIPTrustedProxyList conf/mandataires-de-confiance.lst
-    </code></p></div>
+    charge)</h3><pre class="prettyprint lang-config">
+RemoteIPHeader X-Client-IP
+RemoteIPInternalProxyList conf/mandataires-de-confiance.lst
+    </pre>
+</div>
 
     <div class="example"><h3>contenu de conf/mandataires-de-confiance.lst</h3><p><code>
          # Nos mandataires internes de confiance<br />
@@ -245,10 +245,11 @@ adresses IP interm
     cet en-tête, alors que toute adresse intermédiaire
     <code class="directive">RemoteIPInternalProxy</code> est omise.</p>
 
-    <div class="example"><h3>Exemple</h3><p><code>
-        RemoteIPHeader X-Forwarded-For<br />
-        RemoteIPProxiesHeader X-Forwarded-By
-    </code></p></div>
+    <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPProxiesHeader X-Forwarded-By
+        </pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -275,11 +276,12 @@ confiance pour pr
     <code class="directive">RemoteIPHeader</code>.</p>
 
     <div class="example"><h3>Exemple d'adresse de confiance (répartiteur de
-    charge</h3><p><code>
-        RemoteIPHeader X-Forwarded-For<br />
-        RemoteIPTrustedProxy 10.0.2.16/28<br />
-        RemoteIPTrustedProxy proxy.example.com
-    </code></p></div>
+    charge</h3><pre class="prettyprint lang-config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxy 10.0.2.16/28
+RemoteIPTrustedProxy proxy.example.com
+        </pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -305,10 +307,11 @@ confiance pour pr
     <code class="directive">RemoteIPTrustedProxy</code>.</p>
 
     <div class="example"><h3>Exemple d'adresse de confiance (répartiteur de
-    charge</h3><p><code>
-        RemoteIPHeader X-Forwarded-For<br />
-        RemoteIPTrustedProxyList conf/mandataires-de-confiance.lst
-    </code></p></div>
+    charge</h3><pre class="prettyprint lang-config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxyList conf/mandataires-de-confiance.lst
+        </pre>
+</div>
 
     <div class="example"><h3>conf/mandataires-de-confiance.lst contents</h3><p><code>
        # Mandataires externes identifiés<br />
diff --git a/docs/manual/mod/mod_remoteip.xml.fr b/docs/manual/mod/mod_remoteip.xml.fr
index b5ff50265f8..0b0aba29f48 100644
--- a/docs/manual/mod/mod_remoteip.xml.fr
+++ b/docs/manual/mod/mod_remoteip.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: 1328333:1331219 (outdated) -->
+<!-- English Revision: 1333771 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->