From: Eric Covener <covener@apache.org>
Date: Sun, 27 Nov 2011 08:28:26 +0000 (+0000)
Subject: Merge r1206680, r1206681, r1206682 from trunk:
X-Git-Tag: 2.2.22~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6495acda57da4073971d331e7bd1e3561b549f98;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1206680, r1206681, r1206682 from trunk:

Replace unusable/fringe absolute path example for AddDescription and list
some weird AddDescription semantics related to directories.

mention IndexIgnore limitation in DirectoryMatch and friends as currently
documented only in bugzilla (PR51471)




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

diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en
index d8d9aaa593a..5a7575c526e 100644
--- a/docs/manual/mod/mod_autoindex.html.en
+++ b/docs/manual/mod/mod_autoindex.html.en
@@ -293,7 +293,8 @@ icon selected by MIME content-type</td></tr>
     <var>String</var> is enclosed in double quotes (<code>"</code>).</p>
 
     <div class="example"><h3>Example</h3><p><code>
-      AddDescription "The planet Mars" /web/pics/mars.gif
+      AddDescription "The planet Mars" mars.gif <br />
+      AddDescription "My friend Marshall" friends/mars.gif
     </code></p></div>
 
     <p>The typical, default description field is 23 bytes wide. 6
@@ -314,6 +315,14 @@ icon selected by MIME content-type</td></tr>
       results may affect the rest of the directory listing.</p>
     </div>
 
+    <div class="note"><h3>Arguments with path information</h3>
+      <p>Absolute paths are not currently supported and do not match
+      anything at runtime. Arguments with relative path information,
+      which would normally only be used in htaccess context, are implicitly 
+      prefixed with '*/' to avoid matching partial directory names.</p>
+    </div>
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="AddIcon" id="AddIcon">AddIcon</a> <a name="addicon" id="addicon">Directive</a></h2>
@@ -529,6 +538,12 @@ a directory</td></tr>
       IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
     </code></p></div>
 
+    <div class="note"><h3>Regular Expressions</h3>
+      <p>This directive does not currently work in configuration sections
+      that have regular expression arguments, such as  <code class="directive"><a href="../mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>
+      </p>
+    </div>
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="IndexOptions" id="IndexOptions">IndexOptions</a> <a name="indexoptions" id="indexoptions">Directive</a></h2>
diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml
index 68772fd88e3..e20130410b0 100644
--- a/docs/manual/mod/mod_autoindex.xml
+++ b/docs/manual/mod/mod_autoindex.xml
@@ -280,7 +280,8 @@ icon selected by MIME content-type</description>
     <var>String</var> is enclosed in double quotes (<code>"</code>).</p>
 
     <example><title>Example</title>
-      AddDescription "The planet Mars" /web/pics/mars.gif
+      AddDescription "The planet Mars" mars.gif <br/>
+      AddDescription "My friend Marshall" friends/mars.gif
     </example>
 
     <p>The typical, default description field is 23 bytes wide. 6
@@ -305,6 +306,14 @@ icon selected by MIME content-type</description>
       element (such as cutting off the end of a bolded phrase), the
       results may affect the rest of the directory listing.</p>
     </note>
+
+    <note><title>Arguments with path information</title>
+      <p>Absolute paths are not currently supported and do not match
+      anything at runtime. Arguments with relative path information,
+      which would normally only be used in htaccess context, are implicitly 
+      prefixed with '*/' to avoid matching partial directory names.</p>
+    </note>
+
 </usage>
 </directivesynopsis>
 
@@ -513,6 +522,13 @@ a directory</description>
     <example>
       IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
     </example>
+
+    <note><title>Regular Expressions</title>
+      <p>This directive does not currently work in configuration sections
+      that have regular expression arguments, such as  <directive
+      module="core" type="section">DirectoryMatch</directive>
+      </p>
+    </note>
 </usage>
 </directivesynopsis>