Commit e09b1f98 authored by Luca Toscano's avatar Luca Toscano
Browse files

documentation rebuild 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828129 13f79535-47bb-0310-9956-ffa450edef68
parent 8c52c0aa

docs/manual/mod/core.html.en

+2 −6
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ 
<div id="page-content">

<div id="preamble"><h1>Apache Core Features</h1>

<div class="toplang">

<p><span>Available Languages: </span><a href="../2/mod/core.html" hreflang="2" rel="alternate" title="">&nbsp;2&nbsp;</a> |

<a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |

<a href="../edited/mod/core.html" hreflang="edited" rel="alternate" title="">&nbsp;edited&nbsp;</a> |

<p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |

<a href="../en/mod/core.html" title="English">&nbsp;en&nbsp;</a> |

<a href="../es/mod/core.html" hreflang="es" rel="alternate" title="Espaol">&nbsp;es&nbsp;</a> |

<a href="../fr/mod/core.html" hreflang="fr" rel="alternate" title="Franais">&nbsp;fr&nbsp;</a> |
@@ -4934,9 +4932,7 @@ hostname or IP address</td></tr> 
</div>

</div>

<div class="bottomlang">

<p><span>Available Languages: </span><a href="../2/mod/core.html" hreflang="2" rel="alternate" title="">&nbsp;2&nbsp;</a> |

<a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |

<a href="../edited/mod/core.html" hreflang="edited" rel="alternate" title="">&nbsp;edited&nbsp;</a> |

<p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |

<a href="../en/mod/core.html" title="English">&nbsp;en&nbsp;</a> |

<a href="../es/mod/core.html" hreflang="es" rel="alternate" title="Espaol">&nbsp;es&nbsp;</a> |

<a href="../fr/mod/core.html" hreflang="fr" rel="alternate" title="Franais">&nbsp;fr&nbsp;</a> |

docs/manual/mod/core.xml.meta

+0 −2
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@ 
  <relpath>..</relpath>



  <variants>

    <variant>2</variant>

    <variant outdated="yes">de</variant>

    <variant>edited</variant>

    <variant>en</variant>

    <variant outdated="yes">es</variant>

    <variant outdated="yes">fr</variant>

docs/manual/mod/mod_proxy.html.en

+21 −6
Original line number Diff line number Diff line
@@ -1067,6 +1067,18 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
    <code>backend.example.com</code> <em>except</em> requests made to

    <code>/mirror/foo/i</code>.</p>



    <p>Mixing ProxyPass settings in different contexts does not work:</p>

    <pre class="prettyprint lang-config">ProxyPass "/mirror/foo/i" "!"

&lt;Location "/mirror/foo/"&gt;

    ProxyPass "http://backend.example.com/"

&lt;/Location&gt;</pre>



    <p>In this case, a request to <code>/mirror/foo/i</code> will get proxied,

       because the <code class="directive">ProxyPass</code> directive in the Location block will be evaluated

       first. The fact that <code class="directive">ProxyPass</code> supports both server and directory contexts

       does not mean that their scope and position in the configuration file will

       guarantee any ordering or override.</p>



    <div class="warning"><h3>Ordering ProxyPass Directives</h3>

      <p>The configured <code class="directive"><a href="#proxypass">ProxyPass</a></code>

      and <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code>
@@ -1075,12 +1087,15 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
      <code class="directive"><a href="#proxypass">ProxyPass</a></code> rules starting with the

      longest URLs first. Otherwise, later rules for longer URLS will be hidden

      by any earlier rule which uses a leading substring of the URL. Note that

      there is some relation with worker sharing. In contrast, only one

      <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive can be placed

      in a <code class="directive"><a href="../mod/core.html#location">Location</a></code> block, and the most

      specific location will take precedence.</p>



      <p>For the same reasons, exclusions must come <em>before</em> the

      there is some relation with worker sharing.</p>

    </div>

    <div class="warning"><h3>Ordering ProxyPass Directives in Locations</h3>

      <p>Only one <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive

      can be placed in a <code class="directive"><a href="../mod/core.html#location">Location</a></code> block,

      and the most specific location will take precedence.</p>

    </div>

    <div class="warning"><h3>Exclusions and the no-proxy environment variable</h3>

      <p>Exclusions must come <em>before</em> the

      general <code class="directive">ProxyPass</code> directives. In 2.4.26 and later, the "no-proxy"

      environment variable is an alternative to exclusions, and is the only

      way to configure an exclusion of a <code class="directive">ProxyPass</code>

docs/manual/rewrite/rewritemap.html.en

+5 −0
Original line number Diff line number Diff line
@@ -430,6 +430,11 @@ this process, or if the script itself is very slow.</li> 
    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">RewriteMap myquery "fastdbd:SELECT destination FROM rewrite WHERE source = %s"</pre>

</div>



    <div class="note"><h3>Note</h3>

    <p>The query name is passed to the database driver as a label for

    an SQL prepared statement, and will therefore need to follow any rules

    (such as case-sensitivity) required for your database.</p></div>



  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

<div class="section">

<h2><a name="summary" id="summary">Summary</a></h2>

docs/manual/rewrite/rewritemap.xml.fr

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

<!-- English Revision: 1827600 -->

<!-- English Revision: 1827600:1828122 (outdated) -->

<!-- French translation : Lucien GENTIS -->

<!-- Reviewed by : VIncent Deffontaines -->

<!--