Commit 5800f07e authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

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/branches/2.4.x@1684314 13f79535-47bb-0310-9956-ffa450edef68
parent 89f3b76a
Loading
Loading
Loading
Loading
+11 −8
Changes for docs/manual/mod/mod_alias.xml: 11 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -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 @@ expressions</description>
    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>

@@ -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>
@@ -552,7 +554,8 @@ Alias "/cgi-bin/" "/web/cgi-bin/"
    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 @@ Alias "/cgi-bin/" "/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 />
&lt;/LocationMatch&gt;
    </highlight>

</usage>