From: Eric Covener <covener@apache.org>
Date: Mon, 21 Nov 2011 01:40:15 +0000 (+0000)
Subject: Merge r1204317 from trunk:
X-Git-Tag: 2.3.16~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=105453833652bce576b5264b2e7144f81de71418;p=apache

Merge r1204317 from trunk:

upgrading/compat notes on some unexpected AddDescription behavior


also: mention in CHANGES



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

diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en
index 8c4e6aefa1..66e5652108 100644
--- a/docs/manual/mod/mod_autoindex.html.en
+++ b/docs/manual/mod/mod_autoindex.html.en
@@ -323,6 +323,10 @@ icon selected by MIME content-type</td></tr>
       element (such as cutting off the end of a bolded phrase), the
       results may affect the rest of the directory listing.</p>
     </div>
+    <div class="note"><h3>Compatibility</h3>
+    <p> Prior to version 2.4, any wild-card expression that contained slashes 
+    was treated as if it started with a '*'.</p>
+    </div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml
index ab5f9acd64..ef3a215e4a 100644
--- a/docs/manual/mod/mod_autoindex.xml
+++ b/docs/manual/mod/mod_autoindex.xml
@@ -314,6 +314,10 @@ 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>Compatibility</title>
+    <p> Prior to version 2.4, any wild-card expression that contained slashes 
+    was treated as if it started with a '*'.</p>
+    </note>
 </usage>
 </directivesynopsis>
 
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index a66e632452..844edd9938 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -274,6 +274,10 @@
       display descriptions for .xhtml files, which were previously
       ignored.</li>
 
+      <li><code class="module"><a href="./mod/mod_autoindex.html">mod_autoindex</a></code>: AddDescription 'file' arguments
+      that contain wild-cards and slashes are no longer implicitly treated 
+      as if they began with a '*' character.</li>
+
       <li><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>: The default format of the <code>*_DN</code>
       variables has changed. The old format can still be used with the new
       <code>LegacyDNStringFormat</code> argument to <code class="directive"><a href="./mod/mod_ssl.html#ssloptions">SSLOptions</a></code>. The SSLv2 protocol is
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index fab9d1cf3b..876fa60423 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -290,6 +290,10 @@
       display descriptions for .xhtml files, which were previously
       ignored.</li>
 
+      <li><module>mod_autoindex</module>: AddDescription 'file' arguments
+      that contain wild-cards and slashes are no longer implicitly treated 
+      as if they began with a '*' character.</li>
+
       <li><module>mod_ssl</module>: The default format of the <code>*_DN</code>
       variables has changed. The old format can still be used with the new
       <code>LegacyDNStringFormat</code> argument to <directive