You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2011/11/27 09:28:27 UTC

svn commit: r1206684 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: mod_autoindex.html.en mod_autoindex.xml

Author: covener
Date: Sun Nov 27 08:28:26 2011
New Revision: 1206684

URL: http://svn.apache.org/viewvc?rev=1206684&view=rev
Log:
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)



Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml   (contents, props changed)

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.html.en?rev=1206684&r1=1206683&r2=1206684&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.html.en Sun Nov 27 08:28:26 2011
@@ -293,7 +293,8 @@ icon selected by MIME content-type</td><
     <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><
       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>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml?rev=1206684&r1=1206683&r2=1206684&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml Sun Nov 27 08:28:26 2011
@@ -280,7 +280,8 @@ icon selected by MIME content-type</desc
     <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</desc
       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>
 

Propchange: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 27 08:28:26 2011
@@ -1 +1 @@
-/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml:395552,417988,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,675610,678761,680082,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693120,693392,693727-693728,696006,697093,703441,703997,706318,707163,708902,711421,719357,720250,726109,728015,728020,728220,729316-729317,729586,732414,732421,732451,732504,732832,733127,733134,733218-733219,733465,733467,733695,734703,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785457,785661,790587,803704,891282,942209,955966,992625,1026743,1058192,1059559-1059589,1070096,1162584,1179266,1179272
+/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml:395552,417988,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,675610,678761,680082,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693120,693392,693727-693728,696006,697093,703441,703997,706318,707163,708902,711421,719357,720250,726109,728015,728020,728220,729316-729317,729586,732414,732421,732451,732504,732832,733127,733134,733218-733219,733465,733467,733695,734703,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785457,785661,790587,803704,891282,942209,955966,992625,1026743,1058192,1059559-1059589,1070096,1162584,1166663,1166667,1179266,1179272,1206680-1206682