[tomcat] branch 10.0.x updated: Fix BZ 62245. Include contextXsltFilein discussion

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
     new 5359e86a4c Fix BZ 62245. Include contextXsltFilein discussion
5359e86a4c is described below

commit 5359e86a4c702aa3e7a013804c58179e89ce6566
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 14 17:14:50 2022 +0100

    Fix BZ 62245. Include contextXsltFilein discussion
    
    https://bz.apache.org/bugzilla/show_bug.cgi?id=62245
---
 webapps/docs/changelog.xml       |  8 ++++++++
 webapps/docs/default-servlet.xml | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7c088a7856..46a3af5e60 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,14 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="Web applications">
+    <changelog>
+      <fix>
+        Documentation. <bug>62245</bug>: Include <code>contextXsltFile</code>
+        when discussing options for configuring directory listings. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <update>
diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml
index d5e5cb5dda..18bb8bafd0 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -221,13 +221,13 @@ to DefaultServlet servlet and make the appropriate adjustments. (If not,
 then that method isn't for you)
 </p>
 <p>
-You can use either  <code>localXsltFile</code> or
-<code>globalXsltFile</code> and DefaultServlet will create
+You can use either  <code>localXsltFile</code>, <code>contextXsltFile</code>
+or <code>globalXsltFile</code> and DefaultServlet will create
 an xml document and run it through an xsl transformation based
-on the values provided in <code>localXsltFile</code> and
-<code>globalXsltFile</code>. <code>localXsltFile</code> is first
-checked, followed by <code>globalXsltFile</code>, then default
-behaviors takes place.
+on the values provided in the XSLT file. <code>localXsltFile</code> is first
+checked, then <code>contextXsltFile</code>, followed by
+<code>globalXsltFile</code>. If no XSLT files are configured, default behavior
+is used.
 </p>
 
 <p>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org