From: Rich Bowen <rbowen@apache.org>
Date: Fri, 1 May 2009 00:40:41 +0000 (+0000)
Subject: Add a reference to LocationMatch in the seealso section.
X-Git-Tag: 2.3.3~679
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5424d2c9392b266857b2ca1546f9b51f8b61626;p=thirdparty%2Fapache%2Fhttpd.git

Add a reference to LocationMatch in the seealso section.
Encourage people to use LocationMatch rather than Location ~


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index ac02c7a7591..dc5afc634a1 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1987,8 +1987,8 @@ URLs</td></tr>
     characters. Neither wildcard character matches a / in the URL-path.</p>
 
     <p><a class="glossarylink" href="../glossary.html#regex" title="see glossary">Regular expressions</a>
-    can also be used, with the addition of the
-    <code>~</code> character. For example:</p>
+    can also be used, with the addition of the <code>~</code> 
+    character. For example:</p>
 
     <div class="example"><p><code>
       &lt;Location ~ "/(extra|special)/data"&gt;
@@ -1996,7 +1996,9 @@ URLs</td></tr>
 
     <p>would match URLs that contained the substring <code>/extra/data</code>
     or <code>/special/data</code>. The directive <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code> behaves
-    identical to the regex version of <code class="directive">&lt;Location&gt;</code>.</p>
+    identical to the regex version of <code class="directive">&lt;Location&gt;</code>, and is preferred, for the
+    simple reason that <code>~</code> is hard to distinguish from
+    <code>-</code> in many fonts.</p>
 
     <p>The <code class="directive">&lt;Location&gt;</code>
     functionality is especially useful when combined with the
@@ -2038,7 +2040,8 @@ URLs</td></tr>
 <ul>
 <li><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
     and &lt;Files&gt; sections work</a> for an explanation of how these
-    different sections are combined when a request is received</li>
+    different sections are combined when a request is received.</li>
+<li><code class="directive"><a href="#locationmatch">LocationMatch</a></code></li>
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 84b5f7b155f..40f454db7a0 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1970,8 +1970,8 @@ URLs</description>
     characters. Neither wildcard character matches a / in the URL-path.</p>
 
     <p><glossary ref="regex">Regular expressions</glossary>
-    can also be used, with the addition of the
-    <code>~</code> character. For example:</p>
+    can also be used, with the addition of the <code>~</code> 
+    character. For example:</p>
 
     <example>
       &lt;Location ~ "/(extra|special)/data"&gt;
@@ -1981,7 +1981,9 @@ URLs</description>
     or <code>/special/data</code>. The directive <directive
     type="section" module="core">LocationMatch</directive> behaves
     identical to the regex version of <directive
-    type="section">Location</directive>.</p>
+    type="section">Location</directive>, and is preferred, for the
+    simple reason that <code>~</code> is hard to distinguish from
+    <code>-</code> in many fonts.</p>
 
     <p>The <directive type="section">Location</directive>
     functionality is especially useful when combined with the
@@ -2024,7 +2026,8 @@ URLs</description>
 </usage>
 <seealso><a href="../sections.html">How &lt;Directory&gt;, &lt;Location&gt;
     and &lt;Files&gt; sections work</a> for an explanation of how these
-    different sections are combined when a request is received</seealso>
+    different sections are combined when a request is received.</seealso>
+<seealso><directive module="core">LocationMatch</directive></seealso>
 </directivesynopsis>
 
 <directivesynopsis type="section">