diff --git a/README.adoc b/README.adoc
index f15b9315..10936758 100644
--- a/README.adoc
+++ b/README.adoc
@@ -5,32 +5,21 @@ image::https://codecov.io/gh/spring-cloud-incubator/spring-cloud-gateway/branch/
 image::https://api.codacy.com/project/badge/Grade/a6885a06921e4f72a0df0b7aabd6d118["Codacy code quality", link="https://www.codacy.com/app/spring-cloud-incubator/spring-cloud-gateway?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud-incubator/spring-cloud-gateway&utm_campaign=Badge_Grade"]
 
 
-This project provides a library for building an API Gateway on top of the Spring MVC. Spring Cloud Gateway aims to provide a simple, yet effective way to route to APIs and provide cross cutting concerns to them such as: security, monitoring/metrics, and resiliency.
+This project provides a library for building an API Gateway on top of Spring MVC. Spring Cloud Gateway aims to provide a simple, yet effective way to route to APIs and provide cross cutting concerns to them such as: security, monitoring/metrics, and resiliency.
 
 
 == Features
 
-* Spring Boot 1.5
-* Spring MVC `@RestController` method injection of a `ProxyExchange`
-* Build up complex routing and request enhancement using the standard Spring Web toolkit
-
-Example (proxying a request to "/test" downstream to a remote server):
-
-```java
-@RestController
-@SpringBootApplication
-public class GatewaySampleApplication {
-
-	@Value("${remote.home}")
-	private URI home;
-
-	@GetMapping("/test")
-	public ResponseEntity<?> proxy(ProxyExchange<Object> proxy) throws Exception {
-		return proxy.uri(home.toString() + "/image/png").get();
-	}
-
-}
-```
+* Java 8
+* Spring Framework 5
+* Spring Boot 2
+* Dynamic routing
+* Route matching built into Spring Handler Mapping
+* Route matching on HTTP Request (Path, Method, Header, Host, etc...)
+* Filters scoped to Matching Route
+* Filters can modify downstream HTTP Request and HTTP Response (Add/Remove Headers, Add/Remove Parameters, Rewrite Path, Set Path, Hystrix, etc...)
+* API or configuration driven
+* Supports Spring Cloud `DiscoveryClient` for configuring Routes
 
 == Building
 
diff --git a/docs/pom.xml b/docs/pom.xml
index e637653f..34ff534b 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -14,7 +14,7 @@
 	<properties>
 		<docs.main>spring-cloud-gateway</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>1.0.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>1.0.x,2.0.x</docs.whitelisted.branches>
 	</properties>
 	<build>
 		<plugins>
@@ -36,6 +36,10 @@
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 						<inherited>false</inherited>
 					</plugin>
+					<plugin>
+						<groupId>com.agilejava.docbkx</groupId>
+						<artifactId>docbkx-maven-plugin</artifactId>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
diff --git a/docs/src/main/docbook/css/highlight.css b/docs/src/main/docbook/css/highlight.css
new file mode 100644
index 00000000..ffefef72
--- /dev/null
+++ b/docs/src/main/docbook/css/highlight.css
@@ -0,0 +1,35 @@
+/* 
+   code highlight CSS resemblign the Eclipse IDE default color schema
+   @author Costin Leau
+*/
+
+.hl-keyword {
+  color: #7F0055;
+  font-weight: bold; 
+}
+
+.hl-comment {
+  color: #3F5F5F;
+  font-style: italic;
+}
+
+.hl-multiline-comment {
+  color: #3F5FBF;
+  font-style: italic;
+}
+
+.hl-tag {
+  color: #3F7F7F;
+}
+
+.hl-attribute {
+  color: #7F007F;
+}
+
+.hl-value {
+  color: #2A00FF;
+}
+
+.hl-string {
+  color: #2A00FF;
+}
\ No newline at end of file
diff --git a/docs/src/main/docbook/css/manual-multipage.css b/docs/src/main/docbook/css/manual-multipage.css
new file mode 100644
index 00000000..0c484531
--- /dev/null
+++ b/docs/src/main/docbook/css/manual-multipage.css
@@ -0,0 +1,9 @@
+@IMPORT url("manual.css");
+
+body.firstpage {
+	background: url("../images/background.png") no-repeat center top;
+}
+
+div.part h1 {
+    border-top: none;
+}
diff --git a/docs/src/main/docbook/css/manual-singlepage.css b/docs/src/main/docbook/css/manual-singlepage.css
new file mode 100644
index 00000000..4a7fd140
--- /dev/null
+++ b/docs/src/main/docbook/css/manual-singlepage.css
@@ -0,0 +1,6 @@
+@IMPORT url("manual.css");
+
+body {
+	background: url("../images/background.png") no-repeat center top;
+}
+
diff --git a/docs/src/main/docbook/css/manual.css b/docs/src/main/docbook/css/manual.css
new file mode 100644
index 00000000..0ecbe2e8
--- /dev/null
+++ b/docs/src/main/docbook/css/manual.css
@@ -0,0 +1,344 @@
+@IMPORT url("highlight.css");
+
+html {
+	padding: 0pt;
+	margin: 0pt;
+}
+
+body {
+	color: #333333;
+	margin: 15px 30px;
+	font-family: Helvetica, Arial, Freesans, Clean, Sans-serif;
+	line-height: 1.6;
+	-webkit-font-smoothing: antialiased;
+}
+
+code {
+	font-size: 16px;
+	font-family: Consolas, "Liberation Mono", Courier, monospace;
+}
+
+:not(a)>code {
+	color: #6D180B;
+}
+
+:not(pre)>code {
+	background-color: #F2F2F2;
+	border: 1px solid #CCCCCC;
+	border-radius: 4px;
+	padding: 1px 3px 0;
+	text-shadow: none;
+	white-space: nowrap;
+}
+
+body>*:first-child {
+	margin-top: 0 !important;
+}
+
+div {
+	margin: 0pt;
+}
+
+hr {
+	border: 1px solid #CCCCCC;
+	background: #CCCCCC;
+}
+
+h1,h2,h3,h4,h5,h6 {
+	color: #000000;
+	cursor: text;
+	font-weight: bold;
+	margin: 30px 0 10px;
+	padding: 0;
+}
+
+h1,h2,h3 {
+	margin: 40px 0 10px;
+}
+
+h1 {
+	margin: 70px 0 30px;
+	padding-top: 20px;
+}
+
+div.part h1 {
+	border-top: 1px dotted #CCCCCC;
+}
+
+h1,h1 code {
+	font-size: 32px;
+}
+
+h2,h2 code {
+	font-size: 24px;
+}
+
+h3,h3 code {
+	font-size: 20px;
+}
+
+h4,h1 code,h5,h5 code,h6,h6 code {
+	font-size: 18px;
+}
+
+div.book,div.chapter,div.appendix,div.part,div.preface {
+	min-width: 300px;
+	max-width: 1200px;
+	margin: 0 auto;
+}
+
+p.releaseinfo {
+	font-weight: bold;
+	margin-bottom: 40px;
+	margin-top: 40px;
+}
+
+div.authorgroup {
+	line-height: 1;
+}
+
+p.copyright {
+	line-height: 1;
+	margin-bottom: -5px;
+}
+
+.legalnotice p {
+	font-style: italic;
+	font-size: 14px;
+	line-height: 1;
+}
+
+div.titlepage+p,div.titlepage+p {
+	margin-top: 0;
+}
+
+pre {
+	line-height: 1.0;
+	color: black;
+}
+
+a {
+	color: #4183C4;
+	text-decoration: none;
+}
+
+p {
+	margin: 15px 0;
+	text-align: left;
+}
+
+ul,ol {
+	padding-left: 30px;
+}
+
+li p {
+	margin: 0;
+}
+
+div.table {
+	margin: 1em;
+	padding: 0.5em;
+	text-align: center;
+}
+
+div.table table,div.informaltable table {
+	display: table;
+	width: 100%;
+}
+
+div.table td {
+	padding-left: 7px;
+	padding-right: 7px;
+}
+
+.sidebar {
+	line-height: 1.4;
+	padding: 0 20px;
+	background-color: #F8F8F8;
+	border: 1px solid #CCCCCC;
+	border-radius: 3px 3px 3px 3px;
+}
+
+.sidebar p.title {
+	color: #6D180B;
+}
+
+pre.programlisting,pre.screen {
+	font-size: 15px;
+	padding: 6px 10px;
+	background-color: #F8F8F8;
+	border: 1px solid #CCCCCC;
+	border-radius: 3px 3px 3px 3px;
+	clear: both;
+	overflow: auto;
+	line-height: 1.4;
+	font-family: Consolas, "Liberation Mono", Courier, monospace;
+}
+
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+	border: 1px solid #DDDDDD !important;
+	border-radius: 4px !important;
+	border-collapse: separate !important;
+	line-height: 1.6;
+}
+
+table thead {
+	background: #F5F5F5;
+}
+
+table tr {
+	border: none;
+	border-bottom: none;
+}
+
+table th {
+	font-weight: bold;
+}
+
+table th,table td {
+	border: none !important;
+	padding: 6px 13px;
+}
+
+table tr:nth-child(2n) {
+	background-color: #F8F8F8;
+}
+
+td p {
+	margin: 0 0 15px 0;
+}
+
+div.table-contents td p {
+	margin: 0;
+}
+
+div.important *,div.note *,div.tip *,div.warning *,div.navheader *,div.navfooter *,div.calloutlist *
+	{
+	border: none !important;
+	background: none !important;
+	margin: 0;
+}
+
+div.important p,div.note p,div.tip p,div.warning p {
+	color: #6F6F6F;
+	line-height: 1.6;
+}
+
+div.important code,div.note code,div.tip code,div.warning code {
+	background-color: #F2F2F2 !important;
+	border: 1px solid #CCCCCC !important;
+	border-radius: 4px !important;
+	padding: 1px 3px 0 !important;
+	text-shadow: none !important;
+	white-space: nowrap !important;
+}
+
+.note th,.tip th,.warning th {
+	display: none;
+}
+
+.note tr:first-child td,.tip tr:first-child td,.warning tr:first-child td
+	{
+	border-right: 1px solid #CCCCCC !important;
+	padding-top: 10px;
+}
+
+div.calloutlist p,div.calloutlist td {
+	padding: 0;
+	margin: 0;
+}
+
+div.calloutlist>table>tbody>tr>td:first-child {
+	padding-left: 10px;
+	width: 30px !important;
+}
+
+div.important,div.note,div.tip,div.warning {
+	margin-left: 0px !important;
+	margin-right: 20px !important;
+	margin-top: 20px;
+	margin-bottom: 20px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+
+div.toc {
+	line-height: 1.2;
+}
+
+dl,dt {
+	margin-top: 1px;
+	margin-bottom: 0;
+}
+
+div.toc>dl>dt {
+	font-size: 32px;
+	font-weight: bold;
+	margin: 30px 0 10px 0;
+	display: block;
+}
+
+div.toc>dl>dd>dl>dt {
+	font-size: 24px;
+	font-weight: bold;
+	margin: 20px 0 10px 0;
+	display: block;
+}
+
+div.toc>dl>dd>dl>dd>dl>dt {
+	font-weight: bold;
+	font-size: 20px;
+	margin: 10px 0 0 0;
+}
+
+tbody.footnotes * {
+	border: none !important;
+}
+
+div.footnote p {
+	margin: 0;
+	line-height: 1;
+}
+
+div.footnote p sup {
+	margin-right: 6px;
+	vertical-align: middle;
+}
+
+div.navheader {
+	border-bottom: 1px solid #CCCCCC;
+}
+
+div.navfooter {
+	border-top: 1px solid #CCCCCC;
+}
+
+.title {
+	margin-left: -1em;
+	padding-left: 1em;
+}
+
+.title>a {
+	position: absolute;
+	visibility: hidden;
+	display: block;
+	font-size: 0.85em;
+	margin-top: 0.05em;
+	margin-left: -1em;
+	vertical-align: text-top;
+	color: black;
+}
+
+.title>a:before {
+	content: "\00A7";
+}
+
+.title:hover>a,.title>a:hover,.title:hover>a:hover {
+	visibility: visible;
+}
+
+.title:focus>a,.title>a:focus,.title:focus>a:focus {
+	outline: 0;
+}
diff --git a/docs/src/main/docbook/images/background.png b/docs/src/main/docbook/images/background.png
new file mode 100644
index 00000000..15dca6fb
Binary files /dev/null and b/docs/src/main/docbook/images/background.png differ
diff --git a/docs/src/main/docbook/images/caution.png b/docs/src/main/docbook/images/caution.png
new file mode 100644
index 00000000..8a5e4fca
Binary files /dev/null and b/docs/src/main/docbook/images/caution.png differ
diff --git a/docs/src/main/docbook/images/important.png b/docs/src/main/docbook/images/important.png
new file mode 100644
index 00000000..ec54df65
Binary files /dev/null and b/docs/src/main/docbook/images/important.png differ
diff --git a/docs/src/main/docbook/images/logo.png b/docs/src/main/docbook/images/logo.png
new file mode 100644
index 00000000..ade2ce6e
Binary files /dev/null and b/docs/src/main/docbook/images/logo.png differ
diff --git a/docs/src/main/docbook/images/note.png b/docs/src/main/docbook/images/note.png
new file mode 100644
index 00000000..88d997b1
Binary files /dev/null and b/docs/src/main/docbook/images/note.png differ
diff --git a/docs/src/main/docbook/images/sts_exception.png b/docs/src/main/docbook/images/sts_exception.png
new file mode 100644
index 00000000..8607c38a
Binary files /dev/null and b/docs/src/main/docbook/images/sts_exception.png differ
diff --git a/docs/src/main/docbook/images/tip.png b/docs/src/main/docbook/images/tip.png
new file mode 100644
index 00000000..6530abb4
Binary files /dev/null and b/docs/src/main/docbook/images/tip.png differ
diff --git a/docs/src/main/docbook/images/warning.png b/docs/src/main/docbook/images/warning.png
new file mode 100644
index 00000000..0d5b5244
Binary files /dev/null and b/docs/src/main/docbook/images/warning.png differ
diff --git a/docs/src/main/docbook/images/web-selected.png b/docs/src/main/docbook/images/web-selected.png
new file mode 100644
index 00000000..aa6b2da6
Binary files /dev/null and b/docs/src/main/docbook/images/web-selected.png differ
diff --git a/docs/src/main/docbook/xsl/common.xsl b/docs/src/main/docbook/xsl/common.xsl
new file mode 100644
index 00000000..157bf9d8
--- /dev/null
+++ b/docs/src/main/docbook/xsl/common.xsl
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:xslthl="http://xslthl.sf.net"
+		xmlns:d="http://docbook.org/ns/docbook"
+		exclude-result-prefixes="xslthl d"
+		version='1.0'>
+
+	<!-- Extensions -->
+	<xsl:param name="use.extensions">1</xsl:param>
+	<xsl:param name="tablecolumns.extension">0</xsl:param>
+	<xsl:param name="callout.extensions">1</xsl:param>
+
+	<!-- Graphics -->
+	<xsl:param name="admon.graphics" select="1"/>
+	<xsl:param name="admon.graphics.path">images/</xsl:param>
+	<xsl:param name="admon.graphics.extension">.png</xsl:param>
+
+	<!-- Table of Contents -->
+	<xsl:param name="generate.toc">book toc,title</xsl:param>
+	<xsl:param name="toc.section.depth">3</xsl:param>
+
+	<!-- Hide revhistory -->
+	<xsl:template match="d:revhistory" mode="titlepage.mode"/>
+
+</xsl:stylesheet>
diff --git a/docs/src/main/docbook/xsl/epub.xsl b/docs/src/main/docbook/xsl/epub.xsl
new file mode 100644
index 00000000..031406ca
--- /dev/null
+++ b/docs/src/main/docbook/xsl/epub.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:xslthl="http://xslthl.sf.net"
+		xmlns:d="http://docbook.org/ns/docbook"
+		exclude-result-prefixes="xslthl d"
+		version='1.0'>
+
+	<xsl:import href="urn:docbkx:stylesheet"/>
+	<xsl:import href="common.xsl"/>
+
+</xsl:stylesheet>
diff --git a/docs/src/main/docbook/xsl/html-multipage.xsl b/docs/src/main/docbook/xsl/html-multipage.xsl
new file mode 100644
index 00000000..be9cc52d
--- /dev/null
+++ b/docs/src/main/docbook/xsl/html-multipage.xsl
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				version='1.0'>
+
+	<xsl:import href="urn:docbkx:stylesheet"/>
+	<xsl:import href="html.xsl"/>
+
+	<xsl:param name="html.stylesheet">css/manual-multipage.css</xsl:param>
+
+	<xsl:param name="chunk.section.depth">'5'</xsl:param>
+	<xsl:param name="use.id.as.filename">'1'</xsl:param>
+
+	<!-- Replace chunk-element-content from chunk-common to add firstpage class to body -->
+	<xsl:template name="chunk-element-content">
+		<xsl:param name="prev"/>
+		<xsl:param name="next"/>
+		<xsl:param name="nav.context"/>
+		<xsl:param name="content">
+			<xsl:apply-imports/>
+		</xsl:param>
+
+  		<xsl:call-template name="user.preroot"/>
+
+		<html>
+			<xsl:call-template name="html.head">
+			<xsl:with-param name="prev" select="$prev"/>
+			<xsl:with-param name="next" select="$next"/>
+			</xsl:call-template>
+			<body>
+				<xsl:if test="count($prev) = 0">
+					<xsl:attribute name="class">firstpage</xsl:attribute>
+				</xsl:if>
+				<xsl:call-template name="body.attributes"/>
+				<xsl:call-template name="user.header.navigation"/>
+				<xsl:call-template name="header.navigation">
+					<xsl:with-param name="prev" select="$prev"/>
+					<xsl:with-param name="next" select="$next"/>
+					<xsl:with-param name="nav.context" select="$nav.context"/>
+				</xsl:call-template>
+				<xsl:call-template name="user.header.content"/>
+				<xsl:copy-of select="$content"/>
+				<xsl:call-template name="user.footer.content"/>
+				<xsl:call-template name="footer.navigation">
+					<xsl:with-param name="prev" select="$prev"/>
+					<xsl:with-param name="next" select="$next"/>
+					<xsl:with-param name="nav.context" select="$nav.context"/>
+				</xsl:call-template>
+				<xsl:call-template name="user.footer.navigation"/>
+			</body>
+		</html>
+		<xsl:value-of select="$chunk.append"/>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/docs/src/main/docbook/xsl/html-singlepage.xsl b/docs/src/main/docbook/xsl/html-singlepage.xsl
new file mode 100644
index 00000000..6bd4ac81
--- /dev/null
+++ b/docs/src/main/docbook/xsl/html-singlepage.xsl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				version='1.0'>
+
+	<xsl:import href="urn:docbkx:stylesheet"/>
+	<xsl:import href="html.xsl"/>
+
+	<xsl:param name="html.stylesheet">css/manual-singlepage.css</xsl:param>
+
+</xsl:stylesheet>
diff --git a/docs/src/main/docbook/xsl/html.xsl b/docs/src/main/docbook/xsl/html.xsl
new file mode 100644
index 00000000..fd96f9a7
--- /dev/null
+++ b/docs/src/main/docbook/xsl/html.xsl
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:xslthl="http://xslthl.sf.net"
+		xmlns:d="http://docbook.org/ns/docbook"
+		exclude-result-prefixes="xslthl"
+		version='1.0'>
+
+	<xsl:import href="urn:docbkx:stylesheet/highlight.xsl"/>
+	<xsl:import href="common.xsl"/>
+
+	<!-- Only use scaling in FO -->
+	<xsl:param name="ignore.image.scaling">1</xsl:param>
+
+	<!-- Use code syntax highlighting -->
+	<xsl:param name="highlight.source">1</xsl:param>
+
+	<!-- Activate Graphics -->
+	<xsl:param name="callout.graphics" select="1" />
+	<xsl:param name="callout.defaultcolumn">120</xsl:param>
+	<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
+	<xsl:param name="callout.graphics.extension">.png</xsl:param>
+
+	<xsl:param name="table.borders.with.css" select="1"/>
+	<xsl:param name="html.stylesheet.type">text/css</xsl:param>
+
+	<xsl:param name="admonition.title.properties">text-align: left</xsl:param>
+
+	<!-- Leave image paths as relative when navigating XInclude -->
+	<xsl:param name="keep.relative.image.uris" select="1"/>
+
+	<!-- Label Chapters and Sections (numbering) -->
+	<xsl:param name="chapter.autolabel" select="1"/>
+	<xsl:param name="section.autolabel" select="1"/>
+	<xsl:param name="section.autolabel.max.depth" select="2"/>
+	<xsl:param name="section.label.includes.component.label" select="1"/>
+	<xsl:param name="table.footnote.number.format" select="'1'"/>
+
+	<!-- Remove "Chapter" from the Chapter titles... -->
+	<xsl:param name="local.l10n.xml" select="document('')"/>
+	<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+		<l:l10n language="en">
+			<l:context name="title-numbered">
+				<l:template name="chapter" text="%n.&#160;%t"/>
+				<l:template name="section" text="%n&#160;%t"/>
+			</l:context>
+		</l:l10n>
+	</l:i18n>
+
+	<!-- Syntax Highlighting -->
+	<xsl:template match='xslthl:keyword' mode="xslthl">
+		<span class="hl-keyword"><xsl:apply-templates mode="xslthl"/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:comment' mode="xslthl">
+		<span class="hl-comment"><xsl:apply-templates mode="xslthl"/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:oneline-comment' mode="xslthl">
+		<span class="hl-comment"><xsl:apply-templates mode="xslthl"/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:multiline-comment' mode="xslthl">
+		<span class="hl-multiline-comment"><xsl:apply-templates mode="xslthl"/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:tag' mode="xslthl">
+		<span class="hl-tag"><xsl:apply-templates mode="xslthl"/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:attribute' mode="xslthl">
+		<span class="hl-attribute"><xsl:apply-templates mode="xslthl"/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:value' mode="xslthl">
+		<span class="hl-value"><xsl:apply-templates mode="xslthl"/></span>
+	</xsl:template>
+
+	<xsl:template match='xslthl:string' mode="xslthl">
+		<span class="hl-string"><xsl:apply-templates mode="xslthl"/></span>
+	</xsl:template>
+
+	<!-- Custom Title Page -->
+	<xsl:template match="d:author" mode="titlepage.mode">
+		<xsl:if test="name(preceding-sibling::*[1]) = 'author'">
+			<xsl:text>, </xsl:text>
+		</xsl:if>
+		<span class="{name(.)}">
+			<xsl:call-template name="person.name"/>
+			<xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
+		</span>
+	</xsl:template>
+	<xsl:template match="d:authorgroup" mode="titlepage.mode">
+		<div class="{name(.)}">
+			<h2>Authors</h2>
+			<xsl:apply-templates mode="titlepage.mode"/>
+		</div>
+	</xsl:template>
+
+	<!-- Title Links -->
+	<xsl:template name="anchor">
+		<xsl:param name="node" select="."/>
+		<xsl:param name="conditional" select="1"/>
+		<xsl:variable name="id">
+			<xsl:call-template name="object.id">
+				<xsl:with-param name="object" select="$node"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:if test="$conditional = 0 or $node/@id or $node/@xml:id">
+			<xsl:element name="a">
+				<xsl:attribute name="name">
+					<xsl:value-of select="$id"/>
+				</xsl:attribute>
+				<xsl:attribute name="href">
+					<xsl:text>#</xsl:text>
+					<xsl:value-of select="$id"/>
+				</xsl:attribute>
+			</xsl:element>
+		</xsl:if>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/docs/src/main/docbook/xsl/pdf.xsl b/docs/src/main/docbook/xsl/pdf.xsl
new file mode 100644
index 00000000..77360a7b
--- /dev/null
+++ b/docs/src/main/docbook/xsl/pdf.xsl
@@ -0,0 +1,582 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				xmlns:d="http://docbook.org/ns/docbook"
+				xmlns:fo="http://www.w3.org/1999/XSL/Format"
+				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:xlink='http://www.w3.org/1999/xlink'
+				xmlns:exsl="http://exslt.org/common"
+				exclude-result-prefixes="exsl xslthl d xlink"
+				version='1.0'>
+
+	<xsl:import href="urn:docbkx:stylesheet"/>
+	<xsl:import href="urn:docbkx:stylesheet/highlight.xsl"/>
+	<xsl:import href="common.xsl"/>
+
+	<!-- Extensions -->
+	<xsl:param name="fop1.extensions" select="1"/>
+
+	<xsl:param name="paper.type" select="'A4'"/>
+	<xsl:param name="page.margin.top" select="'1cm'"/>
+	<xsl:param name="region.before.extent" select="'1cm'"/>
+	<xsl:param name="body.margin.top" select="'1.5cm'"/>
+
+	<xsl:param name="body.margin.bottom" select="'1.5cm'"/>
+	<xsl:param name="region.after.extent" select="'1cm'"/>
+	<xsl:param name="page.margin.bottom" select="'1cm'"/>
+	<xsl:param name="title.margin.left" select="'0cm'"/>
+
+	<!-- allow break across pages -->
+	<xsl:attribute-set name="formal.object.properties">
+		<xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- use color links and sensible rendering -->
+	<xsl:attribute-set name="xref.properties">
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+		<xsl:attribute name="color">#204060</xsl:attribute>
+	</xsl:attribute-set>
+	<xsl:param name="ulink.show" select="0"></xsl:param>
+	<xsl:param name="ulink.footnotes" select="0"></xsl:param>
+
+	<!-- TITLE PAGE -->
+
+	<xsl:template name="book.titlepage.recto">
+		<fo:block>
+			<fo:table table-layout="fixed" width="175mm">
+				<fo:table-column column-width="175mm"/>
+				<fo:table-body>
+					<fo:table-row>
+						<fo:table-cell text-align="center">
+							<fo:block>
+								<fo:external-graphic src="images/logo.png" width="240px"
+									height="auto" content-width="scale-to-fit"
+									content-height="scale-to-fit"
+									content-type="content-type:image/png" text-align="center"
+								/>
+							</fo:block>
+							<fo:block font-family="Helvetica" font-size="20pt" font-weight="bold" padding="10mm">
+								<xsl:value-of select="d:info/d:title"/>
+							</fo:block>
+							<fo:block font-family="Helvetica" font-size="14pt" padding-before="2mm">
+								<xsl:value-of select="d:info/d:subtitle"/>
+							</fo:block>
+							<fo:block font-family="Helvetica" font-size="14pt" padding="2mm">
+								<xsl:value-of select="d:info/d:releaseinfo"/>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+					<fo:table-row>
+						<fo:table-cell text-align="center">
+							<fo:block font-family="Helvetica" font-size="14pt" padding="5mm">
+								<xsl:value-of select="d:info/d:pubdate"/>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+					<fo:table-row>
+						<fo:table-cell text-align="center">
+							<fo:block font-family="Helvetica" font-size="10pt" padding="10mm">
+								<xsl:for-each select="d:info/d:authorgroup/d:author">
+									<xsl:if test="position() > 1">
+										<xsl:text>, </xsl:text>
+									</xsl:if>
+									<xsl:value-of select="."/>
+								</xsl:for-each>
+							</fo:block>
+
+							<fo:block font-family="Helvetica" font-size="10pt" padding="5mm">
+								<xsl:value-of select="d:info/d:pubdate"/>
+							</fo:block>
+
+							<fo:block font-family="Helvetica" font-size="10pt" padding="5mm" padding-before="25em">
+								<xsl:text>Copyright &#xA9; </xsl:text><xsl:value-of select="d:info/d:copyright"/>
+							</fo:block>
+
+							<fo:block font-family="Helvetica" font-size="8pt" padding="1mm">
+								<xsl:value-of select="d:info/d:legalnotice"/>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+				</fo:table-body>
+			</fo:table>
+		</fo:block>
+	</xsl:template>
+
+	<!-- Prevent blank pages in output -->
+	<xsl:template name="book.titlepage.before.verso">
+	</xsl:template>
+	<xsl:template name="book.titlepage.verso">
+	</xsl:template>
+	<xsl:template name="book.titlepage.separator">
+	</xsl:template>
+
+	<!--  HEADER -->
+
+	<!-- More space in the center header for long text -->
+	<xsl:attribute-set name="header.content.properties">
+		<xsl:attribute name="font-family">
+			<xsl:value-of select="$body.font.family"/>
+		</xsl:attribute>
+		<xsl:attribute name="margin-left">-5em</xsl:attribute>
+		<xsl:attribute name="margin-right">-5em</xsl:attribute>
+		<xsl:attribute name="font-size">8pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="header.content">
+		<xsl:param name="pageclass" select="''"/>
+		<xsl:param name="sequence" select="''"/>
+		<xsl:param name="position" select="''"/>
+		<xsl:param name="gentext-key" select="''"/>
+
+		<xsl:variable name="Version">
+			<xsl:choose>
+				<xsl:when test="//d:title">
+					<xsl:value-of select="//d:title"/><xsl:text> </xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>please define title in your docbook file!</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<xsl:choose>
+			<xsl:when test="$sequence='blank'">
+				<xsl:choose>
+					<xsl:when test="$position='center'">
+						<xsl:value-of select="$Version"/>
+					</xsl:when>
+
+					<xsl:otherwise>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+
+			<xsl:when test="$pageclass='titlepage'">
+			</xsl:when>
+
+			<xsl:when test="$position='center'">
+				<xsl:value-of select="$Version"/>
+			</xsl:when>
+
+			<xsl:otherwise>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<!-- FOOTER-->
+	<xsl:attribute-set name="footer.content.properties">
+		<xsl:attribute name="font-family">
+			<xsl:value-of select="$body.font.family"/>
+		</xsl:attribute>
+		<xsl:attribute name="font-size">8pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="footer.content">
+		<xsl:param name="pageclass" select="''"/>
+		<xsl:param name="sequence" select="''"/>
+		<xsl:param name="position" select="''"/>
+		<xsl:param name="gentext-key" select="''"/>
+
+		<xsl:variable name="Version">
+			<xsl:choose>
+				<xsl:when test="//d:releaseinfo">
+					<xsl:value-of select="//d:releaseinfo"/>
+				</xsl:when>
+				<xsl:otherwise>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<xsl:variable name="Title">
+			<xsl:choose>
+				<xsl:when test="//d:productname">
+					<xsl:value-of select="//d:productname"/><xsl:text> </xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>please define title in your docbook file!</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<xsl:choose>
+			<xsl:when test="$sequence='blank'">
+				<xsl:choose>
+					<xsl:when test="$double.sided != 0 and $position = 'left'">
+						<xsl:value-of select="$Version"/>
+					</xsl:when>
+
+					<xsl:when test="$double.sided = 0 and $position = 'center'">
+					</xsl:when>
+
+					<xsl:otherwise>
+						<fo:page-number/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+
+			<xsl:when test="$pageclass='titlepage'">
+			</xsl:when>
+
+			<xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
+				<fo:page-number/>
+			</xsl:when>
+
+			<xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
+				<fo:page-number/>
+			</xsl:when>
+
+			<xsl:when test="$double.sided = 0 and $position='right'">
+				<fo:page-number/>
+			</xsl:when>
+
+			<xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'">
+				<xsl:value-of select="$Version"/>
+			</xsl:when>
+
+			<xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'">
+				<xsl:value-of select="$Version"/>
+			</xsl:when>
+
+			<xsl:when test="$double.sided = 0 and $position='left'">
+				<xsl:value-of select="$Version"/>
+			</xsl:when>
+
+			<xsl:when test="$position='center'">
+				<xsl:value-of select="$Title"/>
+			</xsl:when>
+
+			<xsl:otherwise>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="processing-instruction('hard-pagebreak')">
+		<fo:block break-before='page'/>
+	</xsl:template>
+
+
+	<!-- PAPER & PAGE SIZE -->
+
+	<!-- Paper type, no headers on blank pages, no double sided printing -->
+	<xsl:param name="double.sided">0</xsl:param>
+	<xsl:param name="headers.on.blank.pages">0</xsl:param>
+	<xsl:param name="footers.on.blank.pages">0</xsl:param>
+
+	<!-- FONTS & STYLES -->
+
+	<xsl:param name="hyphenate">false</xsl:param>
+
+	<!-- Default Font size -->
+	<xsl:param name="body.font.family">Helvetica</xsl:param>
+	<xsl:param name="body.font.master">10</xsl:param>
+	<xsl:param name="body.font.small">8</xsl:param>
+	<xsl:param name="title.font.family">Helvetica</xsl:param>
+
+	<!-- Line height in body text -->
+	<xsl:param name="line-height">1.4</xsl:param>
+
+	<!-- Chapter title size -->
+	<xsl:attribute-set name="chapter.titlepage.recto.style">
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 1.8"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Why is the font-size for chapters hardcoded in the XSL FO templates?
+	Let's remove it, so this sucker can use our attribute-set only... -->
+	<xsl:template match="d:title" mode="chapter.titlepage.recto.auto.mode">
+		<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+				xsl:use-attribute-sets="chapter.titlepage.recto.style">
+			<xsl:call-template name="component.title">
+			<xsl:with-param name="node" select="ancestor-or-self::d:chapter[1]"/>
+			</xsl:call-template>
+		</fo:block>
+	</xsl:template>
+
+	<!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
+	<xsl:attribute-set name="section.title.level1.properties">
+		<xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 1.5"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="section.title.level2.properties">
+		<xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 1.25"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="section.title.level3.properties">
+		<xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 1.0"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="section.title.level4.properties">
+		<xsl:attribute name="space-before.optimum">0.3em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.3em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.3em</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 0.9"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+
+	<!-- TABLES -->
+
+	<!-- Some padding inside tables -->
+	<xsl:attribute-set name="table.cell.padding">
+		<xsl:attribute name="padding-left">4pt</xsl:attribute>
+		<xsl:attribute name="padding-right">4pt</xsl:attribute>
+		<xsl:attribute name="padding-top">4pt</xsl:attribute>
+		<xsl:attribute name="padding-bottom">4pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Only hairlines as frame and cell borders in tables -->
+	<xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
+	<xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
+
+	<!-- LABELS -->
+
+	<!-- Label Chapters and Sections (numbering) -->
+	<xsl:param name="chapter.autolabel" select="1"/>
+	<xsl:param name="section.autolabel" select="1"/>
+	<xsl:param name="section.autolabel.max.depth" select="1"/>
+
+	<xsl:param name="section.label.includes.component.label" select="1"/>
+	<xsl:param name="table.footnote.number.format" select="'1'"/>
+
+	<!-- PROGRAMLISTINGS -->
+
+	<!-- Verbatim text formatting (programlistings) -->
+	<xsl:attribute-set name="monospace.verbatim.properties">
+		<xsl:attribute name="font-size">7pt</xsl:attribute>
+		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
+		<xsl:attribute name="keep-together.within-column">1</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="verbatim.properties">
+		<xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+		<xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+
+		<xsl:attribute name="border-color">#444444</xsl:attribute>
+		<xsl:attribute name="border-style">solid</xsl:attribute>
+		<xsl:attribute name="border-width">0.1pt</xsl:attribute>
+		<xsl:attribute name="padding-top">0.5em</xsl:attribute>
+		<xsl:attribute name="padding-left">0.5em</xsl:attribute>
+		<xsl:attribute name="padding-right">0.5em</xsl:attribute>
+		<xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
+		<xsl:attribute name="margin-left">0.5em</xsl:attribute>
+		<xsl:attribute name="margin-right">0.5em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Shade (background) programlistings -->
+	<xsl:param name="shade.verbatim">1</xsl:param>
+	<xsl:attribute-set name="shade.verbatim.style">
+		<xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="list.block.spacing">
+		<xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="example.properties">
+		<xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
+		<xsl:attribute name="space-before.optimum">0.5em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.5em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="sidebar.properties">
+		<xsl:attribute name="border-color">#444444</xsl:attribute>
+		<xsl:attribute name="border-style">solid</xsl:attribute>
+		<xsl:attribute name="border-width">0.1pt</xsl:attribute>
+		<xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+	</xsl:attribute-set>
+
+
+	<!-- TITLE INFORMATION FOR FIGURES, EXAMPLES ETC. -->
+
+	<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="font-style">italic</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="hyphenate">false</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- CALLOUTS -->
+
+	<!-- don't use images for callouts -->
+	<xsl:param name="callout.graphics">0</xsl:param>
+	<xsl:param name="callout.unicode">1</xsl:param>
+
+	<!-- Place callout marks at this column in annotated areas -->
+	<xsl:param name="callout.defaultcolumn">90</xsl:param>
+
+	<!-- MISC -->
+
+	<!-- Placement of titles -->
+	<xsl:param name="formal.title.placement">
+		figure after
+		example after
+		equation before
+		table before
+		procedure before
+	</xsl:param>
+
+	<!-- Format Variable Lists as Blocks (prevents horizontal overflow) -->
+	<xsl:param name="variablelist.as.blocks">1</xsl:param>
+	<xsl:param name="body.start.indent">0pt</xsl:param>
+
+	<!-- Remove "Chapter" from the Chapter titles... -->
+	<xsl:param name="local.l10n.xml" select="document('')"/>
+	<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+		<l:l10n language="en">
+			<l:context name="title-numbered">
+				<l:template name="chapter" text="%n.&#160;%t"/>
+				<l:template name="section" text="%n&#160;%t"/>
+			</l:context>
+			<l:context name="title">
+				<l:template name="example" text="Example&#160;%n&#160;%t"/>
+			</l:context>
+		</l:l10n>
+	</l:i18n>
+
+	<!-- admon -->
+	<xsl:param name="admon.graphics" select="0"/>
+
+	<xsl:attribute-set name="nongraphical.admonition.properties">
+		<xsl:attribute name="margin-left">0.1em</xsl:attribute>
+		<xsl:attribute name="margin-right">2em</xsl:attribute>
+		<xsl:attribute name="border-left-width">.75pt</xsl:attribute>
+		<xsl:attribute name="border-left-style">solid</xsl:attribute>
+		<xsl:attribute name="border-left-color">#5c5c4f</xsl:attribute>
+		<xsl:attribute name="padding-left">0.5em</xsl:attribute>
+		<xsl:attribute name="space-before.optimum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">1.5em</xsl:attribute>
+	</xsl:attribute-set>
+
+    <xsl:attribute-set name="admonition.title.properties">
+		<xsl:attribute name="font-size">10pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="hyphenate">false</xsl:attribute>
+		<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+		<xsl:attribute name="margin-left">0</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="admonition.properties">
+		<xsl:attribute name="space-before.optimum">0em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Asciidoc -->
+	<xsl:template match="processing-instruction('asciidoc-br')">
+		<fo:block/>
+	</xsl:template>
+
+	<xsl:template match="processing-instruction('asciidoc-hr')">
+		<fo:block space-after="1em">
+			<fo:leader leader-pattern="rule" rule-thickness="0.5pt" rule-style="solid" leader-length.minimum="100%"/>
+		</fo:block>
+	</xsl:template>
+
+  <xsl:template match="processing-instruction('asciidoc-pagebreak')">
+    <fo:block break-after='page'/>
+  </xsl:template>
+
+	<!-- SYNTAX HIGHLIGHT -->
+
+	<xsl:template match='xslthl:keyword' mode="xslthl">
+	  <fo:inline font-weight="bold" color="#7F0055"><xsl:apply-templates mode="xslthl"/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:string' mode="xslthl">
+	  <fo:inline font-weight="bold" font-style="italic" color="#2A00FF"><xsl:apply-templates mode="xslthl"/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:comment' mode="xslthl">
+	  <fo:inline font-style="italic" color="#3F5FBF"><xsl:apply-templates mode="xslthl"/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:tag' mode="xslthl">
+	  <fo:inline font-weight="bold" color="#3F7F7F"><xsl:apply-templates mode="xslthl"/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:attribute' mode="xslthl">
+	  <fo:inline font-weight="bold" color="#7F007F"><xsl:apply-templates mode="xslthl"/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match='xslthl:value' mode="xslthl">
+	  <fo:inline font-weight="bold" color="#2A00FF"><xsl:apply-templates mode="xslthl"/></fo:inline>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/docs/src/main/docbook/xsl/xslthl-config.xml b/docs/src/main/docbook/xsl/xslthl-config.xml
new file mode 100644
index 00000000..e4d677fc
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl-config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xslthl-config>
+	<highlighter id="java" file="./xslthl/java-hl.xml" />
+	<highlighter id="groovy" file="./xslthl/java-hl.xml" />
+	<highlighter id="html" file="./xslthl/html-hl.xml" />
+	<highlighter id="ini" file="./xslthl/ini-hl.xml" />
+	<highlighter id="php" file="./xslthl/php-hl.xml" />
+	<highlighter id="c" file="./xslthl/c-hl.xml" />
+	<highlighter id="cpp" file="./xslthl/cpp-hl.xml" />
+	<highlighter id="csharp" file="./xslthl/csharp-hl.xml" />
+	<highlighter id="python" file="./xslthl/python-hl.xml" />
+	<highlighter id="ruby" file="./xslthl/ruby-hl.xml" />
+	<highlighter id="perl" file="./xslthl/perl-hl.xml" />
+	<highlighter id="javascript" file="./xslthl/javascript-hl.xml" />
+	<highlighter id="bash" file="./xslthl/bourne-hl.xml" />
+	<highlighter id="css" file="./xslthl/css-hl.xml" />
+	<highlighter id="sql" file="./xslthl/sql2003-hl.xml" />
+	<highlighter id="asciidoc" file="./xslthl/asciidoc-hl.xml" />
+	<highlighter id="properties" file="./xslthl/properties-hl.xml" />
+	<highlighter id="json" file="./xslthl/json-hl.xml" />
+	<highlighter id="yaml" file="./xslthl/yaml-hl.xml" />
+	<namespace prefix="xslthl" uri="http://xslthl.sf.net" />
+</xslthl-config>
diff --git a/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml b/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
new file mode 100644
index 00000000..5478b1d6
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for AsciiDoc files
+
+-->
+<highlighters>
+  <highlighter type="multiline-comment">
+    <start>////</start>
+    <end>////</end>
+  </highlighter>
+  <highlighter type="oneline-comment">
+    <start>//</start>
+    <solitary/>
+  </highlighter>
+  <highlighter type="regex">
+    <pattern>^(={1,6} .+)$</pattern>
+    <style>heading</style>
+    <flags>MULTILINE</flags>
+  </highlighter>
+  <highlighter type="regex">
+    <pattern>^(\.[^\.\s].+)$</pattern>
+    <style>title</style>
+    <flags>MULTILINE</flags>
+  </highlighter>
+  <highlighter type="regex">
+    <pattern>^(:!?\w.*?:)</pattern>
+    <style>attribute</style>
+    <flags>MULTILINE</flags>
+  </highlighter>
+  <highlighter type="regex">
+    <pattern>^(-|\*{1,5}|\d*\.{1,5})(?= .+$)</pattern>
+    <style>bullet</style>
+    <flags>MULTILINE</flags>
+  </highlighter>
+  <highlighter type="regex">
+    <pattern>^(\[.+\])$</pattern>
+    <style>attribute</style>
+    <flags>MULTILINE</flags>
+  </highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml b/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
new file mode 100644
index 00000000..e2cd98d8
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Syntax highlighting definition for SH
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2010 Mathieu Malaterre
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="heredoc">
+		<start>&lt;&lt;</start>
+		<quote>'</quote>
+		<quote>"</quote>
+		<flag>-</flag>
+		<noWhiteSpace />
+		<looseTerminator />
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+		<spanNewLines />
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts />
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<!-- reserved words -->
+		<keyword>if</keyword>
+		<keyword>then</keyword>
+		<keyword>else</keyword>
+		<keyword>elif</keyword>
+		<keyword>fi</keyword>
+		<keyword>case</keyword>
+		<keyword>esac</keyword>
+		<keyword>for</keyword>
+		<keyword>while</keyword>
+		<keyword>until</keyword>
+		<keyword>do</keyword>
+		<keyword>done</keyword>
+		<!-- built-ins -->
+		<keyword>exec</keyword>
+		<keyword>shift</keyword>
+		<keyword>exit</keyword>
+		<keyword>times</keyword>
+		<keyword>break</keyword>
+		<keyword>export</keyword>
+		<keyword>trap</keyword>
+		<keyword>continue</keyword>
+		<keyword>readonly</keyword>
+		<keyword>wait</keyword>
+		<keyword>eval</keyword>
+		<keyword>return</keyword>
+		<!-- other commands -->
+		<keyword>cd</keyword>
+		<keyword>echo</keyword>
+		<keyword>hash</keyword>
+		<keyword>pwd</keyword>
+		<keyword>read</keyword>
+		<keyword>set</keyword>
+		<keyword>test</keyword>
+		<keyword>type</keyword>
+		<keyword>ulimit</keyword>
+		<keyword>umask</keyword>
+		<keyword>unset</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/c-hl.xml b/docs/src/main/docbook/xsl/xslthl/c-hl.xml
new file mode 100644
index 00000000..176cc379
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/c-hl.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Syntax highlighting definition for C
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start><![CDATA[/// ]]></start>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="oneline-comment">
+		<!-- use the online-comment highlighter to detect directives -->
+		<start>#</start>
+		<lineBreakEscape>\</lineBreakEscape>
+		<style>directive</style>
+		<solitary />
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts />
+		<exponent>e</exponent>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>f</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>auto</keyword>
+		<keyword>_Bool</keyword>
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>char</keyword>
+		<keyword>_Complex</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>default</keyword>
+		<keyword>do</keyword>
+		<keyword>double</keyword>
+		<keyword>else</keyword>
+		<keyword>enum</keyword>
+		<keyword>extern</keyword>
+		<keyword>float</keyword>
+		<keyword>for</keyword>
+		<keyword>goto</keyword>
+		<keyword>if</keyword>
+		<keyword>_Imaginary</keyword>
+		<keyword>inline</keyword>
+		<keyword>int</keyword>
+		<keyword>long</keyword>
+		<keyword>register</keyword>
+		<keyword>restrict</keyword>
+		<keyword>return</keyword>
+		<keyword>short</keyword>
+		<keyword>signed</keyword>
+		<keyword>sizeof</keyword>
+		<keyword>static</keyword>
+		<keyword>struct</keyword>
+		<keyword>switch</keyword>
+		<keyword>typedef</keyword>
+		<keyword>union</keyword>
+		<keyword>unsigned</keyword>
+		<keyword>void</keyword>
+		<keyword>volatile</keyword>
+		<keyword>while</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml b/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
new file mode 100644
index 00000000..ef83c4f5
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for C++
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start><![CDATA[/// ]]></start>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="oneline-comment">
+		<!-- use the online-comment highlighter to detect directives -->
+		<start>#</start>
+		<lineBreakEscape>\</lineBreakEscape>
+		<style>directive</style>
+		<solitary/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts />
+		<exponent>e</exponent>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>f</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<!-- C keywords -->
+		<keyword>auto</keyword>
+		<keyword>_Bool</keyword>
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>char</keyword>
+		<keyword>_Complex</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>default</keyword>
+		<keyword>do</keyword>
+		<keyword>double</keyword>
+		<keyword>else</keyword>
+		<keyword>enum</keyword>
+		<keyword>extern</keyword>
+		<keyword>float</keyword>
+		<keyword>for</keyword>
+		<keyword>goto</keyword>
+		<keyword>if</keyword>
+		<keyword>_Imaginary</keyword>
+		<keyword>inline</keyword>
+		<keyword>int</keyword>
+		<keyword>long</keyword>
+		<keyword>register</keyword>
+		<keyword>restrict</keyword>
+		<keyword>return</keyword>
+		<keyword>short</keyword>
+		<keyword>signed</keyword>
+		<keyword>sizeof</keyword>
+		<keyword>static</keyword>
+		<keyword>struct</keyword>
+		<keyword>switch</keyword>
+		<keyword>typedef</keyword>
+		<keyword>union</keyword>
+		<keyword>unsigned</keyword>
+		<keyword>void</keyword>
+		<keyword>volatile</keyword>
+		<keyword>while</keyword>
+		<!-- C++ keywords -->
+		<keyword>asm</keyword>
+		<keyword>dynamic_cast</keyword>
+		<keyword>namespace</keyword>
+		<keyword>reinterpret_cast</keyword>
+		<keyword>try</keyword>
+		<keyword>bool</keyword>
+		<keyword>explicit</keyword>
+		<keyword>new</keyword>
+		<keyword>static_cast</keyword>
+		<keyword>typeid</keyword>
+		<keyword>catch</keyword>
+		<keyword>false</keyword>
+		<keyword>operator</keyword>
+		<keyword>template</keyword>
+		<keyword>typename</keyword>
+		<keyword>class</keyword>
+		<keyword>friend</keyword>
+		<keyword>private</keyword>
+		<keyword>this</keyword>
+		<keyword>using</keyword>
+		<keyword>const_cast</keyword>
+		<keyword>inline</keyword>
+		<keyword>public</keyword>
+		<keyword>throw</keyword>
+		<keyword>virtual</keyword>
+		<keyword>delete</keyword>
+		<keyword>mutable</keyword>
+		<keyword>protected</keyword>
+		<keyword>true</keyword>
+		<keyword>wchar_t</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml b/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
new file mode 100644
index 00000000..d57e6310
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for C#
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start>///</start>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="annotation">
+		<!-- annotations are called (custom) "attributes" in .NET -->
+		<start>[</start>
+		<end>]</end>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<!-- C# supports a couple of directives -->
+		<start>#</start>
+		<lineBreakEscape>\</lineBreakEscape>
+		<style>directive</style>
+		<solitary/>
+	</highlighter>
+	<highlighter type="string">
+		<!-- strings starting with an "@" can span multiple lines -->
+		<string>@"</string>
+		<endString>"</endString>
+		<escape>\</escape>
+		<spanNewLines />
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts />
+		<exponent>e</exponent>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>m</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>abstract</keyword>
+		<keyword>as</keyword>
+		<keyword>base</keyword>
+		<keyword>bool</keyword>
+		<keyword>break</keyword>
+		<keyword>byte</keyword>
+		<keyword>case</keyword>
+		<keyword>catch</keyword>
+		<keyword>char</keyword>
+		<keyword>checked</keyword>
+		<keyword>class</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>decimal</keyword>
+		<keyword>default</keyword>
+		<keyword>delegate</keyword>
+		<keyword>do</keyword>
+		<keyword>double</keyword>
+		<keyword>else</keyword>
+		<keyword>enum</keyword>
+		<keyword>event</keyword>
+		<keyword>explicit</keyword>
+		<keyword>extern</keyword>
+		<keyword>false</keyword>
+		<keyword>finally</keyword>
+		<keyword>fixed</keyword>
+		<keyword>float</keyword>
+		<keyword>for</keyword>
+		<keyword>foreach</keyword>
+		<keyword>goto</keyword>
+		<keyword>if</keyword>
+		<keyword>implicit</keyword>
+		<keyword>in</keyword>
+		<keyword>int</keyword>
+		<keyword>interface</keyword>
+		<keyword>internal</keyword>
+		<keyword>is</keyword>
+		<keyword>lock</keyword>
+		<keyword>long</keyword>
+		<keyword>namespace</keyword>
+		<keyword>new</keyword>
+		<keyword>null</keyword>
+		<keyword>object</keyword>
+		<keyword>operator</keyword>
+		<keyword>out</keyword>
+		<keyword>override</keyword>
+		<keyword>params</keyword>
+		<keyword>private</keyword>
+		<keyword>protected</keyword>
+		<keyword>public</keyword>
+		<keyword>readonly</keyword>
+		<keyword>ref</keyword>
+		<keyword>return</keyword>
+		<keyword>sbyte</keyword>
+		<keyword>sealed</keyword>
+		<keyword>short</keyword>
+		<keyword>sizeof</keyword>
+		<keyword>stackalloc</keyword>
+		<keyword>static</keyword>
+		<keyword>string</keyword>
+		<keyword>struct</keyword>
+		<keyword>switch</keyword>
+		<keyword>this</keyword>
+		<keyword>throw</keyword>
+		<keyword>true</keyword>
+		<keyword>try</keyword>
+		<keyword>typeof</keyword>
+		<keyword>uint</keyword>
+		<keyword>ulong</keyword>
+		<keyword>unchecked</keyword>
+		<keyword>unsafe</keyword>
+		<keyword>ushort</keyword>
+		<keyword>using</keyword>
+		<keyword>virtual</keyword>
+		<keyword>void</keyword>
+		<keyword>volatile</keyword>
+		<keyword>while</keyword>
+	</highlighter>
+	<highlighter type="keywords">
+		<!-- special words, not really keywords -->
+		<keyword>add</keyword>
+		<keyword>alias</keyword>
+		<keyword>from</keyword>
+		<keyword>get</keyword>
+		<keyword>global</keyword>
+		<keyword>group</keyword>
+		<keyword>into</keyword>
+		<keyword>join</keyword>
+		<keyword>orderby</keyword>
+		<keyword>partial</keyword>
+		<keyword>remove</keyword>
+		<keyword>select</keyword>
+		<keyword>set</keyword>
+		<keyword>value</keyword>
+		<keyword>where</keyword>
+		<keyword>yield</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/css-hl.xml b/docs/src/main/docbook/xsl/xslthl/css-hl.xml
new file mode 100644
index 00000000..164c48c3
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/css-hl.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for CSS files
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2011-2012 Martin Hujer, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Martin Hujer <mhujer at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+Reference: http://www.w3.org/TR/CSS21/propidx.html
+
+-->
+<highlighters>
+    <highlighter type="multiline-comment">
+        <start>/*</start>
+        <end>*/</end>
+    </highlighter>
+    <highlighter type="string">
+		<string>"</string>
+        <escape>\</escape>
+        <spanNewLines/>
+    </highlighter>
+    <highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+        <spanNewLines/>
+    </highlighter>
+    <highlighter type="number">
+        <point>.</point>
+        <pointStarts />
+    </highlighter>
+    <highlighter type="word">
+    	<word>@charset</word>
+    	<word>@import</word>
+    	<word>@media</word>
+    	<word>@page</word>
+    	<style>directive</style>
+    </highlighter>
+    <highlighter type="keywords">
+        <partChars>-</partChars>
+        <keyword>azimuth</keyword>
+        <keyword>background-attachment</keyword>
+        <keyword>background-color</keyword>
+        <keyword>background-image</keyword>
+        <keyword>background-position</keyword>
+        <keyword>background-repeat</keyword>
+        <keyword>background</keyword>
+        <keyword>border-collapse</keyword>
+        <keyword>border-color</keyword>
+        <keyword>border-spacing</keyword>
+        <keyword>border-style</keyword>
+        <keyword>border-top</keyword>
+        <keyword>border-right</keyword>
+        <keyword>border-bottom</keyword>
+        <keyword>border-left</keyword>
+        <keyword>border-top-color</keyword>
+        <keyword>border-right-color</keyword>
+        <keyword>border-bottom-color</keyword>
+        <keyword>border-left-color</keyword>
+        <keyword>border-top-style</keyword>
+        <keyword>border-right-style</keyword>
+        <keyword>border-bottom-style</keyword>
+        <keyword>border-left-style</keyword>
+        <keyword>border-top-width</keyword>
+        <keyword>border-right-width</keyword>
+        <keyword>border-bottom-width</keyword>
+        <keyword>border-left-width</keyword>
+        <keyword>border-width</keyword>
+        <keyword>border</keyword>
+        <keyword>bottom</keyword>
+        <keyword>caption-side</keyword>
+        <keyword>clear</keyword>
+        <keyword>clip</keyword>
+        <keyword>color</keyword>
+        <keyword>content</keyword>
+        <keyword>counter-increment</keyword>
+        <keyword>counter-reset</keyword>
+        <keyword>cue-after</keyword>
+        <keyword>cue-before</keyword>
+        <keyword>cue</keyword>
+        <keyword>cursor</keyword>
+        <keyword>direction</keyword>
+        <keyword>display</keyword>
+        <keyword>elevation</keyword>
+        <keyword>empty-cells</keyword>
+        <keyword>float</keyword>
+        <keyword>font-family</keyword>
+        <keyword>font-size</keyword>
+        <keyword>font-style</keyword>
+        <keyword>font-variant</keyword>
+        <keyword>font-weight</keyword>
+        <keyword>font</keyword>
+        <keyword>height</keyword>
+        <keyword>left</keyword>
+        <keyword>letter-spacing</keyword>
+        <keyword>line-height</keyword>
+        <keyword>list-style-image</keyword>
+        <keyword>list-style-position</keyword>
+        <keyword>list-style-type</keyword>
+        <keyword>list-style</keyword>
+        <keyword>margin-right</keyword>
+        <keyword>margin-left</keyword>
+        <keyword>margin-top</keyword>
+        <keyword>margin-bottom</keyword>
+        <keyword>margin</keyword>
+        <keyword>max-height</keyword>
+        <keyword>max-width</keyword>
+        <keyword>min-height</keyword>
+        <keyword>min-width</keyword>
+        <keyword>orphans</keyword>
+        <keyword>outline-color</keyword>
+        <keyword>outline-style</keyword>
+        <keyword>outline-width</keyword>
+        <keyword>outline</keyword>
+        <keyword>overflow</keyword>
+        <keyword>padding-top</keyword>
+        <keyword>padding-right</keyword>
+        <keyword>padding-bottom</keyword>
+        <keyword>padding-left</keyword>
+        <keyword>padding</keyword>
+        <keyword>page-break-after</keyword>
+        <keyword>page-break-before</keyword>
+        <keyword>page-break-inside</keyword>
+        <keyword>pause-after</keyword>
+        <keyword>pause-before</keyword>
+        <keyword>pause</keyword>
+        <keyword>pitch-range</keyword>
+        <keyword>pitch</keyword>
+        <keyword>play-during</keyword>
+        <keyword>position</keyword>
+        <keyword>quotes</keyword>
+        <keyword>richness</keyword>
+        <keyword>right</keyword>
+        <keyword>speak-header</keyword>
+        <keyword>speak-numeral</keyword>
+        <keyword>speak-punctuation</keyword>
+        <keyword>speak</keyword>
+        <keyword>speech-rate</keyword>
+        <keyword>stress</keyword>
+        <keyword>table-layout</keyword>
+        <keyword>text-align</keyword>
+        <keyword>text-decoration</keyword>
+        <keyword>text-indent</keyword>
+        <keyword>text-transform</keyword>
+        <keyword>top</keyword>
+        <keyword>unicode-bidi</keyword>
+        <keyword>vertical-align</keyword>
+        <keyword>visibility</keyword>
+        <keyword>voice-family</keyword>
+        <keyword>volume</keyword>
+        <keyword>white-space</keyword>
+        <keyword>widows</keyword>
+        <keyword>width</keyword>
+        <keyword>word-spacing</keyword>
+        <keyword>z-index</keyword>
+    </highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/html-hl.xml b/docs/src/main/docbook/xsl/xslthl/html-hl.xml
new file mode 100644
index 00000000..5b6761ba
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/html-hl.xml
@@ -0,0 +1,122 @@
+<?xml version='1.0'?>
+<!--
+
+  Bakalarska prace: Zvyraznovani syntaxe v XSLT
+  Michal Molhanec 2005
+
+  myxml-hl.xml - konfigurace zvyraznovace XML, ktera zvlast zvyrazni
+                 HTML elementy a XSL elementy
+
+  This file has been customized for the Asciidoctor project (http://asciidoctor.org).
+-->
+<highlighters>
+  <highlighter type="xml">
+    <elementSet>
+      <style>htmltag</style>
+      <element>a</element>
+      <element>abbr</element>
+      <element>address</element>
+      <element>area</element>
+      <element>article</element>
+      <element>aside</element>
+      <element>audio</element>
+      <element>b</element>
+      <element>base</element>
+      <element>bdi</element>
+      <element>blockquote</element>
+      <element>body</element>
+      <element>br</element>
+      <element>button</element>
+      <element>caption</element>
+      <element>canvas</element>
+      <element>cite</element>
+      <element>code</element>
+      <element>command</element>
+      <element>col</element>
+      <element>colgroup</element>
+      <element>dd</element>
+      <element>del</element>
+      <element>dialog</element>
+      <element>div</element>
+      <element>dl</element>
+      <element>dt</element>
+      <element>em</element>
+      <element>embed</element>
+      <element>fieldset</element>
+      <element>figcaption</element>
+      <element>figure</element>
+      <element>font</element>
+      <element>form</element>
+      <element>footer</element>
+      <element>h1</element>
+      <element>h2</element>
+      <element>h3</element>
+      <element>h4</element>
+      <element>h5</element>
+      <element>h6</element>
+      <element>head</element>
+      <element>header</element>
+      <element>hr</element>
+      <element>html</element>
+      <element>i</element>
+      <element>iframe</element>
+      <element>img</element>
+      <element>input</element>
+      <element>ins</element>
+      <element>kbd</element>
+      <element>label</element>
+      <element>legend</element>
+      <element>li</element>
+      <element>link</element>
+      <element>map</element>
+      <element>mark</element>
+      <element>menu</element>
+      <element>menu</element>
+      <element>meta</element>
+      <element>nav</element>
+      <element>noscript</element>
+      <element>object</element>
+      <element>ol</element>
+      <element>optgroup</element>
+      <element>option</element>
+      <element>p</element>
+      <element>param</element>
+      <element>pre</element>
+      <element>q</element>
+      <element>samp</element>
+      <element>script</element>
+      <element>section</element>
+      <element>select</element>
+      <element>small</element>
+      <element>source</element>
+      <element>span</element>
+      <element>strong</element>
+      <element>style</element>
+      <element>sub</element>
+      <element>summary</element>
+      <element>sup</element>
+      <element>table</element>
+      <element>tbody</element>
+      <element>td</element>
+      <element>textarea</element>
+      <element>tfoot</element>
+      <element>th</element>
+      <element>thead</element>
+      <element>time</element>
+      <element>title</element>
+      <element>tr</element>
+      <element>track</element>
+      <element>u</element>
+      <element>ul</element>
+      <element>var</element>
+      <element>video</element>
+      <element>wbr</element>
+      <element>xmp</element>
+      <ignoreCase/>
+    </elementSet>
+    <elementPrefix>
+      <style>namespace</style>
+      <prefix>xsl:</prefix>
+    </elementPrefix>
+  </highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/ini-hl.xml b/docs/src/main/docbook/xsl/xslthl/ini-hl.xml
new file mode 100644
index 00000000..34c10363
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/ini-hl.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for ini files
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">;</highlighter>
+	<highlighter type="regex">
+		<!-- ini sections -->
+		<pattern>^(\[.+\]\s*)$</pattern>
+		<style>keyword</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<!-- the keys in an ini section -->
+		<pattern>^(.+)(?==)</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/java-hl.xml b/docs/src/main/docbook/xsl/xslthl/java-hl.xml
new file mode 100644
index 00000000..f7bb1641
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/java-hl.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Java
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="annotation">
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>abstract</keyword>
+		<keyword>boolean</keyword>
+		<keyword>break</keyword>
+		<keyword>byte</keyword>
+		<keyword>case</keyword>
+		<keyword>catch</keyword>
+		<keyword>char</keyword>
+		<keyword>class</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>default</keyword>
+		<keyword>do</keyword>
+		<keyword>double</keyword>
+		<keyword>else</keyword>
+		<keyword>extends</keyword>
+		<keyword>final</keyword>
+		<keyword>finally</keyword>
+		<keyword>float</keyword>
+		<keyword>for</keyword>
+		<keyword>goto</keyword>
+		<keyword>if</keyword>
+		<keyword>implements</keyword>
+		<keyword>import</keyword>
+		<keyword>instanceof</keyword>
+		<keyword>int</keyword>
+		<keyword>interface</keyword>
+		<keyword>long</keyword>
+		<keyword>native</keyword>
+		<keyword>new</keyword>
+		<keyword>package</keyword>
+		<keyword>private</keyword>
+		<keyword>protected</keyword>
+		<keyword>public</keyword>
+		<keyword>return</keyword>
+		<keyword>short</keyword>
+		<keyword>static</keyword>
+		<keyword>strictfp</keyword>
+		<keyword>super</keyword>
+		<keyword>switch</keyword>
+		<keyword>synchronized</keyword>
+		<keyword>this</keyword>
+		<keyword>throw</keyword>
+		<keyword>throws</keyword>
+		<keyword>transient</keyword>
+		<keyword>try</keyword>
+		<keyword>void</keyword>
+		<keyword>volatile</keyword>
+		<keyword>while</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml b/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
new file mode 100644
index 00000000..99b8a71e
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for JavaScript
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>catch</keyword>
+		<keyword>continue</keyword>
+		<keyword>default</keyword>
+		<keyword>delete</keyword>
+		<keyword>do</keyword>
+		<keyword>else</keyword>
+		<keyword>finally</keyword>
+		<keyword>for</keyword>
+		<keyword>function</keyword>
+		<keyword>if</keyword>
+		<keyword>in</keyword>
+		<keyword>instanceof</keyword>
+		<keyword>new</keyword>
+		<keyword>return</keyword>
+		<keyword>switch</keyword>
+		<keyword>this</keyword>
+		<keyword>throw</keyword>
+		<keyword>try</keyword>
+		<keyword>typeof</keyword>
+		<keyword>var</keyword>
+		<keyword>void</keyword>
+		<keyword>while</keyword>
+		<keyword>with</keyword>
+		<!-- future keywords -->
+		<keyword>abstract</keyword>
+		<keyword>boolean</keyword>
+		<keyword>byte</keyword>
+		<keyword>char</keyword>
+		<keyword>class</keyword>
+		<keyword>const</keyword>
+		<keyword>debugger</keyword>
+		<keyword>double</keyword>
+		<keyword>enum</keyword>
+		<keyword>export</keyword>
+		<keyword>extends</keyword>
+		<keyword>final</keyword>
+		<keyword>float</keyword>
+		<keyword>goto</keyword>
+		<keyword>implements</keyword>
+		<keyword>import</keyword>
+		<keyword>int</keyword>
+		<keyword>interface</keyword>
+		<keyword>long</keyword>
+		<keyword>native</keyword>
+		<keyword>package</keyword>
+		<keyword>private</keyword>
+		<keyword>protected</keyword>
+		<keyword>public</keyword>
+		<keyword>short</keyword>
+		<keyword>static</keyword>
+		<keyword>super</keyword>
+		<keyword>synchronized</keyword>
+		<keyword>throws</keyword>
+		<keyword>transient</keyword>
+		<keyword>volatile</keyword>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>prototype</keyword>
+		<!-- Global Objects -->
+		<keyword>Array</keyword>
+		<keyword>Boolean</keyword>
+		<keyword>Date</keyword>
+		<keyword>Error</keyword>
+		<keyword>EvalError</keyword>
+		<keyword>Function</keyword>
+		<keyword>Math</keyword>
+		<keyword>Number</keyword>
+		<keyword>Object</keyword>
+		<keyword>RangeError</keyword>
+		<keyword>ReferenceError</keyword>
+		<keyword>RegExp</keyword>
+		<keyword>String</keyword>
+		<keyword>SyntaxError</keyword>
+		<keyword>TypeError</keyword>
+		<keyword>URIError</keyword>
+		<!-- Global functions -->
+		<keyword>decodeURI</keyword>
+		<keyword>decodeURIComponent</keyword>
+		<keyword>encodeURI</keyword>
+		<keyword>encodeURIComponent</keyword>
+		<keyword>eval</keyword>
+		<keyword>isFinite</keyword>
+		<keyword>isNaN</keyword>
+		<keyword>parseFloat</keyword>
+		<keyword>parseInt</keyword>
+		<!-- Global properties -->
+		<keyword>Infinity</keyword>
+		<keyword>NaN</keyword>
+		<keyword>undefined</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/json-hl.xml b/docs/src/main/docbook/xsl/xslthl/json-hl.xml
new file mode 100644
index 00000000..59b9c481
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/json-hl.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="annotation">
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>true</keyword>
+		<keyword>false</keyword>
+	</highlighter>
+	<highlighter type="word">
+		<word>{</word>
+		<word>}</word>
+		<word>,</word>
+		<word>[</word>
+		<word>]</word>
+		<style>keyword</style>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/perl-hl.xml b/docs/src/main/docbook/xsl/xslthl/perl-hl.xml
new file mode 100644
index 00000000..73d71cc0
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/perl-hl.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Perl
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="heredoc">
+		<start>&lt;&lt;</start>
+		<quote>'</quote>
+		<quote>"</quote>
+		<noWhiteSpace/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts />
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>if</keyword>
+		<keyword>unless</keyword>
+		<keyword>while</keyword>
+		<keyword>until</keyword>
+		<keyword>foreach</keyword>
+		<keyword>else</keyword>
+		<keyword>elsif</keyword>
+		<keyword>for</keyword>
+		<keyword>when</keyword>
+		<keyword>default</keyword>
+		<keyword>given</keyword>
+		<!-- Keywords related to the control flow of your perl program  -->
+		<keyword>caller</keyword>
+		<keyword>continue</keyword>
+		<keyword>die</keyword>
+		<keyword>do</keyword>
+		<keyword>dump</keyword>
+		<keyword>eval</keyword>
+		<keyword>exit</keyword>
+		<keyword>goto</keyword>
+		<keyword>last</keyword>
+		<keyword>next</keyword>
+		<keyword>redo</keyword>
+		<keyword>return</keyword>
+		<keyword>sub</keyword>
+		<keyword>wantarray</keyword>
+		<!-- Keywords related to scoping  -->
+		<keyword>caller</keyword>
+		<keyword>import</keyword>
+		<keyword>local</keyword>
+		<keyword>my</keyword>
+		<keyword>package</keyword>
+		<keyword>use</keyword>
+		<!-- Keywords related to perl modules  -->
+		<keyword>do</keyword>
+		<keyword>import</keyword>
+		<keyword>no</keyword>
+		<keyword>package</keyword>
+		<keyword>require</keyword>
+		<keyword>use</keyword>
+		<!-- Keywords related to classes and object-orientedness  -->
+		<keyword>bless</keyword>
+		<keyword>dbmclose</keyword>
+		<keyword>dbmopen</keyword>
+		<keyword>package</keyword>
+		<keyword>ref</keyword>
+		<keyword>tie</keyword>
+		<keyword>tied</keyword>
+		<keyword>untie</keyword>
+		<keyword>use</keyword>
+		<!-- operators -->
+		<keyword>and</keyword>
+		<keyword>or</keyword>
+		<keyword>not</keyword>
+		<keyword>eq</keyword>
+		<keyword>ne</keyword>
+		<keyword>lt</keyword>
+		<keyword>gt</keyword>
+		<keyword>le</keyword>
+		<keyword>ge</keyword>
+		<keyword>cmp</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/php-hl.xml b/docs/src/main/docbook/xsl/xslthl/php-hl.xml
new file mode 100644
index 00000000..1da25b8c
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/php-hl.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for PHP
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start><![CDATA[/// ]]></start>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+		<spanNewLines />
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+		<spanNewLines />
+	</highlighter>
+	<highlighter type="heredoc">
+		<start>&lt;&lt;&lt;</start>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>and</keyword>
+		<keyword>or</keyword>
+		<keyword>xor</keyword>
+		<keyword>__FILE__</keyword>
+		<keyword>exception</keyword>
+		<keyword>__LINE__</keyword>
+		<keyword>array</keyword>
+		<keyword>as</keyword>
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>class</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>declare</keyword>
+		<keyword>default</keyword>
+		<keyword>die</keyword>
+		<keyword>do</keyword>
+		<keyword>echo</keyword>
+		<keyword>else</keyword>
+		<keyword>elseif</keyword>
+		<keyword>empty</keyword>
+		<keyword>enddeclare</keyword>
+		<keyword>endfor</keyword>
+		<keyword>endforeach</keyword>
+		<keyword>endif</keyword>
+		<keyword>endswitch</keyword>
+		<keyword>endwhile</keyword>
+		<keyword>eval</keyword>
+		<keyword>exit</keyword>
+		<keyword>extends</keyword>
+		<keyword>for</keyword>
+		<keyword>foreach</keyword>
+		<keyword>function</keyword>
+		<keyword>global</keyword>
+		<keyword>if</keyword>
+		<keyword>include</keyword>
+		<keyword>include_once</keyword>
+		<keyword>isset</keyword>
+		<keyword>list</keyword>
+		<keyword>new</keyword>
+		<keyword>print</keyword>
+		<keyword>require</keyword>
+		<keyword>require_once</keyword>
+		<keyword>return</keyword>
+		<keyword>static</keyword>
+		<keyword>switch</keyword>
+		<keyword>unset</keyword>
+		<keyword>use</keyword>
+		<keyword>var</keyword>
+		<keyword>while</keyword>
+		<keyword>__FUNCTION__</keyword>
+		<keyword>__CLASS__</keyword>
+		<keyword>__METHOD__</keyword>
+		<keyword>final</keyword>
+		<keyword>php_user_filter</keyword>
+		<keyword>interface</keyword>
+		<keyword>implements</keyword>
+		<keyword>extends</keyword>
+		<keyword>public</keyword>
+		<keyword>private</keyword>
+		<keyword>protected</keyword>
+		<keyword>abstract</keyword>
+		<keyword>clone</keyword>
+		<keyword>try</keyword>
+		<keyword>catch</keyword>
+		<keyword>throw</keyword>
+		<keyword>cfunction</keyword>
+		<keyword>old_function</keyword>
+		<keyword>true</keyword>
+		<keyword>false</keyword>
+		<!-- PHP 5.3 -->
+		<keyword>namespace</keyword>
+		<keyword>__NAMESPACE__</keyword>
+		<keyword>goto</keyword>
+		<keyword>__DIR__</keyword>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="word">
+		<!-- highlight the php open and close tags as directives -->
+		<word>?&gt;</word>
+		<word>&lt;?php</word>
+		<word>&lt;?=</word>
+		<style>directive</style>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/properties-hl.xml b/docs/src/main/docbook/xsl/xslthl/properties-hl.xml
new file mode 100644
index 00000000..775f2f13
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/properties-hl.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Java
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="regex">
+		<pattern>^(.+?)(?==|:)</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/python-hl.xml b/docs/src/main/docbook/xsl/xslthl/python-hl.xml
new file mode 100644
index 00000000..a4674432
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/python-hl.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Python
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="annotation">
+		<!-- these are actually called decorators -->
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"""</string>
+		<spanNewLines />
+	</highlighter>
+	<highlighter type="string">
+		<string>'''</string>
+		<spanNewLines />
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts />
+		<exponent>e</exponent>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>and</keyword>
+		<keyword>del</keyword>
+		<keyword>from</keyword>
+		<keyword>not</keyword>
+		<keyword>while</keyword>
+		<keyword>as</keyword>
+		<keyword>elif</keyword>
+		<keyword>global</keyword>
+		<keyword>or</keyword>
+		<keyword>with</keyword>
+		<keyword>assert</keyword>
+		<keyword>else</keyword>
+		<keyword>if</keyword>
+		<keyword>pass</keyword>
+		<keyword>yield</keyword>
+		<keyword>break</keyword>
+		<keyword>except</keyword>
+		<keyword>import</keyword>
+		<keyword>print</keyword>
+		<keyword>class</keyword>
+		<keyword>exec</keyword>
+		<keyword>in</keyword>
+		<keyword>raise</keyword>
+		<keyword>continue</keyword>
+		<keyword>finally</keyword>
+		<keyword>is</keyword>
+		<keyword>return</keyword>
+		<keyword>def</keyword>
+		<keyword>for</keyword>
+		<keyword>lambda</keyword>
+		<keyword>try</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml b/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
new file mode 100644
index 00000000..d105640e
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Ruby
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="heredoc">
+		<start>&lt;&lt;</start>
+		<noWhiteSpace/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>%Q{</string>
+		<endString>}</endString>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>%/</string>
+		<endString>/</endString>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>%q{</string>
+		<endString>}</endString>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>alias</keyword>
+		<keyword>and</keyword>
+		<keyword>BEGIN</keyword>
+		<keyword>begin</keyword>
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>class</keyword>
+		<keyword>def</keyword>
+		<keyword>defined</keyword>
+		<keyword>do</keyword>
+		<keyword>else</keyword>
+		<keyword>elsif</keyword>
+		<keyword>END</keyword>
+		<keyword>end</keyword>
+		<keyword>ensure</keyword>
+		<keyword>false</keyword>
+		<keyword>for</keyword>
+		<keyword>if</keyword>
+		<keyword>in</keyword>
+		<keyword>module</keyword>
+		<keyword>next</keyword>
+		<keyword>nil</keyword>
+		<keyword>not</keyword>
+		<keyword>or</keyword>
+		<keyword>redo</keyword>
+		<keyword>rescue</keyword>
+		<keyword>retry</keyword>
+		<keyword>return</keyword>
+		<keyword>self</keyword>
+		<keyword>super</keyword>
+		<keyword>then</keyword>
+		<keyword>true</keyword>
+		<keyword>undef</keyword>
+		<keyword>unless</keyword>
+		<keyword>until</keyword>
+		<keyword>when</keyword>
+		<keyword>while</keyword>
+		<keyword>yield</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml b/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
new file mode 100644
index 00000000..ac1d5d04
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Syntax highlighting definition for SQL:1999
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2012 Michiel Hendriks, Martin Hujer, k42b3
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">--</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<doubleEscapes />
+	</highlighter>
+	<highlighter type="string">
+		<string>U'</string>
+		<endString>'</endString>
+		<doubleEscapes />
+	</highlighter>
+	<highlighter type="string">
+		<string>B'</string>
+		<endString>'</endString>
+		<doubleEscapes />
+	</highlighter>
+	<highlighter type="string">
+		<string>N'</string>
+		<endString>'</endString>
+		<doubleEscapes />
+	</highlighter>
+	<highlighter type="string">
+		<string>X'</string>
+		<endString>'</endString>
+		<doubleEscapes />
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts />
+		<exponent>e</exponent>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<ignoreCase />
+		<!-- reserved -->
+		<keyword>A</keyword>
+		<keyword>ABS</keyword>
+		<keyword>ABSOLUTE</keyword>
+		<keyword>ACTION</keyword>
+		<keyword>ADA</keyword>
+		<keyword>ADMIN</keyword>
+		<keyword>AFTER</keyword>
+		<keyword>ALWAYS</keyword>
+		<keyword>ASC</keyword>
+		<keyword>ASSERTION</keyword>
+		<keyword>ASSIGNMENT</keyword>
+		<keyword>ATTRIBUTE</keyword>
+		<keyword>ATTRIBUTES</keyword>
+		<keyword>AVG</keyword>
+		<keyword>BEFORE</keyword>
+		<keyword>BERNOULLI</keyword>
+		<keyword>BREADTH</keyword>
+		<keyword>C</keyword>
+		<keyword>CARDINALITY</keyword>
+		<keyword>CASCADE</keyword>
+		<keyword>CATALOG_NAME</keyword>
+		<keyword>CATALOG</keyword>
+		<keyword>CEIL</keyword>
+		<keyword>CEILING</keyword>
+		<keyword>CHAIN</keyword>
+		<keyword>CHAR_LENGTH</keyword>
+		<keyword>CHARACTER_LENGTH</keyword>
+		<keyword>CHARACTER_SET_CATALOG</keyword>
+		<keyword>CHARACTER_SET_NAME</keyword>
+		<keyword>CHARACTER_SET_SCHEMA</keyword>
+		<keyword>CHARACTERISTICS</keyword>
+		<keyword>CHARACTERS</keyword>
+		<keyword>CHECKED</keyword>
+		<keyword>CLASS_ORIGIN</keyword>
+		<keyword>COALESCE</keyword>
+		<keyword>COBOL</keyword>
+		<keyword>CODE_UNITS</keyword>
+		<keyword>COLLATION_CATALOG</keyword>
+		<keyword>COLLATION_NAME</keyword>
+		<keyword>COLLATION_SCHEMA</keyword>
+		<keyword>COLLATION</keyword>
+		<keyword>COLLECT</keyword>
+		<keyword>COLUMN_NAME</keyword>
+		<keyword>COMMAND_FUNCTION_CODE</keyword>
+		<keyword>COMMAND_FUNCTION</keyword>
+		<keyword>COMMITTED</keyword>
+		<keyword>CONDITION_NUMBER</keyword>
+		<keyword>CONDITION</keyword>
+		<keyword>CONNECTION_NAME</keyword>
+		<keyword>CONSTRAINT_CATALOG</keyword>
+		<keyword>CONSTRAINT_NAME</keyword>
+		<keyword>CONSTRAINT_SCHEMA</keyword>
+		<keyword>CONSTRAINTS</keyword>
+		<keyword>CONSTRUCTORS</keyword>
+		<keyword>CONTAINS</keyword>
+		<keyword>CONVERT</keyword>
+		<keyword>CORR</keyword>
+		<keyword>COUNT</keyword>
+		<keyword>COVAR_POP</keyword>
+		<keyword>COVAR_SAMP</keyword>
+		<keyword>CUME_DIST</keyword>
+		<keyword>CURRENT_COLLATION</keyword>
+		<keyword>CURSOR_NAME</keyword>
+		<keyword>DATA</keyword>
+		<keyword>DATETIME_INTERVAL_CODE</keyword>
+		<keyword>DATETIME_INTERVAL_PRECISION</keyword>
+		<keyword>DEFAULTS</keyword>
+		<keyword>DEFERRABLE</keyword>
+		<keyword>DEFERRED</keyword>
+		<keyword>DEFINED</keyword>
+		<keyword>DEFINER</keyword>
+		<keyword>DEGREE</keyword>
+		<keyword>DENSE_RANK</keyword>
+		<keyword>DEPTH</keyword>
+		<keyword>DERIVED</keyword>
+		<keyword>DESC</keyword>
+		<keyword>DESCRIPTOR</keyword>
+		<keyword>DIAGNOSTICS</keyword>
+		<keyword>DISPATCH</keyword>
+		<keyword>DOMAIN</keyword>
+		<keyword>DYNAMIC_FUNCTION_CODE</keyword>
+		<keyword>DYNAMIC_FUNCTION</keyword>
+		<keyword>EQUALS</keyword>
+		<keyword>EVERY</keyword>
+		<keyword>EXCEPTION</keyword>
+		<keyword>EXCLUDE</keyword>
+		<keyword>EXCLUDING</keyword>
+		<keyword>EXP</keyword>
+		<keyword>EXTRACT</keyword>
+		<keyword>FINAL</keyword>
+		<keyword>FIRST</keyword>
+		<keyword>FLOOR</keyword>
+		<keyword>FOLLOWING</keyword>
+		<keyword>FORTRAN</keyword>
+		<keyword>FOUND</keyword>
+		<keyword>FUSION</keyword>
+		<keyword>G</keyword>
+		<keyword>GENERAL</keyword>
+		<keyword>GO</keyword>
+		<keyword>GOTO</keyword>
+		<keyword>GRANTED</keyword>
+		<keyword>HIERARCHY</keyword>
+		<keyword>IMPLEMENTATION</keyword>
+		<keyword>INCLUDING</keyword>
+		<keyword>INCREMENT</keyword>
+		<keyword>INITIALLY</keyword>
+		<keyword>INSTANCE</keyword>
+		<keyword>INSTANTIABLE</keyword>
+		<keyword>INTERSECTION</keyword>
+		<keyword>INVOKER</keyword>
+		<keyword>ISOLATION</keyword>
+		<keyword>K</keyword>
+		<keyword>KEY_MEMBER</keyword>
+		<keyword>KEY_TYPE</keyword>
+		<keyword>KEY</keyword>
+		<keyword>LAST</keyword>
+		<keyword>LENGTH</keyword>
+		<keyword>LEVEL</keyword>
+		<keyword>LN</keyword>
+		<keyword>LOCATOR</keyword>
+		<keyword>LOWER</keyword>
+		<keyword>M</keyword>
+		<keyword>MAP</keyword>
+		<keyword>MATCHED</keyword>
+		<keyword>MAX</keyword>
+		<keyword>MAXVALUE</keyword>
+		<keyword>MESSAGE_LENGTH</keyword>
+		<keyword>MESSAGE_OCTET_LENGTH</keyword>
+		<keyword>MESSAGE_TEXT</keyword>
+		<keyword>MIN</keyword>
+		<keyword>MINVALUE</keyword>
+		<keyword>MOD</keyword>
+		<keyword>MORE</keyword>
+		<keyword>MUMPS</keyword>
+		<keyword>NAME</keyword>
+		<keyword>NAMES</keyword>
+		<keyword>NESTING</keyword>
+		<keyword>NEXT</keyword>
+		<keyword>NORMALIZE</keyword>
+		<keyword>NORMALIZED</keyword>
+		<keyword>NULLABLE</keyword>
+		<keyword>NULLIF</keyword>
+		<keyword>NULLS</keyword>
+		<keyword>NUMBER</keyword>
+		<keyword>OBJECT</keyword>
+		<keyword>OCTET_LENGTH</keyword>
+		<keyword>OCTETS</keyword>
+		<keyword>OPTION</keyword>
+		<keyword>OPTIONS</keyword>
+		<keyword>ORDERING</keyword>
+		<keyword>ORDINALITY</keyword>
+		<keyword>OTHERS</keyword>
+		<keyword>OVERLAY</keyword>
+		<keyword>OVERRIDING</keyword>
+		<keyword>PAD</keyword>
+		<keyword>PARAMETER_MODE</keyword>
+		<keyword>PARAMETER_NAME</keyword>
+		<keyword>PARAMETER_ORDINAL_POSITION</keyword>
+		<keyword>PARAMETER_SPECIFIC_CATALOG</keyword>
+		<keyword>PARAMETER_SPECIFIC_NAME</keyword>
+		<keyword>PARAMETER_SPECIFIC_SCHEMA</keyword>
+		<keyword>PARTIAL</keyword>
+		<keyword>PASCAL</keyword>
+		<keyword>PATH</keyword>
+		<keyword>PERCENT_RANK</keyword>
+		<keyword>PERCENTILE_CONT</keyword>
+		<keyword>PERCENTILE_DISC</keyword>
+		<keyword>PLACING</keyword>
+		<keyword>PLI</keyword>
+		<keyword>POSITION</keyword>
+		<keyword>POWER</keyword>
+		<keyword>PRECEDING</keyword>
+		<keyword>PRESERVE</keyword>
+		<keyword>PRIOR</keyword>
+		<keyword>PRIVILEGES</keyword>
+		<keyword>PUBLIC</keyword>
+		<keyword>RANK</keyword>
+		<keyword>READ</keyword>
+		<keyword>RELATIVE</keyword>
+		<keyword>REPEATABLE</keyword>
+		<keyword>RESTART</keyword>
+		<keyword>RETURNED_CARDINALITY</keyword>
+		<keyword>RETURNED_LENGTH</keyword>
+		<keyword>RETURNED_OCTET_LENGTH</keyword>
+		<keyword>RETURNED_SQLSTATE</keyword>
+		<keyword>ROLE</keyword>
+		<keyword>ROUTINE_CATALOG</keyword>
+		<keyword>ROUTINE_NAME</keyword>
+		<keyword>ROUTINE_SCHEMA</keyword>
+		<keyword>ROUTINE</keyword>
+		<keyword>ROW_COUNT</keyword>
+		<keyword>ROW_NUMBER</keyword>
+		<keyword>SCALE</keyword>
+		<keyword>SCHEMA_NAME</keyword>
+		<keyword>SCHEMA</keyword>
+		<keyword>SCOPE_CATALOG</keyword>
+		<keyword>SCOPE_NAME</keyword>
+		<keyword>SCOPE_SCHEMA</keyword>
+		<keyword>SECTION</keyword>
+		<keyword>SECURITY</keyword>
+		<keyword>SELF</keyword>
+		<keyword>SEQUENCE</keyword>
+		<keyword>SERIALIZABLE</keyword>
+		<keyword>SERVER_NAME</keyword>
+		<keyword>SESSION</keyword>
+		<keyword>SETS</keyword>
+		<keyword>SIMPLE</keyword>
+		<keyword>SIZE</keyword>
+		<keyword>SOURCE</keyword>
+		<keyword>SPACE</keyword>
+		<keyword>SPECIFIC_NAME</keyword>
+		<keyword>SQRT</keyword>
+		<keyword>STATE</keyword>
+		<keyword>STATEMENT</keyword>
+		<keyword>STDDEV_POP</keyword>
+		<keyword>STDDEV_SAMP</keyword>
+		<keyword>STRUCTURE</keyword>
+		<keyword>STYLE</keyword>
+		<keyword>SUBCLASS_ORIGIN</keyword>
+		<keyword>SUBSTRING</keyword>
+		<keyword>SUM</keyword>
+		<keyword>TABLE_NAME</keyword>
+		<keyword>TABLESAMPLE</keyword>
+		<keyword>TEMPORARY</keyword>
+		<keyword>TIES</keyword>
+		<keyword>TOP_LEVEL_COUNT</keyword>
+		<keyword>TRANSACTION_ACTIVE</keyword>
+		<keyword>TRANSACTION</keyword>
+		<keyword>TRANSACTIONS_COMMITTED</keyword>
+		<keyword>TRANSACTIONS_ROLLED_BACK</keyword>
+		<keyword>TRANSFORM</keyword>
+		<keyword>TRANSFORMS</keyword>
+		<keyword>TRANSLATE</keyword>
+		<keyword>TRIGGER_CATALOG</keyword>
+		<keyword>TRIGGER_NAME</keyword>
+		<keyword>TRIGGER_SCHEMA</keyword>
+		<keyword>TRIM</keyword>
+		<keyword>TYPE</keyword>
+		<keyword>UNBOUNDED</keyword>
+		<keyword>UNCOMMITTED</keyword>
+		<keyword>UNDER</keyword>
+		<keyword>UNNAMED</keyword>
+		<keyword>USAGE</keyword>
+		<keyword>USER_DEFINED_TYPE_CATALOG</keyword>
+		<keyword>USER_DEFINED_TYPE_CODE</keyword>
+		<keyword>USER_DEFINED_TYPE_NAME</keyword>
+		<keyword>USER_DEFINED_TYPE_SCHEMA</keyword>
+		<keyword>VIEW</keyword>
+		<keyword>WORK</keyword>
+		<keyword>WRITE</keyword>
+		<keyword>ZONE</keyword>
+		<!-- non reserved -->
+		<keyword>ADD</keyword>
+		<keyword>ALL</keyword>
+		<keyword>ALLOCATE</keyword>
+		<keyword>ALTER</keyword>
+		<keyword>AND</keyword>
+		<keyword>ANY</keyword>
+		<keyword>ARE</keyword>
+		<keyword>ARRAY</keyword>
+		<keyword>AS</keyword>
+		<keyword>ASENSITIVE</keyword>
+		<keyword>ASYMMETRIC</keyword>
+		<keyword>AT</keyword>
+		<keyword>ATOMIC</keyword>
+		<keyword>AUTHORIZATION</keyword>
+		<keyword>BEGIN</keyword>
+		<keyword>BETWEEN</keyword>
+		<keyword>BIGINT</keyword>
+		<keyword>BINARY</keyword>
+		<keyword>BLOB</keyword>
+		<keyword>BOOLEAN</keyword>
+		<keyword>BOTH</keyword>
+		<keyword>BY</keyword>
+		<keyword>CALL</keyword>
+		<keyword>CALLED</keyword>
+		<keyword>CASCADED</keyword>
+		<keyword>CASE</keyword>
+		<keyword>CAST</keyword>
+		<keyword>CHAR</keyword>
+		<keyword>CHARACTER</keyword>
+		<keyword>CHECK</keyword>
+		<keyword>CLOB</keyword>
+		<keyword>CLOSE</keyword>
+		<keyword>COLLATE</keyword>
+		<keyword>COLUMN</keyword>
+		<keyword>COMMIT</keyword>
+		<keyword>CONNECT</keyword>
+		<keyword>CONSTRAINT</keyword>
+		<keyword>CONTINUE</keyword>
+		<keyword>CORRESPONDING</keyword>
+		<keyword>CREATE</keyword>
+		<keyword>CROSS</keyword>
+		<keyword>CUBE</keyword>
+		<keyword>CURRENT_DATE</keyword>
+		<keyword>CURRENT_DEFAULT_TRANSFORM_GROUP</keyword>
+		<keyword>CURRENT_PATH</keyword>
+		<keyword>CURRENT_ROLE</keyword>
+		<keyword>CURRENT_TIME</keyword>
+		<keyword>CURRENT_TIMESTAMP</keyword>
+		<keyword>CURRENT_TRANSFORM_GROUP_FOR_TYPE</keyword>
+		<keyword>CURRENT_USER</keyword>
+		<keyword>CURRENT</keyword>
+		<keyword>CURSOR</keyword>
+		<keyword>CYCLE</keyword>
+		<keyword>DATE</keyword>
+		<keyword>DAY</keyword>
+		<keyword>DEALLOCATE</keyword>
+		<keyword>DEC</keyword>
+		<keyword>DECIMAL</keyword>
+		<keyword>DECLARE</keyword>
+		<keyword>DEFAULT</keyword>
+		<keyword>DELETE</keyword>
+		<keyword>DEREF</keyword>
+		<keyword>DESCRIBE</keyword>
+		<keyword>DETERMINISTIC</keyword>
+		<keyword>DISCONNECT</keyword>
+		<keyword>DISTINCT</keyword>
+		<keyword>DOUBLE</keyword>
+		<keyword>DROP</keyword>
+		<keyword>DYNAMIC</keyword>
+		<keyword>EACH</keyword>
+		<keyword>ELEMENT</keyword>
+		<keyword>ELSE</keyword>
+		<keyword>END</keyword>
+		<keyword>END-EXEC</keyword>
+		<keyword>ESCAPE</keyword>
+		<keyword>EXCEPT</keyword>
+		<keyword>EXEC</keyword>
+		<keyword>EXECUTE</keyword>
+		<keyword>EXISTS</keyword>
+		<keyword>EXTERNAL</keyword>
+		<keyword>FALSE</keyword>
+		<keyword>FETCH</keyword>
+		<keyword>FILTER</keyword>
+		<keyword>FLOAT</keyword>
+		<keyword>FOR</keyword>
+		<keyword>FOREIGN</keyword>
+		<keyword>FREE</keyword>
+		<keyword>FROM</keyword>
+		<keyword>FULL</keyword>
+		<keyword>FUNCTION</keyword>
+		<keyword>GET</keyword>
+		<keyword>GLOBAL</keyword>
+		<keyword>GRANT</keyword>
+		<keyword>GROUP</keyword>
+		<keyword>GROUPING</keyword>
+		<keyword>HAVING</keyword>
+		<keyword>HOLD</keyword>
+		<keyword>HOUR</keyword>
+		<keyword>IDENTITY</keyword>
+		<keyword>IMMEDIATE</keyword>
+		<keyword>IN</keyword>
+		<keyword>INDICATOR</keyword>
+		<keyword>INNER</keyword>
+		<keyword>INOUT</keyword>
+		<keyword>INPUT</keyword>
+		<keyword>INSENSITIVE</keyword>
+		<keyword>INSERT</keyword>
+		<keyword>INT</keyword>
+		<keyword>INTEGER</keyword>
+		<keyword>INTERSECT</keyword>
+		<keyword>INTERVAL</keyword>
+		<keyword>INTO</keyword>
+		<keyword>IS</keyword>
+		<keyword>ISOLATION</keyword>
+		<keyword>JOIN</keyword>
+		<keyword>LANGUAGE</keyword>
+		<keyword>LARGE</keyword>
+		<keyword>LATERAL</keyword>
+		<keyword>LEADING</keyword>
+		<keyword>LEFT</keyword>
+		<keyword>LIKE</keyword>
+		<keyword>LOCAL</keyword>
+		<keyword>LOCALTIME</keyword>
+		<keyword>LOCALTIMESTAMP</keyword>
+		<keyword>MATCH</keyword>
+		<keyword>MEMBER</keyword>
+		<keyword>MERGE</keyword>
+		<keyword>METHOD</keyword>
+		<keyword>MINUTE</keyword>
+		<keyword>MODIFIES</keyword>
+		<keyword>MODULE</keyword>
+		<keyword>MONTH</keyword>
+		<keyword>MULTISET</keyword>
+		<keyword>NATIONAL</keyword>
+		<keyword>NATURAL</keyword>
+		<keyword>NCHAR</keyword>
+		<keyword>NCLOB</keyword>
+		<keyword>NEW</keyword>
+		<keyword>NO</keyword>
+		<keyword>NONE</keyword>
+		<keyword>NOT</keyword>
+		<keyword>NULL</keyword>
+		<keyword>NUMERIC</keyword>
+		<keyword>OF</keyword>
+		<keyword>OLD</keyword>
+		<keyword>ON</keyword>
+		<keyword>ONLY</keyword>
+		<keyword>OPEN</keyword>
+		<keyword>OR</keyword>
+		<keyword>ORDER</keyword>
+		<keyword>OUT</keyword>
+		<keyword>OUTER</keyword>
+		<keyword>OUTPUT</keyword>
+		<keyword>OVER</keyword>
+		<keyword>OVERLAPS</keyword>
+		<keyword>PARAMETER</keyword>
+		<keyword>PARTITION</keyword>
+		<keyword>PRECISION</keyword>
+		<keyword>PREPARE</keyword>
+		<keyword>PRIMARY</keyword>
+		<keyword>PROCEDURE</keyword>
+		<keyword>RANGE</keyword>
+		<keyword>READS</keyword>
+		<keyword>REAL</keyword>
+		<keyword>RECURSIVE</keyword>
+		<keyword>REF</keyword>
+		<keyword>REFERENCES</keyword>
+		<keyword>REFERENCING</keyword>
+		<keyword>REGR_AVGX</keyword>
+		<keyword>REGR_AVGY</keyword>
+		<keyword>REGR_COUNT</keyword>
+		<keyword>REGR_INTERCEPT</keyword>
+		<keyword>REGR_R2</keyword>
+		<keyword>REGR_SLOPE</keyword>
+		<keyword>REGR_SXX</keyword>
+		<keyword>REGR_SXY</keyword>
+		<keyword>REGR_SYY</keyword>
+		<keyword>RELEASE</keyword>
+		<keyword>RESULT</keyword>
+		<keyword>RETURN</keyword>
+		<keyword>RETURNS</keyword>
+		<keyword>REVOKE</keyword>
+		<keyword>RIGHT</keyword>
+		<keyword>ROLLBACK</keyword>
+		<keyword>ROLLUP</keyword>
+		<keyword>ROW</keyword>
+		<keyword>ROWS</keyword>
+		<keyword>SAVEPOINT</keyword>
+		<keyword>SCROLL</keyword>
+		<keyword>SEARCH</keyword>
+		<keyword>SECOND</keyword>
+		<keyword>SELECT</keyword>
+		<keyword>SENSITIVE</keyword>
+		<keyword>SESSION_USER</keyword>
+		<keyword>SET</keyword>
+		<keyword>SIMILAR</keyword>
+		<keyword>SMALLINT</keyword>
+		<keyword>SOME</keyword>
+		<keyword>SPECIFIC</keyword>
+		<keyword>SPECIFICTYPE</keyword>
+		<keyword>SQL</keyword>
+		<keyword>SQLEXCEPTION</keyword>
+		<keyword>SQLSTATE</keyword>
+		<keyword>SQLWARNING</keyword>
+		<keyword>START</keyword>
+		<keyword>STATIC</keyword>
+		<keyword>SUBMULTISET</keyword>
+		<keyword>SYMMETRIC</keyword>
+		<keyword>SYSTEM_USER</keyword>
+		<keyword>SYSTEM</keyword>
+		<keyword>TABLE</keyword>
+		<keyword>THEN</keyword>
+		<keyword>TIME</keyword>
+		<keyword>TIMESTAMP</keyword>
+		<keyword>TIMEZONE_HOUR</keyword>
+		<keyword>TIMEZONE_MINUTE</keyword>
+		<keyword>TO</keyword>
+		<keyword>TRAILING</keyword>
+		<keyword>TRANSLATION</keyword>
+		<keyword>TREAT</keyword>
+		<keyword>TRIGGER</keyword>
+		<keyword>TRUE</keyword>
+		<keyword>UESCAPE</keyword>
+		<keyword>UNION</keyword>
+		<keyword>UNIQUE</keyword>
+		<keyword>UNKNOWN</keyword>
+		<keyword>UNNEST</keyword>
+		<keyword>UPDATE</keyword>
+		<keyword>UPPER</keyword>
+		<keyword>USER</keyword>
+		<keyword>USING</keyword>
+		<keyword>VALUE</keyword>
+		<keyword>VALUES</keyword>
+		<keyword>VAR_POP</keyword>
+		<keyword>VAR_SAMP</keyword>
+		<keyword>VARCHAR</keyword>
+		<keyword>VARYING</keyword>
+		<keyword>WHEN</keyword>
+		<keyword>WHENEVER</keyword>
+		<keyword>WHERE</keyword>
+		<keyword>WIDTH_BUCKET</keyword>
+		<keyword>WINDOW</keyword>
+		<keyword>WITH</keyword>
+		<keyword>WITHIN</keyword>
+		<keyword>WITHOUT</keyword>
+		<keyword>YEAR</keyword>
+	</highlighter>
+</highlighters>
diff --git a/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml b/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
new file mode 100644
index 00000000..a28008ec
--- /dev/null
+++ b/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="annotation">
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>l</suffix>
+		<ignoreCase />
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>true</keyword>
+		<keyword>false</keyword>
+	</highlighter>
+	<highlighter type="word">
+		<word>{</word>
+		<word>}</word>
+		<word>,</word>
+		<word>[</word>
+		<word>]</word>
+		<style>keyword</style>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(---)$</pattern>
+		<style>comment</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(.+?)(?==|:)</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+</highlighters>
diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml
index 6c892ad4..d7e990bd 100644
--- a/spring-cloud-gateway-dependencies/pom.xml
+++ b/spring-cloud-gateway-dependencies/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.3.2.RELEASE</version>
+		<version>1.3.5.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>