From 2a7d2f0ce30ed256f5125a40a24db2bae04eb075 Mon Sep 17 00:00:00 2001
From: Lucien Gentis <lgentis@apache.org>
Date: Sun, 14 Jun 2015 15:35:20 +0000
Subject: Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685412 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/install.html.en             |  4 ++--
 docs/manual/install.xml.de              |  2 +-
 docs/manual/install.xml.es              |  2 +-
 docs/manual/install.xml.fr              |  2 +-
 docs/manual/install.xml.ja              |  2 +-
 docs/manual/install.xml.ko              |  2 +-
 docs/manual/install.xml.meta            |  2 +-
 docs/manual/install.xml.tr              |  2 +-
 docs/manual/mod/mod_alias.html.en       | 35 +++++++++++++++++----------------
 docs/manual/mod/mod_authnz_ldap.html.en |  2 +-
 docs/manual/mod/mod_logio.html.en       |  4 ++--
 docs/manual/upgrading.html.en           |  7 +++++++
 12 files changed, 37 insertions(+), 29 deletions(-)

(limited to 'docs')

diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index 1caea60e45..8454e2a997 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -136,9 +136,9 @@
       your system. If you don't, or prefer to not use the system-provided
       versions, download the latest versions of both APR and APR-Util
       from <a href="http://apr.apache.org/">Apache APR</a>, unpack
-      them into <code>./srclib/apr</code> and <code>./srclib/apr-util</code>
+      them into <code>/httpd_source_tree_root/srclib/apr</code> and /httpd_source_tree_root<code>/srclib/apr-util</code>
       (be sure the directory names do not have version numbers; for example,
-      the APR distribution must be under ./srclib/apr/) and use
+      the APR distribution must be under /httpd_source_tree_root/srclib/apr/) and use
       <code>./configure</code>'s <code>--with-included-apr</code>
       option.  On some platforms, you may have to install the
       corresponding <code>-dev</code> packages to allow httpd to build
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de
index 7d5b6b3172..fa44fc6c76 100644
--- a/docs/manual/install.xml.de
+++ b/docs/manual/install.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 239255:1675441 (outdated) -->
+<!-- English Revision: 239255:1685411 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es
index a763acee9b..e7e7b585a2 100644
--- a/docs/manual/install.xml.es
+++ b/docs/manual/install.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 105989:1675441 (outdated) -->
+<!-- English Revision: 105989:1685411 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr
index 96eb1333a3..7fe85a38ad 100644
--- a/docs/manual/install.xml.fr
+++ b/docs/manual/install.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1675441 -->
+<!-- English Revision: 1675441:1685411 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index b0e4ccf35f..7658a00b43 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 527129:1675441 (outdated) -->
+<!-- English Revision: 527129:1685411 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko
index bf8e76ee34..d807b7e9b2 100644
--- a/docs/manual/install.xml.ko
+++ b/docs/manual/install.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1675441 (outdated) -->
+<!-- English Revision: 105989:1685411 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/install.xml.meta b/docs/manual/install.xml.meta
index 6a8403bc30..de3fcaf615 100644
--- a/docs/manual/install.xml.meta
+++ b/docs/manual/install.xml.meta
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/install.xml.tr b/docs/manual/install.xml.tr
index 174a8ad1d5..d2c90e9b11 100644
--- a/docs/manual/install.xml.tr
+++ b/docs/manual/install.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1296735:1675441 (outdated) -->
+<!-- English Revision: 1296735:1685411 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index 50b6eced4d..b6fa262806 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -60,7 +60,7 @@
     or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
     section, <a href="../expr.html">expression syntax</a> can be used
     to manipulate the destination path or URL.
-	</p>
+    </p>
 
     <p><code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> is designed to handle simple URL
     manipulation tasks.  For more complicated tasks such as
@@ -193,7 +193,8 @@ Alias "/foo"     "/gaq"</pre>
     <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 the URL-path is omitted, and the file-path is interpreted
-    using <a href="../expr.html">expression syntax</a>.</p>
+    using <a href="../expr.html">expression syntax</a>.<br />
+    This syntax is available in Apache 2.4.13 and later.</p>
 
     <pre class="prettyprint lang-config">&lt;Location "/image"&gt;
     Alias "/ftp/pub/image"
@@ -278,7 +279,7 @@ expressions</td></tr>
     you do more complicated things.  For example, you could
     serve different kinds of files from different directories:</p>
 
-    <pre class="prettyprint lang-config">AliasMatch "^/image/(.*)\.jpg$" "/files/jpg.images/$1.jpg"<br />
+    <pre class="prettyprint lang-config">AliasMatch "^/image/(.*)\.jpg$" "/files/jpg.images/$1.jpg"
 AliasMatch "^/image/(.*)\.gif$" "/files/gif.images/$1.gif"</pre>
 
 
@@ -327,12 +328,12 @@ Redirect "/one" "/two"</pre>
     <p>If the client requests <code>http://example.com/service/foo.txt</code>,
     it will be told to access
     <code>http://foo2.example.com/service/foo.txt</code>
-	instead. This includes requests with <code>GET</code> parameters, such as
+    instead. This includes requests with <code>GET</code> parameters, such as
     <code>http://example.com/service/foo.pl?q=23&amp;a=42</code>,
     it will be redirected to
     <code>http://foo2.example.com/service/foo.pl?q=23&amp;a=42</code>.
-	Note that <code>POST</code>s will be discarded.<br />
-	Only complete path segments are matched, so the above
+    Note that <code>POST</code>s will be discarded.<br />
+    Only complete path segments are matched, so the above
     example would not match a request for
     <code>http://example.com/servicefoo.txt</code>. For more complex matching
     using the <a href="../expr.html">expression syntax</a>, omit the URL-path
@@ -390,18 +391,18 @@ Redirect 303 "/three" "http://example.com/other"</pre>
     <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 with the URL-path omitted, then the URL parameter will be
-    interpreted using <a href="../expr.html">expression syntax</a>.</p>
+    interpreted using <a href="../expr.html">expression syntax</a>.<br />
+    This syntax is available in Apache 2.4.13 and later.</p>
 
     <pre class="prettyprint lang-config">&lt;Location "/one"&gt;
     Redirect permanent "http://example.com/two"
-&lt;/Location&gt;<br />
+&lt;/Location&gt;
 &lt;Location "/three"&gt;
     Redirect 303 "http://example.com/other"
-&lt;/Location&gt;<br />
+&lt;/Location&gt;
 &lt;LocationMatch "/error/(?&lt;NUMBER&gt;[0-9]+)"&gt;
     Redirect permanent "http://example.com/errors/%{env:MATCH_NUMBER}.html"
-&lt;/LocationMatch&gt;<br />
-    </pre>
+&lt;/LocationMatch&gt;</pre>
 
 
 
@@ -506,10 +507,10 @@ target as a CGI script</td></tr>
 &lt;/Location&gt;</pre>
 
 
-	<p><code class="directive">ScriptAlias</code> can also be used in conjunction with
-	a script or handler you have. For example:</p>
+    <p><code class="directive">ScriptAlias</code> can also be used in conjunction with
+    a script or handler you have. For example:</p>
 
-	<pre class="prettyprint lang-config">ScriptAlias "/cgi-bin/" "/web/cgi-handler.pl"</pre>
+    <pre class="prettyprint lang-config">ScriptAlias "/cgi-bin/" "/web/cgi-handler.pl"</pre>
 
 
     <p>In this scenario all files requested in <code>/cgi-bin/</code> will be
@@ -541,15 +542,15 @@ target as a CGI script</td></tr>
     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 with the URL-path omitted, then the URL parameter will be
-    interpreted using <a href="../expr.html">expression syntax</a>.</p>
+    interpreted using <a href="../expr.html">expression syntax</a>.<br />
+    This syntax is available in Apache 2.4.13 and later.</p>
 
     <pre class="prettyprint lang-config">&lt;Location "/cgi-bin"&gt;
     ScriptAlias "/web/cgi-bin/"
 &lt;/Location&gt;
 &lt;LocationMatch "/cgi-bin/errors/(?&lt;NUMBER&gt;[0-9]+)"&gt;
     ScriptAlias "/web/cgi-bin/errors/%{env:MATCH_NUMBER}.cgi"
-&lt;/LocationMatch&gt;<br />
-    </pre>
+&lt;/LocationMatch&gt;</pre>
 
 
 
diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en
index 9d4f832b4a..95f7cc6a86 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.en
+++ b/docs/manual/mod/mod_authnz_ldap.html.en
@@ -1117,7 +1117,7 @@ to perform a DN lookup</td></tr>
 </table>
     <p>If <code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code> is set to
        <em>ON</em>, the basic authentication username will be transformed according to the
-       regular expression and substituion arguments.</p>
+       regular expression and substitution arguments.</p>
 
     <p> The regular expression argument is compared against the current basic authentication username.
         The substitution argument may contain backreferences, but has no other variable interpolation.</p>
diff --git a/docs/manual/mod/mod_logio.html.en b/docs/manual/mod/mod_logio.html.en
index 4c3eab5c18..0725189e35 100644
--- a/docs/manual/mod/mod_logio.html.en
+++ b/docs/manual/mod/mod_logio.html.en
@@ -89,8 +89,8 @@
 <tr class="odd"><td><code>%^FB</code></td>
         <td>Delay in microseconds between when the request arrived and the
         first byte of the response headers are written.  Only available if
-        <code class="directive">LogIOTrackTTFB</code> is set to ON.
-        </td></tr>
+        <code class="directive">LogIOTrackTTFB</code> is set to ON.<br />
+        Available in Apache 2.4.13 and later</td></tr>
 </table>
 
     <p>Usually, the functionality is used like this:</p>
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index aabccf4f22..91c2737681 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -263,6 +263,13 @@ Allow from example.org</pre>
         option has been removed in favour of per-module <code class="directive"><a href="./mod/core.html#loglevel">LogLevel</a></code> configuration.
         </li>
 
+        <li><code class="module"><a href="./mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code>: The default setting for
+        <code>PATH_INFO</code> has changed from httpd 2.2, and
+        some web applications will no longer operate properly with
+        the new <code>PATH_INFO</code> setting.  The previous setting
+        can be restored by configuring the <code>proxy-scgi-pathinfo</code>
+        variable.</li>
+
         <li><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>: CRL based revocation checking
         now needs to be explicitly configured through <code class="directive"><a href="./mod/mod_ssl.html#sslcarevocationcheck">SSLCARevocationCheck</a></code>.
         </li>
-- 
cgit v1.2.3