httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject svn commit: r1334039 [10/23] - in /httpd/httpd/branches/2.4.x/docs/manual: ./ developer/ howto/ misc/ mod/ platform/ programs/ rewrite/ ssl/ vhosts/
Date Fri, 04 May 2012 15:45:38 GMT
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en Fri May  4 15:45:05 2012
@@ -196,21 +196,21 @@
     <p>In addition, if you wish to have caching enabled, consult
     the documentation from <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
 
-    <div class="example"><h3>Reverse Proxy</h3><p><code>
-    ProxyPass /foo http://foo.example.com/bar<br />
-    ProxyPassReverse /foo http://foo.example.com/bar
-    </code></p></div>
+    <div class="example"><h3>Reverse Proxy</h3><pre class="prettyprint lang-config">
+ProxyPass /foo http://foo.example.com/bar
+ProxyPassReverse /foo http://foo.example.com/bar
+    </pre>
+</div>
 
-    <div class="example"><h3>Forward Proxy</h3><p><code>
-    ProxyRequests On<br />
-    ProxyVia On<br />
-    <br />
-    &lt;Proxy *&gt;<br />
-    <span class="indent">
-      Require host internal.example.com<br />
-    </span>
-    &lt;/Proxy&gt;
-    </code></p></div>
+    <div class="example"><h3>Forward Proxy</h3><pre class="prettyprint lang-config">
+ProxyRequests On
+ProxyVia On
+
+&lt;Proxy *&gt;
+  Require host internal.example.com
+&lt;/Proxy&gt;
+    </pre>
+</div>
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="workers" id="workers">Workers</a></h2>
@@ -232,29 +232,30 @@
       <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code> when used
       for a reverse proxy:</p>
 
-      <div class="example"><p><code>
+      <pre class="prettyprint lang-config">
           ProxyPass /example http://backend.example.com connectiontimeout=5 timeout=30
-      </code></p></div>
+      </pre>
+
 
       <p>This will create a worker associated with the origin server URL
       <code>http://backend.example.com</code> and using the given timeout
       values. When used in a forward proxy, workers are usually defined
       via the <code class="directive"><a href="#proxyset">ProxySet</a></code> directive:</p>
 
-      <div class="example"><p><code>
+      <pre class="prettyprint lang-config">
           ProxySet http://backend.example.com connectiontimeout=5 timeout=30
-      </code></p></div>
+      </pre>
+
 
       <p>or alternatively using <code class="directive"><a href="#proxy">Proxy</a></code>
       and <code class="directive"><a href="#proxyset">ProxySet</a></code>:</p>
 
-      <div class="example"><p><code>
-        &lt;Proxy http://backend.example.com&gt;<br />
-        <span class="indent">
-          ProxySet connectiontimeout=5 timeout=30
-        </span>
-        &lt;/Proxy&gt;
-      </code></p></div>
+      <pre class="prettyprint lang-config">
+&lt;Proxy http://backend.example.com&gt;
+  ProxySet connectiontimeout=5 timeout=30
+&lt;/Proxy&gt;
+      </pre>
+
 
       <p>Using explicitly configured workers in the forward mode is
       not very common, because forward proxies usually communicate with many
@@ -270,10 +271,11 @@
       <p>The URL identifying a direct worker is the URL of its
       origin server including any path components given:</p>
 
-      <div class="example"><p><code>
-          ProxyPass /examples http://backend.example.com/examples<br />
-          ProxyPass /docs http://backend.example.com/docs
-      </code></p></div>
+     <pre class="prettyprint lang-config">
+ProxyPass /examples http://backend.example.com/examples
+ProxyPass /docs http://backend.example.com/docs
+      </pre>
+
 
       <p>This example defines two different workers, each using a separate
       connection pool and configuration.</p>
@@ -283,10 +285,11 @@
         the URL of some worker is a leading substring of the URL of another
         worker defined later in the configuration file. In the following example</p>
 
-        <div class="example"><p><code>
-            ProxyPass /apps http://backend.example.com/ timeout=60<br />
-            ProxyPass /examples http://backend.example.com/examples timeout=10
-        </code></p></div>
+        <pre class="prettyprint lang-config">
+ProxyPass /apps http://backend.example.com/ timeout=60
+ProxyPass /examples http://backend.example.com/examples timeout=10
+        </pre>
+
 
         <p>the second worker isn't actually created. Instead the first
         worker is used. The benefit is, that there is only one connection pool,
@@ -332,13 +335,12 @@
       <p>You can control who can access your proxy via the <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> control block as in
       the following example:</p>
 
-      <div class="example"><p><code>
-        &lt;Proxy *&gt;<br />
-        <span class="indent">
-          Require ip 192.168.0<br />
-        </span>
-        &lt;/Proxy&gt;
-      </code></p></div>
+      <pre class="prettyprint lang-config">
+&lt;Proxy *&gt;
+  Require ip 192.168.0
+&lt;/Proxy&gt;
+      </pre>
+
 
       <p>For more information on access control directives, see
       <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.</p>
@@ -395,15 +397,14 @@
       <p>These are the <code>force-proxy-request-1.0</code> and
       <code>proxy-nokeepalive</code> notes.</p>
 
-      <div class="example"><p><code>
-        &lt;Location /buggyappserver/&gt;<br />
-        <span class="indent">
-          ProxyPass http://buggyappserver:7001/foo/<br />
-          SetEnv force-proxy-request-1.0 1<br />
-          SetEnv proxy-nokeepalive 1<br />
-        </span>
-        &lt;/Location&gt;
-      </code></p></div>
+      <pre class="prettyprint lang-config">
+&lt;Location /buggyappserver/&gt;
+  ProxyPass http://buggyappserver:7001/foo/
+  SetEnv force-proxy-request-1.0 1
+  SetEnv proxy-nokeepalive 1
+&lt;/Location&gt;
+        </pre>
+
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -526,10 +527,11 @@ directly</td></tr>
     always served directly, without forwarding to the configured
     <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> proxy server(s).</p>
 
-    <div class="example"><h3>Example</h3><p><code>
-      ProxyRemote  *  http://firewall.example.com:81<br />
-      NoProxy         .example.com 192.168.112.0/21
-    </code></p></div>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
+ProxyRemote  *  http://firewall.example.com:81
+NoProxy         .example.com 192.168.112.0/21
+    </pre>
+</div>
 
     <p>The <var>host</var> arguments to the <code class="directive">NoProxy</code>
     directive are one of the following type list:</p>
@@ -651,25 +653,23 @@ directly</td></tr>
     <code>yournetwork.example.com</code> to access content via your proxy
     server:</p>
 
-    <div class="example"><p><code>
-      &lt;Proxy *&gt;<br />
-      <span class="indent">
-        Require host yournetwork.example.com<br />
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+&lt;Proxy *&gt;
+  Require host yournetwork.example.com
+&lt;/Proxy&gt;
+    </pre>
+
 
     <p>The following example will process all files in the <code>foo</code>
     directory of <code>example.com</code> through the <code>INCLUDES</code>
     filter when they are sent through the proxy server:</p>
 
-    <div class="example"><p><code>
-      &lt;Proxy http://example.com/foo/*&gt;<br />
-      <span class="indent">
-        SetOutputFilter INCLUDES<br />
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
+   <pre class="prettyprint lang-config">    
+&lt;Proxy http://example.com/foo/*&gt;
+  SetOutputFilter INCLUDES
+&lt;/Proxy&gt;
+    </pre>
+
 
 
 <h3>See also</h3>
@@ -746,9 +746,10 @@ proxied</td></tr>
     may be hostnames during startup, and cache them for match test as
     well. That may slow down the startup time of the server.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       ProxyBlock news.example.com auctions.example.com friends.example.com
-    </code></p></div>
+      </pre>
+</div>
 
     <p>Note that <code>example</code> would also be sufficient to match any
     of these sites.</p>
@@ -757,9 +758,10 @@ proxied</td></tr>
 
     <p>Note also that</p>
 
-    <div class="example"><p><code>
+    <pre class="prettyprint lang-config">
       ProxyBlock *
-    </code></p></div>
+    </pre>
+
 
     <p>blocks connections to all sites.</p>
 
@@ -780,11 +782,12 @@ proxied</td></tr>
     response to the same host with the configured <var>Domain</var> appended
     will be generated.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       ProxyRemote  *  http://firewall.example.com:81<br />
       NoProxy         .example.com 192.168.112.0/21<br />
       ProxyDomain     .example.com
-    </code></p></div>
+      </pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -873,9 +876,10 @@ through</td></tr>
     <code>Max-Forwards</code> header supplied with the request. This may
     be set to prevent infinite proxy loops, or a DoS attack.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       ProxyMaxForwards 15
-    </code></p></div>
+      </pre>
+</div>
 
     <p>Note that setting <code class="directive">ProxyMaxForwards</code> is a
     violation of the HTTP/1.1 protocol (RFC2616), which forbids a Proxy
@@ -911,13 +915,12 @@ through</td></tr>
     <p>Suppose the local server has address <code>http://example.com/</code>;
     then</p>
 
-    <div class="example"><p><code>
-        &lt;Location /mirror/foo/&gt;<br />
-        <span class="indent">
-          ProxyPass http://backend.example.com/<br />
-        </span>
-        &lt;/Location&gt;<br />
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+&lt;Location /mirror/foo/&gt;
+    ProxyPass http://backend.example.com/
+&lt;/Location&gt;
+    </pre>
+
 
     <p>will cause a local request for
     <code>http://example.com/mirror/foo/bar</code> to be internally converted
@@ -928,9 +931,10 @@ through</td></tr>
     the below syntax is that it allows for dynamic control via the
     <a href="mod_proxy_balancer.html#balancer_manager">Balancer Manager</a> interface:</p>
 
-    <div class="example"><p><code>
+    <pre class="prettyprint lang-config">
         ProxyPass /mirror/foo/ http://backend.example.com/
-    </code></p></div>
+    </pre>
+
 
     <div class="warning">
     <p>If the first argument ends with a trailing <strong>/</strong>, the second
@@ -943,23 +947,21 @@ through</td></tr>
     <p>The <code>!</code> directive is useful in situations where you don't want
     to reverse-proxy a subdirectory, <em>e.g.</em></p>
 
-    <div class="example"><p><code>
-        &lt;Location /mirror/foo/&gt;<br />
-        <span class="indent">
-          ProxyPass http://backend.example.com/<br />
-        </span>
-        &lt;/Location&gt;<br />
-        &lt;Location /mirror/foo/i&gt;<br />
-        <span class="indent">
-            ProxyPass !<br />
-        </span>
-        &lt;/Location&gt;<br />
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+&lt;Location /mirror/foo/&gt;
+    ProxyPass http://backend.example.com/
+&lt;/Location&gt;
+&lt;Location /mirror/foo/i&gt;
+    ProxyPass !
+&lt;/Location&gt;
+    </pre>
+
+
+    <pre class="prettyprint lang-config">
+ProxyPass /mirror/foo/i !
+ProxyPass /mirror/foo http://backend.example.com
+    </pre>
 
-    <div class="example"><p><code>
-      ProxyPass /mirror/foo/i !<br />
-      ProxyPass /mirror/foo http://backend.example.com
-    </code></p></div>
 
     <p>will proxy all requests to <code>/mirror/foo</code> to
     <code>backend.example.com</code> <em>except</em> requests made to
@@ -1270,33 +1272,31 @@ through</td></tr>
 
     </table>
     <p>A sample balancer setup</p>
-    <div class="example"><p><code>
-      ProxyPass /special-area http://special.example.com smax=5 max=10<br />
-      ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On<br />
-      &lt;Proxy balancer://mycluster&gt;<br />
-      <span class="indent">
-        BalancerMember ajp://1.2.3.4:8009<br />
-        BalancerMember ajp://1.2.3.5:8009 loadfactor=20<br />
-        # Less powerful server, don't send as many requests there,<br />
-        BalancerMember ajp://1.2.3.6:8009 loadfactor=5<br />
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+ProxyPass /special-area http://special.example.com smax=5 max=10
+ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
+&lt;Proxy balancer://mycluster&gt;
+    BalancerMember ajp://1.2.3.4:8009
+    BalancerMember ajp://1.2.3.5:8009 loadfactor=20
+    # Less powerful server, don't send as many requests there,
+    BalancerMember ajp://1.2.3.6:8009 loadfactor=5
+&lt;/Proxy&gt;
+    </pre>
+
 
     <p>Setting up a hot-standby, that will only be used if no other
      members are available</p>
-    <div class="example"><p><code>
-      ProxyPass / balancer://hotcluster/ <br />
-      &lt;Proxy balancer://hotcluster&gt;<br />
-      <span class="indent">
-        BalancerMember ajp://1.2.3.4:8009 loadfactor=1<br />
-        BalancerMember ajp://1.2.3.5:8009 loadfactor=2<br />
-        # The below is the hot standby<br />
-        BalancerMember ajp://1.2.3.6:8009 status=+H<br />
-        ProxySet lbmethod=bytraffic
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+ProxyPass / balancer://hotcluster/ 
+&lt;Proxy balancer://hotcluster&gt;
+    BalancerMember ajp://1.2.3.4:8009 loadfactor=1
+    BalancerMember ajp://1.2.3.5:8009 loadfactor=2
+    # The server below is on hot standby
+    BalancerMember ajp://1.2.3.6:8009 status=+H
+    ProxySet lbmethod=bytraffic
+&lt;/Proxy&gt;
+    </pre>
+
 
     <p>Normally, mod_proxy will canonicalise ProxyPassed URLs.
     But this may be incompatible with some backends, particularly those
@@ -1381,9 +1381,10 @@ through</td></tr>
     <p>Suppose the local server has address <code>http://example.com/</code>;
     then</p>
 
-    <div class="example"><p><code>
+    <pre class="prettyprint lang-config">
       ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com$1
-    </code></p></div>
+    </pre>
+
 
     <p>will cause a local request for
     <code>http://example.com/foo/bar.gif</code> to be internally converted
@@ -1392,15 +1393,17 @@ through</td></tr>
       <p>The URL argument must be parsable as a URL <em>before</em> regexp
       substitutions (as well as after).  This limits the matches you can use.
       For instance, if we had used</p>
-      <div class="example"><p><code>
+      <pre class="prettyprint lang-config">
         ProxyPassMatch ^(/.*\.gif)$ http://backend.example.com:8000$1
-      </code></p></div>
+      </pre>
+
       <p>in our previous example, it would fail with a syntax error
       at server startup.  This is a bug (PR 46665 in the ASF bugzilla),
       and the workaround is to reformulate the match:</p>
-      <div class="example"><p><code>
+      <pre class="prettyprint lang-config">
         ProxyPassMatch ^/(.*\.gif)$ http://backend.example.com:8000/$1
-      </code></p></div>
+      </pre>
+
     </div>
     <p>The <code>!</code> directive is useful in situations where you don't want
     to reverse-proxy a subdirectory.</p>
@@ -1455,12 +1458,13 @@ proxied server</td></tr>
     <p>For example, suppose the local server has address
     <code>http://example.com/</code>; then</p>
 
-    <div class="example"><p><code>
-      ProxyPass         /mirror/foo/ http://backend.example.com/<br />
-      ProxyPassReverse  /mirror/foo/ http://backend.example.com/<br />
-      ProxyPassReverseCookieDomain  backend.example.com  public.example.com<br />
-      ProxyPassReverseCookiePath  /  /mirror/foo/
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+ProxyPass         /mirror/foo/ http://backend.example.com/
+ProxyPassReverse  /mirror/foo/ http://backend.example.com/
+ProxyPassReverseCookieDomain  backend.example.com  public.example.com
+ProxyPassReverseCookiePath  /  /mirror/foo/
+    </pre>
+
 
     <p>will not only cause a local request for the
     <code>http://example.com/mirror/foo/bar</code> to be internally converted
@@ -1533,9 +1537,10 @@ reverse proxy. This directive rewrites t
 In the example given with 
 <code class="directive"><a href="#proxypassreverse">ProxyPassReverse</a></code>, the directive:
 </p>
-    <div class="example"><p><code>
+    <pre class="prettyprint lang-config">
       ProxyPassReverseCookiePath  /  /mirror/foo/
-    </code></p></div>
+    </pre>
+
 <p>
 will rewrite a cookie with backend path <code>/</code> (or
 <code>/example</code> or, in fact, anything) to <code>/mirror/foo/</code>.
@@ -1582,9 +1587,10 @@ connections</td></tr>
     to <code>0</code> to indicate that the system's default buffer size should
     be used.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       ProxyReceiveBufferSize 2048
-    </code></p></div>
+      </pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1612,11 +1618,12 @@ connections</td></tr>
     are supported by this module. When using <code>https</code>, the requests
     are forwarded through the remote proxy using the HTTP CONNECT method.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
-      ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000<br />
-      ProxyRemote * http://cleverproxy.localdomain<br />
-      ProxyRemote ftp http://ftpproxy.mydomain:8080
-    </code></p></div>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
+ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000
+ProxyRemote * http://cleverproxy.localdomain
+ProxyRemote ftp http://ftpproxy.mydomain:8080
+    </pre>
+</div>
 
     <p>In the last example, the proxy will forward FTP requests, encapsulated
     as yet another HTTP proxy request, to another proxy which can handle
@@ -1696,31 +1703,31 @@ expressions</td></tr>
     <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> instead of a
     <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive.</p>
 
-    <div class="example"><p><code>
-      &lt;Proxy balancer://hotcluster&gt;<br />
-      <span class="indent">
-        BalancerMember http://www2.example.com:8080 loadfactor=1<br />
-        BalancerMember http://www3.example.com:8080 loadfactor=2<br />
-        ProxySet lbmethod=bytraffic<br />
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
+    <div class="example"><pre class="prettyprint lang-config">
+&lt;Proxy balancer://hotcluster&gt;
+    BalancerMember http://www2.example.com:8080 loadfactor=1
+    BalancerMember http://www3.example.com:8080 loadfactor=2
+    ProxySet lbmethod=bytraffic
+&lt;/Proxy&gt;
+      </pre>
+</div>
+
+    <pre class="prettyprint lang-config">
+&lt;Proxy http://backend&gt;
+    ProxySet keepalive=On
+&lt;/Proxy&gt;
+    </pre>
 
-    <div class="example"><p><code>
-      &lt;Proxy http://backend&gt;<br />
-      <span class="indent">
-        ProxySet keepalive=On<br />
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
 
-    <div class="example"><p><code>
+    <pre class="prettyprint lang-config">
         ProxySet balancer://foo lbmethod=bytraffic timeout=15
-    </code></p></div>
+    </pre>
 
-    <div class="example"><p><code>
+
+    <pre class="prettyprint lang-config">
         ProxySet ajp://backend:7001 timeout=15
-    </code></p></div>
+    </pre>
+
 
    <div class="warning"><h3>Warning</h3>
       <p>Keep in mind that the same parameter key can have a different meaning

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.fr Fri May  4 15:45:05 2012
@@ -28,6 +28,8 @@
 <a href="../fr/mod/mod_proxy.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/mod/mod_proxy.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&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>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Serveur mandataire/passerelle multi-protocole</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>proxy_module</td></tr>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr Fri May  4 15:45:05 2012
@@ -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 : 1307835 -->
+<!-- English Revision: 1307835:1334022 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja [utf-8] Fri May  4 15:45:05 2012
@@ -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:1307835 (outdated) -->
+<!-- English Revision: 344971:1334022 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta Fri May  4 15:45:05 2012
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ajp.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ajp.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ajp.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ajp.html.en Fri May  4 15:45:05 2012
@@ -72,21 +72,21 @@
     (e.g. Apache Tomcat) using the AJP13 protocol. The usage is similar to
     an HTTP reverse proxy, but uses the <code>ajp://</code> prefix:</p>
 
-    <div class="example"><h3>Simple Reverse Proxy</h3><p><code>
+    <div class="example"><h3>Simple Reverse Proxy</h3><pre class="prettyprint lang-config">
     ProxyPass /app ajp://backend.example.com:8009/app
-    </code></p></div>
+    </pre>
+</div>
 
     <p>Balancers may also be used:</p>
-    <div class="example"><h3>Balancer Reverse Proxy</h3><p><code>
-      &lt;Proxy balancer://cluster&gt;<br />
-      <span class="indent">
-        BalancerMember ajp://app1.example.com:8009 loadfactor=1<br />
-        BalancerMember ajp://app2.example.com:8009 loadfactor=2<br />
-        ProxySet lbmethod=bytraffic<br />
-      </span>
-      &lt;/Proxy&gt;<br />
-      ProxyPass /app balancer://cluster/app
-    </code></p></div>
+    <div class="example"><h3>Balancer Reverse Proxy</h3><pre class="prettyprint lang-config">
+&lt;Proxy balancer://cluster&gt;
+    BalancerMember ajp://app1.example.com:8009 loadfactor=1
+    BalancerMember ajp://app2.example.com:8009 loadfactor=2
+    ProxySet lbmethod=bytraffic
+&lt;/Proxy&gt;
+ProxyPass /app balancer://cluster/app
+      </pre>
+</div>
 
     <p>Note that usually no
     <code class="directive"><a href="../mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code>
@@ -100,10 +100,11 @@
     backend. In this case, a redirect header can be rewritten relative to the
     original host URL (not the backend <code>ajp://</code> URL), for
     example:</p>
-    <div class="example"><h3>Rewriting Proxied Path</h3><p><code>
-      ProxyPass /apps/foo ajp://backend.example.com:8009/foo<br />
-      ProxyPassReverse /apps/foo http://www.example.com/foo
-    </code></p></div>
+    <div class="example"><h3>Rewriting Proxied Path</h3><pre class="prettyprint lang-config">
+ProxyPass /apps/foo ajp://backend.example.com:8009/foo
+ProxyPassReverse /apps/foo http://www.example.com/foo
+    </pre>
+</div>
     <p>However, it is usually better to deploy the application on the backend
     server at the same path as the proxy rather than to take this approach.
     </p>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ajp.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ajp.xml.ja?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ajp.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ajp.xml.ja [utf-8] Fri May  4 15:45:05 2012
@@ -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: 669473:1199948 (outdated) -->
+<!-- English Revision: 669473:1334022 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.html.en Fri May  4 15:45:05 2012
@@ -109,31 +109,32 @@
     load balancing between two back-end servers:
     </p>
 
-    <div class="example"><p><code>
-    &lt;Proxy balancer://mycluster&gt;<br />
-        BalancerMember http://192.168.1.50:80<br />
-        BalancerMember http://192.168.1.51:80<br />
-    &lt;/Proxy&gt;<br />
-    ProxyPass /test balancer://mycluster<br />
-    ProxyPassReverse /test balancer://mycluster
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+&lt;Proxy balancer://mycluster&gt;
+    BalancerMember http://192.168.1.50:80
+    BalancerMember http://192.168.1.51:80
+&lt;/Proxy&gt;
+ProxyPass /test balancer://mycluster
+ProxyPassReverse /test balancer://mycluster
+    </pre>
+
 
     <p>Another example of how to provide load balancing with stickyness
     using <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code>, even if the back-end server does
     not set a suitable session cookie:
     </p>
 
-    <div class="example"><p><code>
-    Header add Set-Cookie "ROUTEID=.%{BALANCER_WORKER_ROUTE}e; path=/"
-           env=BALANCER_ROUTE_CHANGED<br />
-    &lt;Proxy balancer://mycluster&gt;<br />
-    BalancerMember http://192.168.1.50:80 route=1<br />
-    BalancerMember http://192.168.1.51:80 route=2<br />
-    ProxySet stickysession=ROUTEID<br />
-    &lt;/Proxy&gt;<br />
-    ProxyPass /test balancer://mycluster<br />
-    ProxyPassReverse /test balancer://mycluster
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+Header add Set-Cookie "ROUTEID=.%{BALANCER_WORKER_ROUTE}e; path=/" env=BALANCER_ROUTE_CHANGED
+&lt;Proxy balancer://mycluster&gt;
+    BalancerMember http://192.168.1.50:80 route=1
+    BalancerMember http://192.168.1.51:80 route=2
+    ProxySet stickysession=ROUTEID
+&lt;/Proxy&gt;
+ProxyPass /test balancer://mycluster
+ProxyPassReverse /test balancer://mycluster
+    </pre>
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="environment" id="environment">Exported Environment Variables</a></h2>
@@ -206,13 +207,13 @@
     <p>To enable load balancer management for browsers from the example.com
     domain add this code to your <code>httpd.conf</code>
     configuration file</p>
-<div class="example"><p><code>
-    &lt;Location /balancer-manager&gt;<br />
-    SetHandler balancer-manager<br />
-<br />
-    Require host example.com<br />
-    &lt;/Location&gt;
-</code></p></div>
+<pre class="prettyprint lang-config">
+&lt;Location /balancer-manager&gt;
+    SetHandler balancer-manager
+    Require host example.com
+&lt;/Location&gt;
+</pre>
+
 
     <p>You can now access load balancer manager by using a Web browser
     to access the page

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml.ja?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_balancer.xml.ja [utf-8] Fri May  4 15:45:05 2012
@@ -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: 395228:1234890 (outdated) -->
+<!-- English Revision: 395228:1334022 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fcgi.html.en Fri May  4 15:45:05 2012
@@ -71,9 +71,10 @@
     <p>Remember, in order to make the following examples work, you have to
     enable <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_fcgi.html">mod_proxy_fcgi</a></code>.</p>
 
-    <div class="example"><h3>Single application instance</h3><p><code>
+    <div class="example"><h3>Single application instance</h3><pre class="prettyprint lang-config">
       ProxyPass /myapp/ fcgi://localhost:4000/
-    </code></p></div>
+      </pre>
+</div>
 
     <p>This application should be able to handle multiple concurrent
     connections.  <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> enables connection reuse by
@@ -86,9 +87,10 @@
     reuse on the <code class="directive">ProxyPass</code> directive, as shown in
     the following example:</p>
 
-    <div class="example"><h3>Single application instance, no connection reuse</h3><p><code>
+    <div class="example"><h3>Single application instance, no connection reuse</h3><pre class="prettyprint lang-config">
       ProxyPass /myapp/ fcgi://localhost:4000/ disablereuse=on
-    </code></p></div>
+      </pre>
+</div>
 
     <p>The balanced gateway needs <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> and
     at least one load balancer algorithm module, such as
@@ -96,15 +98,14 @@
     modules listed above.  <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> is the
     default, and will be used for this example configuration.</p>
 
-    <div class="example"><h3>Balanced gateway to multiple application instances</h3><p><code>
-    ProxyPass /myapp/ balancer://myappcluster/<br />
-    &lt;Proxy balancer://myappcluster/&gt;<br />
-    <span class="indent">
-        BalancerMember fcgi://localhost:4000/<br />
-        BalancerMember fcgi://localhost:4001/<br />
-    </span>
-    &lt;/Proxy&gt;
-    </code></p></div>
+    <div class="example"><h3>Balanced gateway to multiple application instances</h3><pre class="prettyprint lang-config">
+ProxyPass /myapp/ balancer://myappcluster/
+&lt;Proxy balancer://myappcluster/&gt;
+    BalancerMember fcgi://localhost:4000/
+    BalancerMember fcgi://localhost:4001/
+&lt;/Proxy&gt;
+    </pre>
+</div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="env" id="env">Environment Variables</a></h2>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ftp.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ftp.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ftp.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_ftp.html.en Fri May  4 15:45:05 2012
@@ -80,7 +80,8 @@
 
       <div class="example"><pre>application/octet-stream   bin dms lha lzh exe class tgz taz</pre></div>
     <p>Alternatively you may prefer to default everything to binary:</p>
-      <div class="example"><pre>ForceType application/octet-stream</pre></div>
+      <div class="example"><pre class="prettyprint lang-config">ForceType application/octet-stream</pre>
+</div>
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="type" id="type">How can I force an FTP ASCII download of
@@ -119,7 +120,7 @@
 <h2><a name="ftppass" id="ftppass">How can I hide the FTP cleartext password
     in my browser's URL line?</a></h2>
       <p>To log in to an FTP server by username and password, Apache uses
-      different strategies. In absense of a user name and password in the URL
+      different strategies. In absence of a user name and password in the URL
       altogether, Apache sends an anonymous login to the FTP server,
       <em>i.e.</em>,</p>
 
@@ -158,7 +159,7 @@
         a base64-encoded cleartext string, and between the Apache proxy and the
         FTP server as plaintext. You should therefore think twice before
         accessing your FTP server via HTTP (or before accessing your personal
-        files via FTP at all!) When using unsecure channels, an eavesdropper
+        files via FTP at all!) When using insecure channels, an eavesdropper
         might intercept your password on its way.</p>
       </div>
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_html.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_html.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_html.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_html.html.en Fri May  4 15:45:05 2012
@@ -53,6 +53,7 @@ extensive <a href="http://apache.webthin
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyhtmlfixups">ProxyHTMLFixups</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyhtmlinterp">ProxyHTMLInterp</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyhtmllinks">ProxyHTMLLinks</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyhtmlmeta">ProxyHTMLMeta</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyhtmlstripcomments">ProxyHTMLStripComments</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyhtmlurlmap">ProxyHTMLURLMap</a></li>
 </ul>
@@ -253,6 +254,41 @@ and XHTML 1.</p>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyHTMLMeta" id="ProxyHTMLMeta">ProxyHTMLMeta</a> <a name="proxyhtmlmeta" id="proxyhtmlmeta">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Turns on or off extra pre-parsing of metadata in HTML
+<code>&lt;head&gt;</code> sections.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyHTMLMeta <var>On|Off</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy_html</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.4 and later; available as a third-party
+module for earlier 2.x versions.</td></tr>
+</table>
+    <p>This turns on or off pre-parsing of metadata in HTML
+    <code>&lt;head&gt;</code> sections.</p>
+    <p>If not required, turning ProxyHTMLMeta Off will give a small
+    performance boost by skipping this parse step.  However, it
+    is sometimes necessary for internationalisation to work correctly.</p>
+    <p>ProxyHTMLMeta has two effects.  Firstly and most importantly
+    it enables detection of character encodings declared in the form</p>
+    <pre>&lt;meta http-equiv="Content-Type" content="text/html;charset=<var>foo</var>"&gt;</pre>
+    <p>or, in the case of an XHTML document, an XML declaration.
+    It is NOT required if the charset is declared in a real HTTP header
+    (which is always preferable) from the backend server, nor if the
+    document is <var>utf-8</var> (unicode) or a subset such as ASCII.
+    You may also be able to dispense with it where documents use a
+    default declared using <code class="directive"><a href="../mod/mod_xml2enc.html#xml2encdefault">xml2EncDefault</a></code>, but that risks propagating an
+    incorrect declaration.  A <code class="directive">ProxyHTMLCharsetOut</code>
+    can remove that risk, but is likely to be a bigger processing
+    overhead than enabling ProxyHTMLMeta.</p>
+    <p>The other effect of enabling ProxyHTMLMeta is to parse all
+    <code>&lt;meta http-equiv=...&gt;</code> declarations and convert
+    them to real HTTP headers, in keeping with the original purpose
+    of this form of the HTML &lt;meta&gt; element.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxyHTMLStripComments" id="ProxyHTMLStripComments">ProxyHTMLStripComments</a> <a name="proxyhtmlstripcomments" id="proxyhtmlstripcomments">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines whether to strip HTML comments.</td></tr>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_scgi.html.en Fri May  4 15:45:05 2012
@@ -67,9 +67,10 @@
     <p>Remember, in order to make the following examples work, you have to
     enable <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code>.</p>
 
-    <div class="example"><h3>Simple gateway</h3><p><code>
+    <div class="example"><h3>Simple gateway</h3><pre class="prettyprint lang-config">
       ProxyPass /scgi-bin/ scgi://localhost:4000/
-    </code></p></div>
+      </pre>
+</div>
 
     <p>The balanced gateway needs <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> and
     at least one load balancer algorithm module, such as
@@ -77,15 +78,14 @@
     modules listed above.  <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> is the
     default, and will be used for this example configuration.</p>
 
-    <div class="example"><h3>Balanced gateway</h3><p><code>
-    ProxyPass /scgi-bin/ balancer://somecluster/<br />
-    &lt;Proxy balancer://somecluster/&gt;<br />
-    <span class="indent">
-        BalancerMember scgi://localhost:4000/<br />
-        BalancerMember scgi://localhost:4001/<br />
-    </span>
-    &lt;/Proxy&gt;
-    </code></p></div>
+    <div class="example"><h3>Balanced gateway</h3><pre class="prettyprint lang-config">
+ProxyPass /scgi-bin/ balancer://somecluster/
+&lt;Proxy balancer://somecluster/&gt;
+    BalancerMember scgi://localhost:4000/
+    BalancerMember scgi://localhost:4001/
+&lt;/Proxy&gt;
+    </pre>
+</div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="env" id="env">Environment Variables</a></h2>
@@ -126,9 +126,10 @@ backend</td></tr>
     <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> in this regard, except that you can turn off the
     feature.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
     ProxySCGIInternalRedirect Off
-    </code></p></div>
+    </pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -164,13 +165,14 @@ header</td></tr>
     the argument is applied as header name.</dd>
     </dl>
 
-    <div class="example"><h3>Example</h3><p><code>
-    # Use the default header (X-Sendfile)<br />
-    ProxySCGISendfile On<br />
-    <br />
-    # Use a different header<br />
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
+    # Use the default header (X-Sendfile)
+    ProxySCGISendfile On
+    
+    # Use a different header
     ProxySCGISendfile X-Send-Static
-    </code></p></div>
+    </pre>
+</div>
 
 </div>
 </div>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ratelimit.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ratelimit.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ratelimit.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ratelimit.html.en Fri May  4 15:45:05 2012
@@ -37,14 +37,13 @@
 The connection speed to be simulated is specified, in KiB/s, using the environment
 variable <code>rate-limit</code>.</p>
 
-<div class="example"><h3>Example Configuration</h3><p><code>
-&lt;Location /downloads&gt;<br />
-<span class="indent">
-SetOutputFilter RATE_LIMIT<br />
-SetEnv rate-limit 400 <br />
-</span>
+<div class="example"><h3>Example Configuration</h3><pre class="prettyprint lang-config">
+&lt;Location /downloads&gt;
+    SetOutputFilter RATE_LIMIT
+    SetEnv rate-limit 400 
 &lt;/Location&gt;
-</code></p></div>
+</pre>
+</div>
 
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_reflector.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_reflector.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_reflector.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_reflector.html.en Fri May  4 15:45:05 2012
@@ -55,23 +55,25 @@
     <dd>Pass the request body through the DEFLATE filter to compress the
     body. This request requires a Content-Encoding request header containing
     "gzip" for the filter to return compressed data.
-    <div class="example"><p><code>
-      &lt;Location /compress&gt;<br />
-        SetHandler reflector<br />
-        SetOutputFilter DEFLATE<br />
-      &lt;/Location&gt;
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+&lt;Location /compress&gt;
+    SetHandler reflector
+    SetOutputFilter DEFLATE
+&lt;/Location&gt;
+    </pre>
+
     </dd>
 
     <dt>Image downsampling service</dt>
     <dd>Pass the request body through an image downsampling filter, and reflect
     the results to the caller.
-    <div class="example"><p><code>
-      &lt;Location /downsample&gt;<br />
-        SetHandler reflector<br />
-        SetOutputFilter DOWNSAMPLE<br />
-      &lt;/Location&gt;
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+&lt;Location /downsample&gt;
+    SetHandler reflector
+    SetOutputFilter DOWNSAMPLE
+&lt;/Location&gt;
+    </pre>
+
     </dd>
     </dl>
 </div>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.html.en Fri May  4 15:45:05 2012
@@ -136,13 +136,15 @@ via the request headers.
     other directives are used, <code class="module"><a href="../mod/mod_remoteip.html">mod_remoteip</a></code> will trust all
     hosts presenting a <code class="directive">RemoteIPHeader</code> IP value.</p>
 
-    <div class="example"><h3>Internal (Load Balancer) Example</h3><p><code>
+    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
         RemoteIPHeader X-Client-IP
-    </code></p></div>
+        </pre>
+</div>
 
-    <div class="example"><h3>Proxy Example</h3><p><code>
+    <div class="example"><h3>Proxy Example</h3><pre class="prettyprint lang-config">
         RemoteIPHeader X-Forwarded-For
-    </code></p></div>
+        </pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -161,11 +163,12 @@ via the request headers.
     presented in this header, including private intranet addresses, are
     trusted when passed from these proxies.</p>
 
-    <div class="example"><h3>Internal (Load Balancer) Example</h3><p><code>
-        RemoteIPHeader X-Client-IP<br />
-        RemoteIPTrustedProxy 10.0.2.0/24<br />
-        RemoteIPTrustedProxy gateway.localdomain
-    </code></p></div>
+    <div class="example"><h3>Internal (Load Balancer) Example</h3><pre class="prettyprint lang-config">
+RemoteIPHeader X-Client-IP
+RemoteIPInternalProxy 10.0.2.0/24
+RemoteIPInternalProxy gateway.localdomain
+        </pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -185,16 +188,17 @@ via the request headers.
     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><p><code>
-         # Our internally trusted proxies;<br />
-         10.0.2.0/24         #Everyone in the testing group<br />
-         gateway.localdomain #The front end balancer
-    </code></p></div>
+    <div class="example"><h3>conf/trusted-proxies.lst contents</h3><div class="example"><pre>
+# Our internally trusted proxies;
+10.0.2.0/24         #Everyone in the testing group
+gateway.localdomain #The front end balancer
+         </pre></div></div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -214,10 +218,11 @@ via the request headers.
     this header, while any intermediate
     <code class="directive">RemoteIPInternalProxy</code> addresses are discarded.</p>
 
-    <div class="example"><h3>Example</h3><p><code>
-        RemoteIPHeader X-Forwarded-For<br />
-        RemoteIPProxiesHeader X-Forwarded-By
-    </code></p></div>
+    <div class="example"><h3>Example</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>
@@ -238,11 +243,12 @@ via the request headers.
     2000::/3 block) are not trusted as the useragent IP, and are left in the
     <code class="directive">RemoteIPHeader</code> header's value.</p>
 
-    <div class="example"><h3>Trusted (Load Balancer) Example</h3><p><code>
-        RemoteIPHeader X-Forwarded-For<br />
-        RemoteIPTrustedProxy 10.0.2.16/28<br />
-        RemoteIPTrustedProxy proxy.example.com
-    </code></p></div>
+    <div class="example"><h3>Trusted (Load Balancer) Example</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>
@@ -259,13 +265,14 @@ via the request headers.
     to trust as presenting a valid RemoteIPHeader value of the useragent IP.</p>
 
     <p>The '<code>#</code>' hash character designates a comment line, otherwise
-    each whitespace or newline seperated entry is processed identically to
+    each whitespace or newline separated entry is processed identically to
     the <code class="directive">RemoteIPTrustedProxy</code> directive.</p>
 
-    <div class="example"><h3>Trusted (Load Balancer) Example</h3><p><code>
-        RemoteIPHeader X-Forwarded-For<br />
-        RemoteIPTrustedProxyList conf/trusted-proxies.lst
-    </code></p></div>
+    <div class="example"><h3>Trusted (Load Balancer) Example</h3><pre class="prettyprint lang-config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxyList conf/trusted-proxies.lst
+        </pre>
+</div>
 
     <div class="example"><h3>conf/trusted-proxies.lst contents</h3><p><code>
        # Identified external proxies;<br />

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.html.fr Fri May  4 15:45:05 2012
@@ -27,6 +27,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/mod/mod_remoteip.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/mod/mod_remoteip.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>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Remplace l'adresse IP et le nom d'hôte apparents du client
 pour la requête par l'adresse IP présentée par un mandataire ou un
 répartiteur de charge via les en-têtes de la requête.

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml.fr Fri May  4 15:45:05 2012
@@ -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: 1214022 -->
+<!-- English Revision: 1214022:1334024 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_remoteip.xml.meta Fri May  4 15:45:05 2012
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_reqtimeout.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_reqtimeout.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_reqtimeout.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_reqtimeout.html.en Fri May  4 15:45:05 2012
@@ -50,21 +50,23 @@
         Allow 10 seconds to receive the request including the headers and
         30 seconds for receiving the request body:
 
-        <div class="example"><p><code>
+        <pre class="prettyprint lang-config">
           RequestReadTimeout header=10 body=30
-        </code></p></div>
+        </pre>
+
       </li>
 
       <li>
         Allow at least 10 seconds to receive the request body.
         If the client sends data, increase the timeout by 1 second for every
-        1000 bytes received, with no upper limit for the timeout (exept for
+        1000 bytes received, with no upper limit for the timeout (except for
         the limit given indirectly by
         <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>):
 
-        <div class="example"><p><code>
+        <pre class="prettyprint lang-config">
           RequestReadTimeout body=10,MinRate=1000
-        </code></p></div>
+        </pre>
+
       </li>
 
       <li>
@@ -73,9 +75,10 @@
         500 bytes received. But do not allow more than 30 seconds for the
         request including the headers:
 
-        <div class="example"><p><code>
+        <pre class="prettyprint lang-config">
           RequestReadTimeout header=10-30,MinRate=500
-        </code></p></div>
+        </pre>
+
       </li>
 
       <li>
@@ -83,9 +86,10 @@
         If a common configuration is used for http and https virtual hosts, the
         timeouts should not be set too low:
 
-        <div class="example"><p><code>
+        <pre class="prettyprint lang-config">
           RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
-        </code></p></div>
+        </pre>
+
       </li>
 
     </ol>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en Fri May  4 15:45:05 2012
@@ -84,9 +84,10 @@ URLs on the fly</td></tr>
       level higher than <code>trace2</code> only for debugging!
     </div>
 
-    <div class="example"><h3>Example</h3><p><code>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
       LogLevel alert rewrite:trace3
-    </code></p></div>
+      </pre>
+</div>
 
     <div class="note"><h3>RewriteLog</h3>
       <p>Those familiar with earlier versions of
@@ -115,38 +116,38 @@ URLs on the fly</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
 </table>
-      <p>The <code class="directive">RewriteBase</code> directive explicitly
-      sets the base URL-path (not filesystem directory path!)  for per-directory rewrites
-      that result in the substitution of a relative path.
-      When you use a <code class="directive"><a href="#rewriterule">RewriteRule</a></code>
-      in a <code>.htaccess</code> file, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> strips off
-      the local directory prefix before processing, then rewrites the rest of
-      the URL. When the rewrite is completed, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
-      automatically adds the local directory prefix (or the
-      <code class="directive">RewriteBase</code> when set) back on to the substitution
-      before handing it back to the core of the server as if it were the original
-      URL.</p>
-
-      <p>This directive is <em>required</em> for per-directory rewrites whose context
-      is a directory made available via the <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>
-      directive, when the substitution uses a relative path.</p>
-
-      <p>If your URL path does not exist verbatim on the filesystem,
-      or isn't directly under your <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>,
-      you must use <code class="directive">RewriteBase</code> in every
-      <code>.htaccess</code> file where you want to use <code class="directive"><a href="#rewriterule">RewriteRule</a></code> directives.</p>
-
-      <p>The example below demonstrates how to map
-      http://example.com/myapp/index.html to
-      /home/www/example/newsite.html, in a <code>.htaccess</code> file. This
-      assumes that the content available at
-      http://example.com/ is on disk at /home/www/example/</p>
-<div class="example"><pre>
-RewriteEngine On
-# The URL-path used to get to this context, not the filesystem path
-RewriteBase /myapp/
-RewriteRule ^index\.html$  newsite.html
-</pre></div>
+      <p>The <code class="directive">RewriteBase</code> directive specifies the
+      URL prefix to be used for per-directory (htaccess) 
+      <code class="directive">RewriteRule</code> directives that substitute a relative
+      path.</p>
+      <p> This directive is <em>required</em> when you use a relative path
+      in a substitution in per-directory (htaccess) context unless either
+      of the following conditions are true:</p>
+      <ul>
+          <li> The original request, and the substitution, are underneath the 
+               <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+               (as opposed to reachable by other means, such as 
+               <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>).</li>
+          <li> The <em>filesystem</em> path to the directory containing the
+               <code class="directive">RewriteRule</code>, suffixed by the relative 
+               substitution is also valid as a URL path on the server 
+               (this is rare).</li>
+      </ul>
+
+<p> In the example below, <code class="directive">RewriteBase</code> is necessary
+    to avoid rewriting to http://example.com/opt/myapp-1.2.3/welcome.html
+    since the resource was not relative to the document root.  This 
+    misconfiguration would normally cause the server to look for an "opt"
+    directory under the document root.</p>
+<pre class="prettyprint lang-config">
+DocumentRoot /var/www/example.com
+Alias /myapp /opt/myapp-1.2.3
+&lt;Directory /opt/myapp-1.2.3&gt;
+    RewriteEngine On
+    RewriteBase /myapp/
+    RewriteRule ^index\.html$  welcome.html 
+&lt;/Directory&gt;
+</pre>
 
 
 </div>
@@ -620,10 +621,11 @@ RewriteRule ^index\.html$  newsite.html
             to block unwanted hotlinking.
            </p>
 
-           <div class="example"><p><code>
+           <pre class="prettyprint lang-config">
            RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br />
            RewriteRule ^/images - [F]
-           </code></p></div>
+           </pre>
+
         </li>
 
         <li>You can also set special flags for
@@ -649,12 +651,13 @@ RewriteRule ^index\.html$  newsite.html
           Use this to combine rule conditions with a local OR
           instead of the implicit AND. Typical example:
 
-<div class="example"><pre>
+<pre class="prettyprint lang-config">
 RewriteCond %{REMOTE_HOST}  ^host1  [OR]
 RewriteCond %{REMOTE_HOST}  ^host2  [OR]
 RewriteCond %{REMOTE_HOST}  ^host3
 RewriteRule ...some special stuff for any of these hosts...
-</pre></div>
+</pre>
+
 
           Without this flag you would have to write the condition/rule
           pair three times.
@@ -679,7 +682,7 @@ RewriteRule ...some special stuff for an
         ``<code>User-Agent:</code>'' header of the request, you can
         use the following: </p>
 
-<div class="example"><pre>
+<pre class="prettyprint lang-config">
 RewriteCond  %{HTTP_USER_AGENT}  ^Mozilla
 RewriteRule  ^/$                 /homepage.max.html  [L]
 
@@ -687,7 +690,8 @@ RewriteCond  %{HTTP_USER_AGENT}  ^Lynx
 RewriteRule  ^/$                 /homepage.min.html  [L]
 
 RewriteRule  ^/$                 /homepage.std.html  [L]
-</pre></div>
+</pre>
+
 
         <p>Explanation: If you use a browser which identifies itself
         as 'Mozilla' (including Netscape Navigator, Mozilla etc), then you
@@ -777,16 +781,18 @@ Apache HTTP Server 2.0.41 and later</td>
       <p>For example, you might define a
       <code class="directive">RewriteMap</code> as:</p>
 
-      <div class="example"><p><code>
+      <pre class="prettyprint lang-config">
       RewriteMap examplemap txt:/path/to/file/map.txt
-      </code></p></div>
+      </pre>
+
 
       <p>You would then be able to use this map in a
       <code class="directive">RewriteRule</code> as follows:</p>
 
-      <div class="example"><p><code>
+      <pre class="prettyprint lang-config">
       RewriteRule ^/ex/(.*) ${examplemap:$1}
-      </code></p></div>
+      </pre>
+
 
       <p>The following combinations for <em>MapType</em> and
       <em>MapSource</em> can be used:</p>
@@ -912,10 +918,11 @@ later</td></tr>
 
       <p><a id="patterns" name="patterns"><em>Pattern</em></a> is
       a perl compatible <a id="regexp" name="regexp">regular
-      expression</a>. On the first RewriteRule it is applied to the (%-decoded)
-      <a href="./directive-dict.html#Syntax">URL-path</a> of the request;
-      subsequent patterns are applied to the output of the last matched
-      RewriteRule.</p>
+      expression</a>. On the first RewriteRule, it is matched against
+      the (%-decoded) <a href="./directive-dict.html#Syntax">URL-path</a> (or 
+      <a href="./directive-dict.html#Syntax">file-path</a>, depending 
+      on the context) of the request. Subsequent patterns are matched against the 
+      output of the last matching RewriteRule.</p>
 
 <div class="note"><h3><a id="what_is_matched" name="what_is_matched">What is matched?</a></h3>
       <p>In <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> context,
@@ -924,7 +931,7 @@ later</td></tr>
 
       <p>In <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> and htaccess context,
       the <em>Pattern</em> will initially be matched against the
-      <em>filesystem</em> path, after removing the prefix that lead the server
+      <em>filesystem</em> path, after removing the prefix that led the server
       to the current <code class="directive">RewriteRule</code> (e.g. "app1/index.html"
       or "index.html" depending on where the directives are defined).</p>
 
@@ -954,7 +961,7 @@ and automatically <em>added</em> after a
 slash or protocol name) substitution encounters the end of a rule set.
 See the <code class="directive"><a href="#rewritebase">RewriteBase</a></code>
 directive for more information regarding what prefix will be added back to
-relative substitions.</li>
+relative substitutions.</li>
 
 <li> If you wish to match against the full URL-path in a per-directory
 (htaccess) RewriteRule, use the <code>%{REQUEST_URI}</code> variable in
@@ -1003,7 +1010,7 @@ cannot use <code>$N</code> in the substi
         to be delivered to the client.  Substitutions are only
         treated as a file-system path when the rule is configured in 
         server (virtualhost) context and the first component of the
-        path in the substitution is exists in the file-system</dd>
+        path in the substitution exists in the file-system</dd>
 
         <dt>URL-path</dt>
 
@@ -1040,7 +1047,7 @@ cannot use <code>$N</code> in the substi
 
       </dl>
 
-      <p>In addition to plain text, the <em>Substition</em> string can include</p>
+      <p>In addition to plain text, the <em>Substitution</em> string can include</p>
 
       <ol>
         <li>back-references (<code>$N</code>) to the RewriteRule
@@ -1068,7 +1075,7 @@ cannot use <code>$N</code> in the substi
 
       <p>Rewrite rules are applied to the results of previous rewrite
       rules, in the order in which they are defined
-      in the config file. The URI or file path (see <a href="#what_is_matched">"What is matched?"</a>, above) is <strong>completely
+      in the config file. The URL-path or file-system path (see <a href="#what_is_matched">"What is matched?"</a>, above) is <strong>completely
       replaced</strong> by the <em>Substitution</em> and the
       rewriting process continues until all rules have been applied,
       or it is explicitly terminated by an

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.fr Fri May  4 15:45:05 2012
@@ -27,6 +27,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/mod/mod_rewrite.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/mod/mod_rewrite.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>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Ce module fournit un moteur de réécriture à base de
 règles permettant de réécrire les URLs des requêtes
 à la volée</td></tr>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr Fri May  4 15:45:05 2012
@@ -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 : 1301574 -->
+<!-- English Revision: 1301574:1334024 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta Fri May  4 15:45:05 2012
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.html.en Fri May  4 15:45:05 2012
@@ -75,35 +75,29 @@ the author's blog</a>.</p>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="sampleconf" id="sampleconf">Sample Configuration</a></h2>
-    <div class="example"><h3>Adding an output filter </h3><p><code>
-         # In the following example, the sed filter will change the string<br />
-         # "monday" to "MON" and the string "sunday" to SUN in html documents<br />
-         # before sending to the client.<br />
-        <span class="indent">
-        &lt;Directory "/var/www/docs/sed"&gt; <br />
-           <span class="indent">
-           AddOutputFilter Sed html <br />
-           OutputSed "s/monday/MON/g" <br />
-           OutputSed "s/sunday/SUN/g" <br />
-           </span>
-        &lt;/Directory&gt; <br />
-        </span>
-    </code></p></div>
+    <div class="example"><h3>Adding an output filter </h3><pre class="prettyprint lang-config">
+# In the following example, the sed filter will change the string
+# "monday" to "MON" and the string "sunday" to SUN in html documents
+# before sending to the client.
+&lt;Directory "/var/www/docs/sed"&gt; 
+    AddOutputFilter Sed html 
+    OutputSed "s/monday/MON/g" 
+    OutputSed "s/sunday/SUN/g" 
+&lt;/Directory&gt; 
+    </pre>
+</div>
 
-    <div class="example"><h3>Adding an input filter </h3><p><code>
-         # In the following example, the sed filter will change the string<br />
-         # "monday" to "MON" and the string "sunday" to SUN in the POST data<br />
-         # sent to PHP.<br />
-        <span class="indent">
-        &lt;Directory "/var/www/docs/sed"&gt; <br />
-           <span class="indent">
-           AddInputFilter Sed php <br />
-           InputSed "s/monday/MON/g" <br />
-           InputSed "s/sunday/SUN/g" <br />
-           </span>
-        &lt;/Directory&gt; <br />
-        </span>
-    </code></p></div>
+    <div class="example"><h3>Adding an input filter </h3><pre class="prettyprint lang-config">
+# In the following example, the sed filter will change the string
+# "monday" to "MON" and the string "sunday" to SUN in the POST data
+# sent to PHP.
+&lt;Directory "/var/www/docs/sed"&gt; 
+    AddInputFilter Sed php 
+    InputSed "s/monday/MON/g" 
+    InputSed "s/sunday/SUN/g" 
+&lt;/Directory&gt; 
+        </pre>
+</div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="sed_commands" id="sed_commands">Sed Commands</a></h2>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.html.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.html.fr Fri May  4 15:45:05 2012
@@ -27,6 +27,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/mod/mod_sed.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/mod/mod_sed.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>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Filtre les contenus en entrée (requêtes) et en sortie
 (réponses) en utilisant la syntaxe de <code>sed</code></td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td /></tr>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.xml.fr?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.xml.fr Fri May  4 15:45:05 2012
@@ -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 : 1299329 -->
+<!-- English Revision: 1299329:1334024 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.xml.meta?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_sed.xml.meta Fri May  4 15:45:05 2012
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session.html.en Fri May  4 15:45:05 2012
@@ -159,45 +159,49 @@
       where the session will be stored. In this example, the session will be
       stored on the browser, in a cookie called <code>session</code>.</p>
 
-      <div class="example"><h3>Browser based session</h3><p><code>
-        Session On<br />
-        SessionCookieName session path=/<br />
-      </code></p></div>
+      <div class="example"><h3>Browser based session</h3><pre class="prettyprint lang-config">
+Session On
+SessionCookieName session path=/
+        </pre>
+</div>
 
       <p>The session is not useful unless it can be written to or read from. The
       following example shows how values can be injected into the session through
       the use of a predetermined HTTP response header called
       <code>X-Replace-Session</code>.</p>
 
-      <div class="example"><h3>Writing to a session</h3><p><code>
-        Session On<br />
-        SessionCookieName session path=/<br />
-        SessionHeader X-Replace-Session<br />
-      </code></p></div>
+      <div class="example"><h3>Writing to a session</h3><pre class="prettyprint lang-config">
+Session On
+SessionCookieName session path=/
+SessionHeader X-Replace-Session
+        </pre>
+</div>
 
       <p>The header should contain name value pairs expressed in the same format
       as a query string in a URL, as in the example below. Setting a key to the
       empty string has the effect of removing that key from the session.</p>
 
-      <div class="example"><h3>CGI to write to a session</h3><p><code>
-        #!/bin/bash<br />
-        echo "Content-Type: text/plain"<br />
-        echo "X-Replace-Session: key1=foo&amp;key2=&amp;key3=bar"<br />
-        echo<br />
-        env<br />
-      </code></p></div>
+      <div class="example"><h3>CGI to write to a session</h3><pre class="prettyprint lang-sh">
+#!/bin/bash
+echo "Content-Type: text/plain"
+echo "X-Replace-Session: key1=foo&amp;key2=&amp;key3=bar"
+echo
+env
+        </pre>
+</div>
 
       <p>If configured, the session can be read back from the HTTP_SESSION
       environment variable. By default, the session is kept private, so this
       has to be explicitly turned on with the
       <code class="directive"><a href="#sessionenv">SessionEnv</a></code> directive.</p>
 
-      <div class="example"><h3>Read from a session</h3><p><code>
-        Session On<br />
-        SessionEnv On<br />
-        SessionCookieName session path=/<br />
-        SessionHeader X-Replace-Session<br />
-      </code></p></div>
+      <div class="example"><h3>Read from a session</h3><pre class="prettyprint lang-config">
+Session On
+SessionEnv On
+SessionCookieName session path=/
+SessionHeader X-Replace-Session
+        </pre>
+</div>
 
       <p>Once read, the CGI variable <code>HTTP_SESSION</code> should contain
       the value <code>key1=foo&amp;key3=bar</code>.</p>
@@ -216,11 +220,12 @@
       placed on the browser using the <code class="module"><a href="../mod/mod_session_crypto.html">mod_session_crypto</a></code>
       module.</p>
 
-      <div class="example"><h3>Browser based encrypted session</h3><p><code>
-        Session On<br />
-        SessionCryptoPassphrase secret<br />
-        SessionCookieName session path=/<br />
-      </code></p></div>
+      <div class="example"><h3>Browser based encrypted session</h3><pre class="prettyprint lang-config">
+Session On
+SessionCryptoPassphrase secret
+SessionCookieName session path=/
+        </pre>
+</div>
 
       <p>The session will be automatically decrypted on load, and encrypted on
       save by Apache, the underlying application using the session need have
@@ -253,11 +258,12 @@
       <p>Standard cookie parameters can be specified after the name of the cookie,
       as in the example below.</p>
 
-      <div class="example"><h3>Setting cookie parameters</h3><p><code>
-        Session On<br />
-        SessionCryptoPassphrase secret<br />
-        SessionCookieName session path=/private;domain=example.com;httponly;secure;<br />
-      </code></p></div>
+      <div class="example"><h3>Setting cookie parameters</h3><pre class="prettyprint lang-config">
+Session On
+SessionCryptoPassphrase secret
+SessionCookieName session path=/private;domain=example.com;httponly;secure;
+        </pre>
+</div>
 
       <p>In cases where the Apache server forms the frontend for backend origin servers,
       it is possible to have the session cookies removed from the incoming HTTP headers using
@@ -275,16 +281,17 @@
       <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> saves the user's login name and password within
       the session.</p>
 
-      <div class="example"><h3>Form based authentication</h3><p><code>
-        Session On<br />
-        SessionCryptoPassphrase secret<br />
-        SessionCookieName session path=/<br />
-        AuthFormProvider file<br />
-        AuthUserFile conf/passwd<br />
-        AuthType form<br />
-        AuthName realm<br />
-        ...<br />
-      </code></p></div>
+      <div class="example"><h3>Form based authentication</h3><pre class="prettyprint lang-config">
+Session On
+SessionCryptoPassphrase secret
+SessionCookieName session path=/
+AuthFormProvider file
+AuthUserFile conf/passwd
+AuthType form
+AuthName realm
+#...
+        </pre>
+</div>
 
       <p>See the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> module for documentation and complete
       examples.</p>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_cookie.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_cookie.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_cookie.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_cookie.html.en Fri May  4 15:45:05 2012
@@ -79,10 +79,11 @@
       <p>To create a simple session and store it in a cookie called
       <var>session</var>, configure the session as follows:</p>
 
-      <div class="example"><h3>Browser based session</h3><p><code>
-        Session On<br />
-        SessionCookieName session path=/<br />
-      </code></p></div>
+      <div class="example"><h3>Browser based session</h3><pre class="prettyprint lang-config">
+Session On
+SessionCookieName session path=/
+        </pre>
+</div>
 
       <p>For more examples on how the session can be configured to be read
       from and written to by a CGI application, see the
@@ -112,10 +113,11 @@
     Apache. Ensure that your attributes are defined correctly as per the cookie specification.
     </p>
 
-    <div class="example"><h3>Cookie with attributes</h3><p><code>
-      Session On<br />
-      SessionCookieName session path=/private;domain=example.com;httponly;secure;version=1;<br />
-    </code></p></div>
+    <div class="example"><h3>Cookie with attributes</h3><pre class="prettyprint lang-config">
+Session On
+SessionCookieName session path=/private;domain=example.com;httponly;secure;version=1;
+      </pre>
+</div>
 
 
 </div>
@@ -139,10 +141,11 @@
     Apache. Ensure that your attributes are defined correctly as per the cookie specification.
     </p>
 
-    <div class="example"><h3>Cookie2 with attributes</h3><p><code>
-      Session On<br />
-      SessionCookieName2 session path=/private;domain=example.com;httponly;secure;version=1;<br />
-    </code></p></div>
+    <div class="example"><h3>Cookie2 with attributes</h3><pre class="prettyprint lang-config">
+Session On
+SessionCookieName2 session path=/private;domain=example.com;httponly;secure;version=1;
+    </pre>
+</div>
 
 
 </div>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.html.en?rev=1334039&r1=1334038&r2=1334039&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.html.en Fri May  4 15:45:05 2012
@@ -76,11 +76,12 @@
       <p>To create a simple encrypted session and store it in a cookie called
       <var>session</var>, configure the session as follows:</p>
 
-      <div class="example"><h3>Browser based encrypted session</h3><p><code>
-        Session On<br />
-        SessionCookieName session path=/<br />
-        SessionCryptoPassphrase secret
-      </code></p></div>
+      <div class="example"><h3>Browser based encrypted session</h3><pre class="prettyprint lang-config">
+Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret
+    </pre>
+</div>
 
       <p>The session will be encrypted with the given key. Different servers can
       be configured to share sessions by ensuring the same encryption key is used
@@ -132,21 +133,25 @@
     <p>The <var>NSS</var> crypto driver requires some parameters for configuration,
     which are specified as parameters with optional values after the driver name.</p>
 
-    <div class="example"><h3>NSS without a certificate database</h3><p><code>
+    <div class="example"><h3>NSS without a certificate database</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss
-    </code></p></div>
+      </pre>
+</div>
 
-    <div class="example"><h3>NSS with certificate database</h3><p><code>
+    <div class="example"><h3>NSS with certificate database</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss dir=certs
-    </code></p></div>
+      </pre>
+</div>
 
-    <div class="example"><h3>NSS with certificate database and parameters</h3><p><code>
+    <div class="example"><h3>NSS with certificate database and parameters</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss dir=certs key3=key3.db cert7=cert7.db secmod=secmod
-    </code></p></div>
+      </pre>
+</div>
 
-    <div class="example"><h3>NSS with paths containing spaces</h3><p><code>
+    <div class="example"><h3>NSS with paths containing spaces</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss "dir=My Certs" key3=key3.db cert7=cert7.db secmod=secmod
-    </code></p></div>
+      </pre>
+</div>
 
     <p>The <var>NSS</var> crypto driver might have already been configured by another
     part of the server, for example from <code class="module"><a href="../mod/mod_nss.html">mod_nss</a></code> or
@@ -154,9 +159,10 @@
     a warning will be logged, and the existing configuration will have taken affect.
     To avoid this warning, use the noinit parameter as follows.</p>
 
-    <div class="example"><h3>NSS with certificate database</h3><p><code>
+    <div class="example"><h3>NSS with certificate database</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver nss noinit
-    </code></p></div>
+      </pre>
+</div>
 
     <p>To prevent confusion, ensure that all modules requiring NSS are configured with
     identical parameters.</p>
@@ -164,9 +170,10 @@
     <p>The <var>openssl</var> crypto driver supports an optional parameter to specify
     the engine to be used for encryption.</p>
 
-    <div class="example"><h3>OpenSSL with engine support</h3><p><code>
+    <div class="example"><h3>OpenSSL with engine support</h3><pre class="prettyprint lang-config">
       SessionCryptoDriver openssl engine=name
-    </code></p></div>
+      </pre>
+</div>
 
 
 </div>



Mime
View raw message