httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elu...@apache.org
Subject svn commit: r1805196 [3/5] - in /httpd/httpd/trunk/docs/manual: ./ developer/ howto/ mod/ platform/ programs/ rewrite/ ssl/ vhosts/
Date Wed, 16 Aug 2017 13:42:47 GMT
Modified: httpd/httpd/trunk/docs/manual/mod/mod_info.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_info.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_info.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_info.html.en Wed Aug 16 13:42:46 2017
@@ -47,7 +47,7 @@ configuration</td></tr>
 
 
     <p>You may wish to use <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> inside the
-    <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code>
     directive to limit access to your server configuration
     information:</p>
 
@@ -139,8 +139,8 @@ configuration</td></tr>
 
     
     <p>Pre-parsed means that directives like
-    <code class="directive"><a href="../mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> and
-    <code class="directive"><a href="../mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> are
+    <code class="directive"><a href="../mod/core.html#ifdefinesection">&lt;IfDefine&gt;</a></code> and
+    <code class="directive"><a href="../mod/core.html#ifmodulesection">&lt;IfModule&gt;</a></code> are
     evaluated and environment variables are replaced. However it does
     not represent the final state of the configuration. In particular,
     it does not represent the merging or overriding that may happen
@@ -162,18 +162,18 @@ configuration</td></tr>
           <code class="directive"><a href="../mod/mod_so.html#loadfile">LoadFile</a></code>.</li>
       <li>Directives which control the configuration file itself, such as
           <code class="directive"><a href="../mod/core.html#include">Include</a></code>,
-          <code class="directive"><a href="../mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> and
-          <code class="directive"><a href="../mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> are not
+          <code class="directive"><a href="../mod/core.html#ifmodulesection">&lt;IfModule&gt;</a></code> and
+          <code class="directive"><a href="../mod/core.html#ifdefinesection">&lt;IfDefine&gt;</a></code> are not
           listed, but the included configuration directives are.</li>
       <li>Comments are not listed. (This may be considered a feature.)</li>
       <li>Configuration directives from <code>.htaccess</code> files are
           not listed (since they do not form part of the permanent server
           configuration).</li>
       <li>Container directives such as
-          <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+          <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code>
           are listed normally, but <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> cannot figure
           out the line number for the closing
-          <code class="directive"><a href="../mod/core.html#directory">&lt;/Directory&gt;</a></code>.</li>
+          <code class="directive"><a href="../mod/core.html#directorysection">&lt;/Directory&gt;</a></code>.</li>
       <li>Directives generated by third party modules such as <a href="http://perl.apache.org">mod_perl</a>
           might not be listed.</li>
     </ul>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en Wed Aug 16 13:42:46 2017
@@ -1555,7 +1555,7 @@ function silly_mapper(r)
 end</pre>
 
 
-   <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, or htaccess
+   <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#filessection">&lt;Files&gt;</a></code>, or htaccess
    context.</p></div>
 
    <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
@@ -1809,10 +1809,10 @@ LuaPackagePath /scripts/lib/?/init.lua</
     This phase is run immediately after the request has been mapped to a virtal host,
     and can be used to either do some request processing before the other phases kick
     in, or to serve a request without the need to translate, map to storage et cetera.
-    As this phase is run before anything else, directives such as <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> are void in this phase, just as
+    As this phase is run before anything else, directives such as <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code> or <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code> are void in this phase, just as
     URIs have not been properly parsed yet.
     </p>
-   <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, or htaccess
+   <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#filessection">&lt;Files&gt;</a></code>, or htaccess
    context.</p></div>
 
 </div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en Wed Aug 16 13:42:46 2017
@@ -50,7 +50,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
 </ul><h3 class="directives">Directives</h3>
 <ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#macro">&lt;Macro&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#macrosection">&lt;Macro&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#macroignorebadnesting">MacroIgnoreBadNesting</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#macroignoreemptyargs">MacroIgnoreEmptyArgs</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#undefmacro">UndefMacro</a></li>
@@ -63,11 +63,11 @@
 <div class="section">
 <h2><a name="usage" id="usage">Usage</a></h2>
 
-<p>Macros are defined using <code class="directive"><a href="#macro">&lt;Macro&gt;</a></code> blocks, which contain the portion of
+<p>Macros are defined using <code class="directive"><a href="#macrosection">&lt;Macro&gt;</a></code> blocks, which contain the portion of
 your configuration that needs to be repeated, complete with variables
 for those parts that will need to be substituted.</p>
 
-<p>For example, you might use a macro to define a <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> block, in order to define
+<p>For example, you might use a macro to define a <code class="directive"><a href="../mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</a></code> block, in order to define
 multiple similar virtual hosts:</p>
 
 <pre class="prettyprint lang-config">&lt;Macro VHost $name $domain&gt;
@@ -97,7 +97,7 @@ UndefMacro VHost</pre>
 
 <p>At server startup time, each of these <code class="directive"><a href="#use">Use</a></code>
 invocations would be expanded into a full virtualhost, as
-described by the <code class="directive"><a href="#macro">&lt;Macro&gt;</a></code>
+described by the <code class="directive"><a href="#macrosection">&lt;Macro&gt;</a></code>
 definition.</p>
 
 <p>The <code class="directive"><a href="#undefmacro">UndefMacro</a></code> directive is
@@ -199,7 +199,7 @@ UndefMacro DirGroup</pre>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Macro" id="Macro">&lt;Macro&gt;</a> <a name="macro" id="macro">Directive</a></h2>
+<div class="directive-section"><h2><a name="Macrosection" id="Macrosection">&lt;Macro&gt;</a> <a name="macrosection" id="macrosection">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define a configuration file macro</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_mime.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_mime.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_mime.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_mime.html.en Wed Aug 16 13:42:46 2017
@@ -66,7 +66,7 @@
     <p>While <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> associates metadata
     with filename extensions, the <code class="module"><a href="../mod/core.html">core</a></code> server
     provides directives that are used to associate all the files in a
-    given container (<em>e.g.</em>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, or <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>) with particular
+    given container (<em>e.g.</em>, <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code>, or <code class="directive"><a href="../mod/core.html#filessection">&lt;Files&gt;</a></code>) with particular
     metadata. These directives include <code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code>, <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>, <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code>, and <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>.  The core directives
     override any filename extension mappings defined in
     <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code>.</p>
@@ -639,7 +639,7 @@ assigned a language-tag by some other me
 </table>
     <p>The <code class="directive">DefaultLanguage</code> directive tells Apache
     that all resources in the directive's scope (<em>e.g.</em>, all resources
-    covered by the current <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> container) that don't have an explicit language
+    covered by the current <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code> container) that don't have an explicit language
     extension (such as <code>.fr</code> or <code>.de</code> as configured
     by <code class="directive"><a href="#addlanguage">AddLanguage</a></code>) should be
     assigned a Content-Language of <var>language-tag</var>. This allows
@@ -748,7 +748,7 @@ a matching file with MultiViews</td></tr
 
 
     <p><code class="directive">MultiviewsMatch</code> is not allowed in a
-    <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> section.</p>
+    <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code> or <code class="directive"><a href="../mod/core.html#locationmatchsection">&lt;LocationMatch&gt;</a></code> section.</p>
 
 
 <h3>See also</h3>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en Wed Aug 16 13:42:46 2017
@@ -106,14 +106,14 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#balancermember">BalancerMember</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#balancerpersist">BalancerPersist</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxy">&lt;Proxy&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxysection">&lt;Proxy&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyaddheaders">ProxyAddHeaders</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxybadheader">ProxyBadHeader</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyblock">ProxyBlock</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxydomain">ProxyDomain</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyerroroverride">ProxyErrorOverride</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyiobuffersize">ProxyIOBufferSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxymatch">&lt;ProxyMatch&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxymatchsection">&lt;ProxyMatch&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxypassinherit">ProxyPassInherit</a></li>
@@ -357,7 +357,7 @@ ProxyPass "/examples" "http://backend.ex
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="access" id="access">Controlling Access to Your Proxy</a></h2>
-      <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
+      <p>You can control who can access your proxy via the <code class="directive"><a href="#proxysection">&lt;Proxy&gt;</a></code> control block as in
       the following example:</p>
 
       <pre class="prettyprint lang-config">&lt;Proxy *&gt;
@@ -550,8 +550,8 @@ ProxyPass "/examples" "http://backend.ex
             directive and can take any of the key value pair parameters available to
             <code class="directive"><a href="#proxypass">ProxyPass</a></code> directives.</p>
         <p>One additional parameter is available only to <code class="directive">BalancerMember</code> directives:
-            <var>loadfactor</var>. This is the member load factor - a number between 1
-            (default) and 100, which defines the weighted load to be applied to the
+            <var>loadfactor</var>. This is the member load factor - a floating pount number between 1.0
+            (default) and 100.0, which defines the weighted load to be applied to the
             member in question.</p>
         <p>The <var>balancerurl</var> is only needed when not within a
             <code>&lt;Proxy <var>balancer://</var>...&gt;</code>
@@ -706,7 +706,7 @@ NoProxy         .example.com 192.168.112
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Proxy" id="Proxy">&lt;Proxy&gt;</a> <a name="proxy" id="proxy">Directive</a></h2>
+<div class="directive-section"><h2><a name="Proxysection" id="Proxysection">&lt;Proxy&gt;</a> <a name="proxysection" id="proxysection">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Container for directives applied to proxied resources</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</code></td></tr>
@@ -754,7 +754,7 @@ NoProxy         .example.com 192.168.112
       &lt;Proxy http://example.com/foo&gt; matches all of
       http://example.com/foo, http://example.com/foo/bar, and
       http://example.com/foobar.  The matching of the final URL differs
-      from the behavior of the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, which for purposes of this note
+      from the behavior of the <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code> section, which for purposes of this note
       treats the final path component as if it ended in a slash.</p>
       <p>For more control over the matching, see <code class="directive">&lt;ProxyMatch&gt;</code>.</p>
     </div>
@@ -762,7 +762,7 @@ NoProxy         .example.com 192.168.112
 
 <h3>See also</h3>
 <ul>
-<li><code class="directive"><a href="#proxymatch">&lt;ProxyMatch&gt;</a></code></li>
+<li><code class="directive"><a href="#proxymatchsection">&lt;ProxyMatch&gt;</a></code></li>
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -943,7 +943,7 @@ ProxyDomain       ".example.com"</pre>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyMatch" id="ProxyMatch">&lt;ProxyMatch&gt;</a> <a name="proxymatch" id="proxymatch">Directive</a></h2>
+<div class="directive-section"><h2><a name="ProxyMatchsection" id="ProxyMatchsection">&lt;ProxyMatch&gt;</a> <a name="proxymatchsection" id="proxymatchsection">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Container for directives applied to regular-expression-matched
 proxied resources</td></tr>
@@ -953,7 +953,7 @@ proxied resources</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
 </table>
     <p>The <code class="directive">&lt;ProxyMatch&gt;</code> directive is
-    identical to the <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> directive, except that it matches URLs
+    identical to the <code class="directive"><a href="#proxysection">&lt;Proxy&gt;</a></code> directive, except that it matches URLs
     using <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expressions</a>.</p>
 
     <p>From 2.4.8 onwards, named groups and backreferences are captured and
@@ -970,7 +970,7 @@ proxied resources</td></tr>
 
 <h3>See also</h3>
 <ul>
-<li><code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code></li>
+<li><code class="directive"><a href="#proxysection">&lt;Proxy&gt;</a></code></li>
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1025,8 +1025,8 @@ through</td></tr>
     with this section.</div>
 
     <div class="note">This directive is not supported within
-    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> and
-    <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> containers.</div>
+    <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code> and
+    <code class="directive"><a href="../mod/core.html#filessection">&lt;Files&gt;</a></code> containers.</div>
 
     <div class="warning">The <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive should
     usually be set <strong>off</strong> when using
@@ -1046,9 +1046,9 @@ through</td></tr>
     the <code>[P,NE]</code> option to prevent the <code>'|'</code> character
     from being escaped.</div>
 
-    <p>When used inside a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, the first argument is omitted and the local
-    directory is obtained from the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>. The same will occur inside a
-    <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> section;
+    <p>When used inside a <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code> section, the first argument is omitted and the local
+    directory is obtained from the <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code>. The same will occur inside a
+    <code class="directive"><a href="../mod/core.html#locationmatchsection">&lt;LocationMatch&gt;</a></code> section;
     however, ProxyPass does not interpret the regexp as such, so it is necessary
     to use <code class="directive">ProxyPassMatch</code> in this situation instead.</p>
 
@@ -1481,7 +1481,7 @@ ProxyPass "/"             "balancer://my
     <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
+    BalancerMember ajp://1.2.3.5:8009 loadfactor=2.5
     # The server below is on hot standby
     BalancerMember ajp://1.2.3.6:8009 status=+H
     ProxySet lbmethod=bytraffic
@@ -1618,8 +1618,8 @@ ProxyPassReverse  "/mirror/foo/" "https:
     <p>The <code>!</code> directive is useful in situations where you don't want
     to reverse-proxy a subdirectory.</p>
 
-    <p>When used inside a <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> section, the first argument is omitted and the
-    regexp is obtained from the <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>.</p>
+    <p>When used inside a <code class="directive"><a href="../mod/core.html#locationmatchsection">&lt;LocationMatch&gt;</a></code> section, the first argument is omitted and the
+    regexp is obtained from the <code class="directive"><a href="../mod/core.html#locationmatchsection">&lt;LocationMatch&gt;</a></code>.</p>
 
     <p>If you require a more flexible reverse-proxy configuration, see the
     <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive with the
@@ -1703,13 +1703,13 @@ ProxyPassReverseCookiePath  "/"  "/mirro
     Note that interpolation is not supported within the scheme portion of a
     URL.</p>
 
-    <p>When used inside a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, the first argument is omitted and the local
-    directory is obtained from the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>. The same occurs inside a <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> section, but will probably not work as
+    <p>When used inside a <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code> section, the first argument is omitted and the local
+    directory is obtained from the <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code>. The same occurs inside a <code class="directive"><a href="../mod/core.html#locationmatchsection">&lt;LocationMatch&gt;</a></code> section, but will probably not work as
     intended, as ProxyPassReverse will interpret the regexp literally as a
     path; if needed in this situation, specify the ProxyPassReverse outside
-    the section or in a separate <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section.</p>
+    the section or in a separate <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code> section.</p>
 
-    <p>This directive is not supported in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> or <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> sections.</p>
+    <p>This directive is not supported in <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code> or <code class="directive"><a href="../mod/core.html#filessection">&lt;Files&gt;</a></code> sections.</p>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr [utf-8] Wed Aug 16 13:42:46 2017
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1803254 -->
+<!-- English Revision: 1803254:1805188 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] Wed Aug 16 13:42:46 2017
@@ -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:1803254 (outdated) -->
+<!-- English Revision: 344971:1805188 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta Wed Aug 16 13:42:46 2017
@@ -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/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.html.en Wed Aug 16 13:42:46 2017
@@ -45,7 +45,7 @@ Connection: Upgrade</pre>
 </div>
 
 <p>Proxying requests to a websockets server like <code>echo.websocket.org</code> can be done using the
-<code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> directive:</p>
+<code class="directive"><a href="../mod/mod_proxy.html#proxypassProxyPass">ProxyPass</a></code> directive:</p>
     <pre class="prettyprint lang-config">ProxyPass "/ws2/"  "ws://echo.websocket.org/"
 ProxyPass "/wss2/" "wss://echo.websocket.org/"</pre>
 
@@ -53,7 +53,7 @@ ProxyPass "/wss2/" "wss://echo.websocket
 <p>Load balancing for multiple backends can be achieved using <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>.</p>
 
 <p>In fact the module can be used to upgrade to other protocols, you can set the <code>upgrade</code>
-parameter in the <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>
+parameter in the <code class="directive"><a href="../mod/mod_proxy.html#proxypassProxyPass">ProxyPass</a></code>
 directive to allow the module to accept other protocol.
 NONE means you bypass the check for the header but still upgrade to WebSocket.
 ANY means that <code>Upgrade</code> will read in the request headers and use

Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Wed Aug 16 13:42:46 2017
@@ -902,7 +902,7 @@ RewriteRule  "^/$"                 "/hom
       server are inherited. In per-directory context this means
       that conditions and rules of the parent directory's
       <code>.htaccess</code> configuration or
-      <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+      <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code>
       sections are inherited. The inherited rules are virtually copied
       to the section where this directive is being used. If used in
       combination with local rules, the inherited rules are copied behind
@@ -1104,7 +1104,7 @@ RewriteRule  "^/$"                 "/hom
 
 <div class="note"><h3>Per-directory Rewrites</h3>
 <ul>
-<li>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files and in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections, with some additional
+<li>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files and in <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code> sections, with some additional
 complexity.</li>
 
 <li>To enable the rewrite engine in this context, you need to set
@@ -1126,7 +1126,7 @@ a <code class="directive"><a href="#rewr
 <em>never</em> has a leading slash.  Therefore, a <em>Pattern</em> with <code>^/</code> never
 matches in per-directory context.</li>
 
-<li>Although rewrite rules are syntactically permitted in <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> and <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> sections
+<li>Although rewrite rules are syntactically permitted in <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</a></code> and <code class="directive"><a href="../mod/core.html#filessection">&lt;Files&gt;</a></code> sections
 (including their regular expression counterparts), this
 should never be necessary and is unsupported. A likely feature
 to break in these contexts is relative substitutions.</li>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_setenvif.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_setenvif.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_setenvif.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_setenvif.html.en Wed Aug 16 13:42:46 2017
@@ -274,7 +274,7 @@ for additional examples.
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_setenvif</td></tr>
 </table>
     <p>The <code class="directive">SetEnvIfExpr</code> directive defines
-    environment variables based on an <code class="directive"><a href="../mod/core.html#if">&lt;If&gt;</a></code>
+    environment variables based on an <code class="directive"><a href="../mod/core.html#ifsection">&lt;If&gt;</a></code>
     <code>ap_expr</code>. These expressions will be evaluated at runtime,
     and applied <em>env-variable</em> in the same fashion as <code class="directive">SetEnvIf</code>.</p>
 
@@ -294,7 +294,7 @@ for additional examples.
 <ul>
 <li><a href="../expr.html">Expressions in Apache HTTP Server</a>,
 for a complete reference and more examples.</li>
-<li><code class="directive"><a href="../mod/core.html#if">&lt;If&gt;</a></code> can be used to achieve similar
+<li><code class="directive"><a href="../mod/core.html#ifsection">&lt;If&gt;</a></code> can be used to achieve similar
 results.</li>
 <li><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></li>
 </ul>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en Wed Aug 16 13:42:46 2017
@@ -84,6 +84,8 @@ to provide the cryptography engine.</p>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslopensslconfcmd">SSLOpenSSLConfCmd</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ssloptions">SSLOptions</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslpassphrasedialog">SSLPassPhraseDialog</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sslpolicysection">&lt;SSLPolicy&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sslpolicyuse">SSLPolicyUse</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslprotocol">SSLProtocol</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
@@ -98,6 +100,7 @@ to provide the cryptography engine.</p>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sslproxypolicy">SSLProxyPolicy</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxyprotocol">SSLProxyProtocol</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxyverify">SSLProxyVerify</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslproxyverifydepth">SSLProxyVerifyDepth</a></li>
@@ -955,7 +958,7 @@ SSLCryptoDevice ubsec</pre>
 </table>
 <p>
 This directive toggles the usage of the SSL/TLS Protocol Engine. This
-is should be used inside a <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> section to enable SSL/TLS for a
+is should be used inside a <code class="directive"><a href="../mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</a></code> section to enable SSL/TLS for a
 that virtual host. By default the SSL/TLS Protocol Engine is
 disabled for both the main server and all configured virtual hosts.</p>
 <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">&lt;VirtualHost _default_:443&gt;
@@ -1446,6 +1449,152 @@ query can be done in two ways which can
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLPolicysection" id="SSLPolicysection">&lt;SSLPolicy&gt;</a> <a name="sslpolicysection" id="sslpolicysection">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define a named set of SSL configurations</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>&lt;SSLPolicy <em>name</em>&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</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_ssl</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.4.28 and later</td></tr>
+</table>
+<p>This directive defines a set of SSL* configurations under
+and gives it a name. This name can be used in the directives
+<code class="directive">SSLPolicyUse</code> and <code class="directive">SSLProxyPolicy</code>
+to apply this configuration set in the current context.</p>
+
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">&lt;SSLPolicy safe-stapling&gt;
+   SSLUseStapling on
+   SSLStaplingResponderTimeout 2
+   SSLStaplingReturnResponderErrors off
+   SSLStaplingFakeTryLater off
+   SSLStaplingStandardCacheTimeout 86400
+&lt;/SSLPolicy&gt;
+
+   ...
+   &lt;VirtualHost...&gt;
+      SSLPolicy safe-stapling
+      ...</pre>
+</div>
+
+<p>On the one hand, this can make server configurations easier to 
+<em>read</em> and <em>maintain</em>. On the other hand, it is 
+intended to make SSL easier and safer to <em>use</em>. For the 
+latter, Apache httpd ships with a set of pre-defined policies
+that reflect good open source practise. The policy "modern",
+for example, carries the settings to make your server work
+compatible and securely with current browsers.</p>
+
+<p>The list of predefined policies in your Apache can be obtained
+by running the following command. This list shows you the 
+detailed configurations each policy is made of:</p>
+
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-sh">&gt; httpd -t -D DUMP_SSL_POLICIES</pre>
+</div>
+
+<p>The directive can only be used in the server config (global context), so 
+there cannot be two policies with the same name. However, policies can
+be redefined:</p>
+
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">&lt;SSLPolicy proxy-trust&gt;
+   SSLProxyVerify require
+&lt;/SSLPolicy&gt;
+   ...
+&lt;SSLPolicy proxy-trust&gt;
+   SSLProxyVerify none
+&lt;/SSLPolicy&gt;</pre>
+</div>
+
+<p>Policy definitions are <em>added</em> in the order they appear, but are
+<em>applied</em> when the whole configuration is read. This means that any
+use of 'proxy-trust' will mean 'SSLProxyVerify none'. The first definition
+has no effect at all. You can replace policy definitions that have been
+pre-installed without the need to disable them.</p>
+
+<p>Additional to replacing policies, redefinitions may just alter
+an aspect of a policy:</p>
+
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">&lt;SSLPolicy proxy-trust&gt;
+   SSLProxyVerify require
+&lt;/SSLPolicy&gt;
+   ...
+&lt;SSLPolicy proxy-trust&gt;
+   SSLPolicy proxy-trust
+   SSLProxyVerifyDepth 10
+&lt;/SSLPolicy&gt;</pre>
+</div>
+
+<p>This re-uses all settings from the previous 'proxy-trust' and adds
+one directive on top of it. All others still apply. This is very handy
+when pre-defined policies (from Apache itself or a distributor)
+that <em>almost</em> fit ones needs. Previously, such definitions were
+(copied and) edited. This made updating them difficult. Now they can
+be setup like this:</p>
+
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">Include ssl-policies.conf
+
+&lt;SSLPolicy modern&gt;
+   SSLPolicy modern
+   SSLProxyVerify none
+&lt;/SSLPolicy&gt;</pre>
+</div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLPolicyUse" id="SSLPolicyUse">SSLPolicyUse</a> <a name="sslpolicyuse" id="sslpolicyuse">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Apply a SSLPolicy by name</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLPolicy <em>name</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.4.28 and later</td></tr>
+</table>
+<p>This directive applies the set of SSL* directives defined
+under 'name' (see <code class="directive">&lt;SSLPolicy&gt;</code>) as the <em>base</em>
+settings in the current context. That means that any other SSL* directives
+you make in the same context remain effective. So, the effective
+<code class="directive">SSLProtocol</code> value in the following settings are:</p>
+
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">   &lt;VirtualHost...&gt; # effective: 'all'
+      SSLPolicy modern
+      SSLProtocol all
+   &lt;/VirtualHost&gt;
+
+   &lt;VirtualHost...&gt; # effective: 'all'
+      SSLProtocol all
+      SSLPolicy modern
+   &lt;/VirtualHost&gt;
+
+   SSLPolicy modern
+   &lt;VirtualHost...&gt; # effective: 'all'
+      SSLProtocol all
+   &lt;/VirtualHost&gt;
+   
+   SSLProtocol all
+   &lt;VirtualHost...&gt; # effective: '+TLSv1.2'
+     SSLPolicy modern
+   &lt;/VirtualHost&gt;</pre>
+</div>
+
+<p>There can be more than one policy applied in a context. The
+later ones overshadowing the earlier ones:</p>
+
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">   &lt;VirtualHost...&gt; # effective: 'intermediate &gt; modern'
+      SSLPolicy modern
+      SSLPolicy intermediate
+   &lt;/VirtualHost&gt;
+
+   &lt;VirtualHost...&gt; # effective: 'modern &gt; intermediate'
+      SSLPolicy intermediate
+      SSLPolicy modern
+   &lt;/VirtualHost&gt;</pre>
+</div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="SSLProtocol" id="SSLProtocol">SSLProtocol</a> <a name="sslprotocol" id="sslprotocol">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure usable SSL/TLS protocol versions</td></tr>
@@ -1754,13 +1903,13 @@ for additional information.</p>
 </table>
 <p>
 This directive toggles the usage of the SSL/TLS Protocol Engine for proxy. This
-is usually used inside a <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> section to enable SSL/TLS for proxy
+is usually used inside a <code class="directive"><a href="../mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</a></code> section to enable SSL/TLS for proxy
 usage in a particular virtual host. By default the SSL/TLS Protocol Engine is
 disabled for proxy both for the main server and all configured virtual hosts.</p>
 
 <p>Note that the <code class="directive">SSLProxyEngine</code> directive should not, in
 general, be included in a virtual host that will be acting as a
-forward proxy (using <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
+forward proxy (using <code class="directive"><a href="../mod/mod_proxy.html#proxysection">&lt;Proxy&gt;</a></code>
 or <code class="directive"><a href="../mod/mod_proxy.html#proxyrequests">ProxyRequests</a></code> directives).
 <code class="directive">SSLProxyEngine</code> is not required to enable a forward proxy
 server to proxy SSL/TLS requests.</p>
@@ -1851,6 +2000,28 @@ directory contains the appropriate symbo
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyPolicy" id="SSLProxyPolicy">SSLProxyPolicy</a> <a name="sslproxypolicy" id="sslproxypolicy">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Apply the SSLProxy* parts alone of a SSLPolicy</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyPolicy <em>name</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.4.28 and later</td></tr>
+</table>
+<p>This directive is similar to <code class="directive">SSLPolicyUse</code>, but 
+applies only the SSLProxy* directives defined in the policy. This helps
+when you need different policies for front and backends:</p>
+
+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">SSLPolicy modern
+SSLProxyPolicy intermediate</pre>
+</div>
+
+<p>In this example, the 'modern' policy is first applied for front- and backend. The backend
+parts are then overwritten by the 'intermediate' policy settings.</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="SSLProxyProtocol" id="SSLProxyProtocol">SSLProxyProtocol</a> <a name="sslproxyprotocol" id="sslproxyprotocol">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure usable SSL protocol flavors for proxy usage</td></tr>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml.fr?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml.fr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml.fr [utf-8] Wed Aug 16 13:42:46 2017
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1793934 -->
+<!-- English Revision: 1793934:1805185 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 
 <!--

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml.meta?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml.meta Wed Aug 16 13:42:46 2017
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_version.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_version.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_version.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_version.html.en Wed Aug 16 13:42:46 2017
@@ -38,7 +38,7 @@
 
     <p>This module is designed for the use in test suites and large
     networks which have to deal with different httpd versions and
-    different configurations. It provides a new container -- <code class="directive"><a href="#ifversion">&lt;IfVersion&gt;</a></code>, which
+    different configurations. It provides a new container -- <code class="directive"><a href="#ifversionsection">&lt;IfVersion&gt;</a></code>, which
     allows a flexible version checking including numeric comparisons and
     regular expressions.</p>
 
@@ -55,14 +55,14 @@
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#ifversion">&lt;IfVersion&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ifversionsection">&lt;IfVersion&gt;</a></li>
 </ul>
 <h3>Bugfix checklist</h3><ul class="seealso"><li><a href="https://www.apache.org/dist/httpd/CHANGES_2.4">httpd changelog</a></li><li><a href="https://bz.apache.org/bugzilla/buglist.cgi?bug_status=__open__&amp;list_id=144532&amp;product=Apache%20httpd-2&amp;query_format=specific&amp;order=changeddate%20DESC%2Cpriority%2Cbug_severity&amp;component=mod_version">Known issues</a></li><li><a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&amp;component=mod_version">Report a bug</a></li></ul><h3>See also</h3>
 <ul class="seealso">
 <li><a href="#comments_section">Comments</a></li></ul></div>
 
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IfVersion" id="IfVersion">&lt;IfVersion&gt;</a> <a name="ifversion" id="ifversion">Directive</a></h2>
+<div class="directive-section"><h2><a name="IfVersionsection" id="IfVersionsection">&lt;IfVersion&gt;</a> <a name="ifversionsection" id="ifversionsection">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>contains version dependent configuration</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>&lt;IfVersion [[!]<var>operator</var>] <var>version</var>&gt; ...

Modified: httpd/httpd/trunk/docs/manual/mod/module-dict.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/module-dict.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/module-dict.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/module-dict.html.en Wed Aug 16 13:42:46 2017
@@ -94,7 +94,7 @@
 
     <p>This quite simply lists the name of the source file which
     contains the code for the module. This is also the name used by
-    the <code class="directive"><a href="../mod/core.html#ifmodule">&lt;IfModule&gt;</a></code>
+    the <code class="directive"><a href="../mod/core.html#ifmodulesection">&lt;IfModule&gt;</a></code>
     directive.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/mod/overrides.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/overrides.html.en?rev=1805196&r1=1805195&r2=1805196&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/overrides.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/overrides.html.en Wed Aug 16 13:42:46 2017
@@ -98,13 +98,13 @@
 <tr><td colspan="2" class="descr">Maximum inflation ratio for request bodies</td></tr>
 <tr class="odd"><td><a href="core.html#else">&lt;Else&gt;</a></td><td class="module"><a href="core.html">core</a></td></tr>
 <tr class="odd"><td colspan="2" class="descr">Contains directives that apply only if the condition of a
-previous <code class="directive"><a href="../mod/core.html#if">&lt;If&gt;</a></code> or
-<code class="directive"><a href="../mod/core.html#elseif">&lt;ElseIf&gt;</a></code> section is not
+previous <code class="directive"><a href="../mod/core.html#ifsection">&lt;If&gt;</a></code> or
+<code class="directive"><a href="../mod/core.html#elseifsection">&lt;ElseIf&gt;</a></code> section is not
 satisfied by a request at runtime</td></tr>
 <tr><td><a href="core.html#elseif">&lt;ElseIf&gt;</a></td><td class="module"><a href="core.html">core</a></td></tr>
 <tr><td colspan="2" class="descr">Contains directives that apply only if a condition is satisfied
 by a request at runtime while the condition of a previous
-<code class="directive"><a href="../mod/core.html#if">&lt;If&gt;</a></code> or
+<code class="directive"><a href="../mod/core.html#ifsection">&lt;If&gt;</a></code> or
 <code class="directive">&lt;ElseIf&gt;</code> section is not
 satisfied</td></tr>
 <tr class="odd"><td><a href="core.html#error">Error</a></td><td class="module"><a href="core.html">core</a></td></tr>



Mime
View raw message