diff --git a/build.xml b/build.xml
index cdc457b5ff7..fcd8a9efcd3 100644
--- a/build.xml
+++ b/build.xml
@@ -131,7 +131,7 @@
import org.apache.tools.ant.BuildException;
def extensions = [
- 'java', 'jflex', 'py', 'pl', 'g4', 'jj', 'html', 'js', 'xml'
+ 'java', 'jflex', 'py', 'pl', 'g4', 'jj', 'html', 'js', 'xml', 'xsl'
];
def invalidPatterns = [
(~$/@author\b/$) : '@author javadoc tag',
diff --git a/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/query.xsl b/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/query.xsl
index 3be114c2a1c..9bc59e0d297 100644
--- a/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/query.xsl
+++ b/lucene/demo/src/resources/org/apache/lucene/demo/xmlparser/WEB-INF/query.xsl
@@ -18,57 +18,57 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumBooleanQuery.xsl b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumBooleanQuery.xsl
index 9747952fcf7..d420776f8e4 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumBooleanQuery.xsl
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumBooleanQuery.xsl
@@ -18,29 +18,29 @@
+ The query fields are fed directly through an analyzer and so do not need to adhere to
+ traditional Lucene query syntax.
+ -->
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumFilteredQuery.xsl b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumFilteredQuery.xsl
index d3f88991edb..b1369f5f0bf 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumFilteredQuery.xsl
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumFilteredQuery.xsl
@@ -18,30 +18,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Other query fields are fed directly through an analyzer and so do not need to adhere to
+ traditional Lucene query syntax. Terms within a field are ORed while different fields are ANDed
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumLuceneClassicQuery.xsl b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumLuceneClassicQuery.xsl
index 65fe1a8004d..e673a7910af 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumLuceneClassicQuery.xsl
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/albumLuceneClassicQuery.xsl
@@ -18,11 +18,11 @@
+ uses the traditional Lucene query syntax
+ -->
-
+
diff --git a/lucene/site/xsl/index.xsl b/lucene/site/xsl/index.xsl
index 4b37e8b65cf..db424bb07a4 100644
--- a/lucene/site/xsl/index.xsl
+++ b/lucene/site/xsl/index.xsl
@@ -88,8 +88,8 @@