From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 18 Aug 2016 04:55:45 +0000 (+0000)
Subject: Improve highlight and formatting. (r1756706 in trunk)
X-Git-Tag: 2.4.24~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47b815f32aba0fc315cf895c50b701124821d9cb;p=thirdparty%2Fapache%2Fhttpd.git

Improve highlight and formatting. (r1756706 in trunk)
Remove some trailing spaces to synch with trunk

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

diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml
index 8c574340306..fc1040f15a5 100644
--- a/docs/manual/mod/mod_alias.xml
+++ b/docs/manual/mod/mod_alias.xml
@@ -48,7 +48,7 @@
     a new location.</p>
 
     <p>When the <directive module="mod_alias">Alias</directive>,
-    <directive module="mod_alias">ScriptAlias</directive> and 
+    <directive module="mod_alias">ScriptAlias</directive> and
     <directive module="mod_alias">Redirect</directive> directives are used
     within a <directive type="section" module="core">Location</directive>
     or <directive type="section" module="core">LocationMatch</directive>
@@ -100,13 +100,13 @@ Alias "/foo" "/gaq"
     ignored.</p>
 
     <p>When the <directive module="mod_alias">Alias</directive>,
-    <directive module="mod_alias">ScriptAlias</directive> and 
+    <directive module="mod_alias">ScriptAlias</directive> and
     <directive module="mod_alias">Redirect</directive> directives are used
     within a <directive type="section" module="core">Location</directive>
     or <directive type="section" module="core">LocationMatch</directive>
     section, these directives will take precedence over any globally
     defined <directive module="mod_alias">Alias</directive>,
-    <directive module="mod_alias">ScriptAlias</directive> and 
+    <directive module="mod_alias">ScriptAlias</directive> and
     <directive module="mod_alias">Redirect</directive> directives.</p>
 
 </section>
@@ -299,7 +299,7 @@ a different URL</description>
 <override>FileInfo</override>
 
 <usage>
-    <p>The Redirect directive maps an old URL into a new one by asking
+    <p>The <directive>Redirect</directive> directive maps an old URL into a new one by asking
     the client to refetch the resource at the new location.</p>
 
     <p>The old <em>URL-path</em> is a case-sensitive (%-decoded) path
@@ -310,10 +310,10 @@ a different URL</description>
     In this latter case the scheme and hostname of the current server will
     be added.</p>
 
-    <p>Then any request beginning with <em>URL-Path</em> will return a
+    <p>Then any request beginning with <em>URL-path</em> will return a
     redirect request to the client at the location of the target
     <em>URL</em>.  Additional path information beyond the matched
-    <em>URL-Path</em> will be appended to the target URL.</p>
+    <em>URL-path</em> will be appended to the target URL.</p>
 
     <highlight language="config">
 # Redirect to a URL on a different host
@@ -341,10 +341,14 @@ Redirect "/one" "/two"
 
 
     <note><title>Note</title>
-    <p>Redirect directives take precedence over Alias and ScriptAlias
+    <p><directive>Redirect</directive> directives take precedence over <directive
+    module="mod_alias">Alias</directive> and <directive
+    module="mod_alias">ScriptAlias</directive>
     directives, irrespective of their ordering in the configuration
-    file. Redirect directives inside a Location take precedence over
-    Redirect and Alias directives with an URL-path.</p></note>
+    file. <directive>Redirect</directive> directives inside a Location take
+    precedence over <directive>Redirect</directive> and <directive
+    module="mod_alias">Alias</directive> directives with an <var>URL-path</var>.</p>
+    </note>
 
     <p>If no <var>status</var> argument is given, the redirect will
     be "temporary" (HTTP status 302). This indicates to the client
@@ -390,8 +394,8 @@ Redirect 303 "/three" "http://example.com/other"
     <p>If the <directive>Redirect</directive> directive is used within 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>.<br />
+    section with the <var>URL-path</var> omitted, then the <var>URL</var> parameter
+    will be interpreted using <a href="../expr.html">expression syntax</a>.<br />
     This syntax is available in Apache 2.4.19 and later.</p>
 
     <highlight language="config">