From: Eric Covener <covener@apache.org>
Date: Fri, 27 Aug 2010 11:00:03 +0000 (+0000)
Subject: emphasize sub-directory behavior, mention limitation of end-of-line ($) char.
X-Git-Tag: 2.2.17~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59b77c1eaa9990c013f6a23e1c8df1f7d06ca3f1;p=thirdparty%2Fapache%2Fhttpd.git

emphasize sub-directory behavior, mention limitation of end-of-line ($) char.

avoid example in sections.xml that uses DirectoryMatch with unmatchable $



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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 43971074f0e..a4fa22d2ea5 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -801,7 +801,7 @@ subdirectories</description>
     <p><directive type="section">DirectoryMatch</directive> and
     <code>&lt;/DirectoryMatch&gt;</code> are used to enclose a group
     of directives which will apply only to the named directory and
-    sub-directories of that directory, the same as <directive
+    <em>sub-directories of that directory</em>, the same as <directive
     module="core" type="section">Directory</directive>. However, it
     takes as an argument a <glossary ref="regex">regular 
     expression</glossary>. For example:</p>
@@ -812,6 +812,11 @@ subdirectories</description>
 
     <p>would match directories in <code>/www/</code> that consisted of three
     numbers.</p>
+
+    <note><title>End-of-line character</title>
+      <p>The end-of-line character ($) cannot be matched with this directive.</p>
+    </note>
+
 </usage>
 <seealso><directive type="section" module="core">Directory</directive> for
 a description of how regular expressions are mixed in with normal
diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml
index 1ff37ba668c..5bebb83ec66 100644
--- a/docs/manual/sections.xml
+++ b/docs/manual/sections.xml
@@ -481,7 +481,7 @@ B<br />
 &lt;/Directory&gt;<br />
 &lt;/VirtualHost&gt;<br />
 <br />
-&lt;DirectoryMatch "^.*b$"&gt;<br />
+&lt;DirectoryMatch "^.*b/"&gt;<br />
 C<br />
 &lt;/DirectoryMatch&gt;<br />
 <br />