This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 63d6b6cf36 Fix BZ 62245. Include contextXsltFilein discussion
63d6b6cf36 is described below
commit 63d6b6cf36e34f751b0ba47d8c1d9f0d71edc266
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 3932930373..e4a3a460f5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,6 +115,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 fc0108946e..b21ec66aab 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -205,13 +205,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
