From: Christophe Jaillet <jailletc36@apache.org>
Date: Tue, 9 Jun 2015 05:08:20 +0000 (+0000)
Subject: Add compatibility note.
X-Git-Tag: 2.5.0-alpha~3094
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f385894c28b3734d074862c71183a2052a24468;p=apache

Add compatibility note.
Turn some tabs into space.
Remove some useless <br /> in <highlight> blocks. (this was causing some additionnal blank lines at the end of some examples)

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

diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml
index f967aebe6c..c0b68045ec 100644
--- a/docs/manual/mod/mod_alias.xml
+++ b/docs/manual/mod/mod_alias.xml
@@ -54,7 +54,7 @@
     or <directive type="section" module="core">LocationMatch</directive>
     section, <a href="../expr.html">expression syntax</a> can be used
     to manipulate the destination path or URL.
-	</p>
+    </p>
 
     <p><module>mod_alias</module> is designed to handle simple URL
     manipulation tasks.  For more complicated tasks such as
@@ -182,7 +182,8 @@ Alias "/image" "/ftp/pub/image"
     <directive type="section" module="core">Location</directive>
     or <directive type="section" module="core">LocationMatch</directive>
     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>
 
     <highlight language="config">
 &lt;Location "/image"&gt;
@@ -275,7 +276,7 @@ AliasMatch "^/image/(.*)$" "/ftp/pub/image/$1"
     serve different kinds of files from different directories:</p>
 
     <highlight language="config">
-AliasMatch "^/image/(.*)\.jpg$" "/files/jpg.images/$1.jpg"<br/>
+AliasMatch "^/image/(.*)\.jpg$" "/files/jpg.images/$1.jpg"
 AliasMatch "^/image/(.*)\.gif$" "/files/gif.images/$1.gif"
     </highlight>
 
@@ -325,12 +326,12 @@ Redirect "/one" "/two"
     <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,19 @@ Redirect 303 "/three" "http://example.com/other"
     <directive type="section" module="core">Location</directive>
     or <directive type="section" module="core">LocationMatch</directive>
     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>
 
     <highlight language="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 />
+&lt;/LocationMatch&gt;
     </highlight>
 
 </usage>
@@ -512,12 +514,12 @@ Alias "/cgi-bin/" "/web/cgi-bin/"
 &lt;/Location&gt;
     </highlight>
 
-	<p><directive>ScriptAlias</directive> can also be used in conjunction with
-	a script or handler you have. For example:</p>
+    <p><directive>ScriptAlias</directive> can also be used in conjunction with
+    a script or handler you have. For example:</p>
 
-	<highlight language="config">
+    <highlight language="config">
 ScriptAlias "/cgi-bin/" "/web/cgi-handler.pl"
-        </highlight>
+    </highlight>
 
     <p>In this scenario all files requested in <code>/cgi-bin/</code> will be
     handled by the file you have configured, this allows you to use your own custom
@@ -552,7 +554,8 @@ ScriptAlias "/cgi-bin/" "/web/cgi-handler.pl"
     a <directive type="section" module="core">Location</directive>
     or <directive type="section" module="core">LocationMatch</directive>
     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>
 
     <highlight language="config">
 &lt;Location "/cgi-bin"&gt;
@@ -560,7 +563,7 @@ ScriptAlias "/cgi-bin/" "/web/cgi-handler.pl"
 &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 />
+&lt;/LocationMatch&gt;
     </highlight>
 
 </usage>