Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-tamaya-site
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ecc380a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+language: java
+jdk: openjdk11
+script: ./bake-jenkins.sh
+branches:
+   only:
+     - master
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..58fd3b9
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,10 @@
+Apache Tamaya is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
\ No newline at end of file
diff --git a/README.md b/README.md
index 157b958..26ddcf9 100644
--- a/README.md
+++ b/README.md
@@ -92,3 +92,10 @@
 
 There is a daily build job that triggers a site baking on ASF-Jenkins:
 https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Site-jBake-Master/
+
+#### Travis integration
+
+Apart from integration into ASF CI there's a travis build:
+
+[![Build Status](https://travis-ci.org/apache/incubator-tamaya-site.svg?branch=master)](https://travis-ci.org/apache/incubator-tamaya-site/branches)
+
diff --git a/bake-jenkins.sh b/bake-jenkins.sh
index 35bcb54..0adada0 100755
--- a/bake-jenkins.sh
+++ b/bake-jenkins.sh
@@ -1,7 +1,5 @@
 #!/bin/bash -x
 echo "Starting to bake our project homepage ...."
-export JBAKE_HOME="$(dirname "$0")/bin/jbake-2.6.3-bin"
+export JBAKE_HOME="$(dirname "$0")/bin/jbake-2.6.4-bin"
 echo $JBAKE_HOME
 $JBAKE_HOME/bin/jbake -b --reset
-echo "DONE"
-
diff --git a/bake.cmd b/bake.cmd
index c8c630b..3f95f87 100644
--- a/bake.cmd
+++ b/bake.cmd
@@ -3,7 +3,7 @@
 echo Cleaning up cache ...
 rmdir /Q /S cache/
 echo Starting to bake our project homepage ....
-set JBAKE_HOME="%~dp0\bin\jbake-2.6.1-bin"
+set JBAKE_HOME="%~dp0\bin\jbake-2.6.4-bin"
 echo %JBAKE_HOME%
 %JBAKE_HOME%/bin/jbake -b -s
 @ECHO ON
diff --git a/bake.sh b/bake.sh
index c4877e8..77526e9 100755
--- a/bake.sh
+++ b/bake.sh
@@ -3,6 +3,6 @@
 echo "Cleaning up cache ..."
 rm -rf cache/
 echo "Starting to bake our project homepage ...."
-export JBAKE_HOME="$(dirname "$0")/bin/jbake-2.6.3-bin"
+export JBAKE_HOME="$(dirname "$0")/bin/jbake-2.6.4-bin"
 echo $JBAKE_HOME
 $JBAKE_HOME/bin/jbake -b -s
diff --git a/bin/jbake-2.6.3-bin/lib/asciidoctorj-1.5.7.jar b/bin/jbake-2.6.3-bin/lib/asciidoctorj-1.5.7.jar
deleted file mode 100644
index 3a8a4dd..0000000
--- a/bin/jbake-2.6.3-bin/lib/asciidoctorj-1.5.7.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/asciidoctorj-diagram-1.5.9.jar b/bin/jbake-2.6.3-bin/lib/asciidoctorj-diagram-1.5.9.jar
deleted file mode 100644
index 8539302..0000000
--- a/bin/jbake-2.6.3-bin/lib/asciidoctorj-diagram-1.5.9.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/attoparser-2.0.4.RELEASE.jar b/bin/jbake-2.6.3-bin/lib/attoparser-2.0.4.RELEASE.jar
deleted file mode 100644
index 57d0c9c..0000000
--- a/bin/jbake-2.6.3-bin/lib/attoparser-2.0.4.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-0.34.48.jar
deleted file mode 100644
index 64307fc..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-abbreviation-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-abbreviation-0.34.48.jar
deleted file mode 100644
index b1d1a70..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-abbreviation-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-anchorlink-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-anchorlink-0.34.48.jar
deleted file mode 100644
index 348b913..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-anchorlink-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-aside-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-aside-0.34.48.jar
deleted file mode 100644
index 5827edf..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-aside-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-autolink-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-autolink-0.34.48.jar
deleted file mode 100644
index 47d09a1..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-autolink-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-definition-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-definition-0.34.48.jar
deleted file mode 100644
index 761f0d3..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-definition-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-escaped-character-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-escaped-character-0.34.48.jar
deleted file mode 100644
index 5af6758..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-escaped-character-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-footnotes-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-footnotes-0.34.48.jar
deleted file mode 100644
index d187882..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-footnotes-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-gfm-strikethrough-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-gfm-strikethrough-0.34.48.jar
deleted file mode 100644
index f279cc1..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-gfm-strikethrough-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-gfm-tasklist-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-gfm-tasklist-0.34.48.jar
deleted file mode 100644
index 946edd2..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-gfm-tasklist-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-ins-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-ins-0.34.48.jar
deleted file mode 100644
index e7e4f0d..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-ins-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-jekyll-front-matter-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-jekyll-front-matter-0.34.48.jar
deleted file mode 100644
index 5932fa0..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-jekyll-front-matter-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-superscript-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-superscript-0.34.48.jar
deleted file mode 100644
index 7d64129..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-superscript-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-tables-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-tables-0.34.48.jar
deleted file mode 100644
index 16ddf8d..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-tables-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-toc-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-toc-0.34.48.jar
deleted file mode 100644
index eab24f2..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-toc-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-typographic-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-typographic-0.34.48.jar
deleted file mode 100644
index 6a539b8..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-typographic-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-wikilink-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-wikilink-0.34.48.jar
deleted file mode 100644
index 5fe6e7b..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-wikilink-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-yaml-front-matter-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-ext-yaml-front-matter-0.34.48.jar
deleted file mode 100644
index 23b2273..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-yaml-front-matter-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-formatter-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-formatter-0.34.48.jar
deleted file mode 100644
index dec265f..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-formatter-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-jira-converter-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-jira-converter-0.34.48.jar
deleted file mode 100644
index f7ee3df..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-jira-converter-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-util-0.34.48.jar b/bin/jbake-2.6.3-bin/lib/flexmark-util-0.34.48.jar
deleted file mode 100644
index 76619ef..0000000
--- a/bin/jbake-2.6.3-bin/lib/flexmark-util-0.34.48.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/groovy-xml-2.5.3.jar b/bin/jbake-2.6.3-bin/lib/groovy-xml-2.5.3.jar
deleted file mode 100644
index 06a151e..0000000
--- a/bin/jbake-2.6.3-bin/lib/groovy-xml-2.5.3.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jbake-core-2.6.3.jar b/bin/jbake-2.6.3-bin/lib/jbake-core-2.6.3.jar
deleted file mode 100644
index 59edc5b..0000000
--- a/bin/jbake-2.6.3-bin/lib/jbake-core-2.6.3.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jbake-dist-2.6.3.jar b/bin/jbake-2.6.3-bin/lib/jbake-dist-2.6.3.jar
deleted file mode 100644
index 0fca875..0000000
--- a/bin/jbake-2.6.3-bin/lib/jbake-dist-2.6.3.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/thymeleaf-3.0.9.RELEASE.jar b/bin/jbake-2.6.3-bin/lib/thymeleaf-3.0.9.RELEASE.jar
deleted file mode 100644
index 50012dd..0000000
--- a/bin/jbake-2.6.3-bin/lib/thymeleaf-3.0.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/unbescape-1.1.5.RELEASE.jar b/bin/jbake-2.6.3-bin/lib/unbescape-1.1.5.RELEASE.jar
deleted file mode 100644
index ca8a021..0000000
--- a/bin/jbake-2.6.3-bin/lib/unbescape-1.1.5.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/bin/jbake b/bin/jbake-2.6.4-bin/bin/jbake
similarity index 98%
rename from bin/jbake-2.6.3-bin/bin/jbake
rename to bin/jbake-2.6.4-bin/bin/jbake
index 277c1b1..3ce2ae6 100755
--- a/bin/jbake-2.6.3-bin/bin/jbake
+++ b/bin/jbake-2.6.4-bin/bin/jbake
@@ -64,7 +64,7 @@
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/*:$APP_HOME/lib/logging
+CLASSPATH=$SAVED/lib/logging:$SAVED/lib/*:$APP_HOME/lib/*:$APP_HOME/lib/logging
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
diff --git a/bin/jbake-2.6.3-bin/bin/jbake.bat b/bin/jbake-2.6.4-bin/bin/jbake.bat
similarity index 95%
rename from bin/jbake-2.6.3-bin/bin/jbake.bat
rename to bin/jbake-2.6.4-bin/bin/jbake.bat
index 8c4da90..186081c 100755
--- a/bin/jbake-2.6.3-bin/bin/jbake.bat
+++ b/bin/jbake-2.6.4-bin/bin/jbake.bat
@@ -63,7 +63,7 @@
 :execute

 @rem Setup the command line

 

-set CLASSPATH=%APP_HOME%\lib\*;%APP_HOME%\lib\logging

+set CLASSPATH=%DIRNAME%\lib\logging;%DIRNAME%\lib\*;%APP_HOME%\lib\*;%APP_HOME%\lib\logging

 

 @rem Execute jbake

 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %JBAKE_OPTS%  -classpath "%CLASSPATH%" org.jbake.launcher.Main %CMD_LINE_ARGS%

diff --git a/bin/jbake-2.6.3-bin/lib/args4j-2.33.jar b/bin/jbake-2.6.4-bin/lib/args4j-2.33.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/args4j-2.33.jar
rename to bin/jbake-2.6.4-bin/lib/args4j-2.33.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/asciidoctorj-1.5.8.1.jar b/bin/jbake-2.6.4-bin/lib/asciidoctorj-1.5.8.1.jar
new file mode 100644
index 0000000..b053d63
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/asciidoctorj-1.5.8.1.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/asciidoctorj-diagram-1.5.11.jar b/bin/jbake-2.6.4-bin/lib/asciidoctorj-diagram-1.5.11.jar
new file mode 100644
index 0000000..07a9310
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/asciidoctorj-diagram-1.5.11.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/asm-5.0.3.jar b/bin/jbake-2.6.4-bin/lib/asm-5.0.3.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/asm-5.0.3.jar
rename to bin/jbake-2.6.4-bin/lib/asm-5.0.3.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/asm-analysis-5.0.3.jar b/bin/jbake-2.6.4-bin/lib/asm-analysis-5.0.3.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/asm-analysis-5.0.3.jar
rename to bin/jbake-2.6.4-bin/lib/asm-analysis-5.0.3.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/asm-tree-5.0.3.jar b/bin/jbake-2.6.4-bin/lib/asm-tree-5.0.3.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/asm-tree-5.0.3.jar
rename to bin/jbake-2.6.4-bin/lib/asm-tree-5.0.3.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/asm-util-5.0.3.jar b/bin/jbake-2.6.4-bin/lib/asm-util-5.0.3.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/asm-util-5.0.3.jar
rename to bin/jbake-2.6.4-bin/lib/asm-util-5.0.3.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/attoparser-2.0.5.RELEASE.jar b/bin/jbake-2.6.4-bin/lib/attoparser-2.0.5.RELEASE.jar
new file mode 100644
index 0000000..acf5ac7
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/attoparser-2.0.5.RELEASE.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/autolink-0.6.0.jar b/bin/jbake-2.6.4-bin/lib/autolink-0.6.0.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/autolink-0.6.0.jar
rename to bin/jbake-2.6.4-bin/lib/autolink-0.6.0.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/commons-collections-3.2.2.jar b/bin/jbake-2.6.4-bin/lib/commons-collections-3.2.2.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/commons-collections-3.2.2.jar
rename to bin/jbake-2.6.4-bin/lib/commons-collections-3.2.2.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/commons-configuration-1.10.jar b/bin/jbake-2.6.4-bin/lib/commons-configuration-1.10.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/commons-configuration-1.10.jar
rename to bin/jbake-2.6.4-bin/lib/commons-configuration-1.10.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/commons-io-2.6.jar b/bin/jbake-2.6.4-bin/lib/commons-io-2.6.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/commons-io-2.6.jar
rename to bin/jbake-2.6.4-bin/lib/commons-io-2.6.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/commons-jexl-2.1.1.jar b/bin/jbake-2.6.4-bin/lib/commons-jexl-2.1.1.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/commons-jexl-2.1.1.jar
rename to bin/jbake-2.6.4-bin/lib/commons-jexl-2.1.1.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/commons-lang-2.6.jar b/bin/jbake-2.6.4-bin/lib/commons-lang-2.6.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/commons-lang-2.6.jar
rename to bin/jbake-2.6.4-bin/lib/commons-lang-2.6.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/commons-lang3-3.8.1.jar b/bin/jbake-2.6.4-bin/lib/commons-lang3-3.8.1.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/commons-lang3-3.8.1.jar
rename to bin/jbake-2.6.4-bin/lib/commons-lang3-3.8.1.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/commons-logging-1.2.jar b/bin/jbake-2.6.4-bin/lib/commons-logging-1.2.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/commons-logging-1.2.jar
rename to bin/jbake-2.6.4-bin/lib/commons-logging-1.2.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/commons-vfs2-2.2.jar b/bin/jbake-2.6.4-bin/lib/commons-vfs2-2.2.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/commons-vfs2-2.2.jar
rename to bin/jbake-2.6.4-bin/lib/commons-vfs2-2.2.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/concurrentlinkedhashmap-lru-1.4.2.jar b/bin/jbake-2.6.4-bin/lib/concurrentlinkedhashmap-lru-1.4.2.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/concurrentlinkedhashmap-lru-1.4.2.jar
rename to bin/jbake-2.6.4-bin/lib/concurrentlinkedhashmap-lru-1.4.2.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-0.40.8.jar
new file mode 100644
index 0000000..ef0b4ff
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-abbreviation-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-abbreviation-0.40.8.jar
new file mode 100644
index 0000000..daca7de
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-abbreviation-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-anchorlink-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-anchorlink-0.40.8.jar
new file mode 100644
index 0000000..00b3b5e
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-anchorlink-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-aside-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-aside-0.40.8.jar
new file mode 100644
index 0000000..a8f8df9
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-aside-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-autolink-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-autolink-0.40.8.jar
new file mode 100644
index 0000000..79f90a9
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-autolink-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-definition-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-definition-0.40.8.jar
new file mode 100644
index 0000000..ddac5b8
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-definition-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-ext-emoji-0.34.48.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-emoji-0.40.8.jar
similarity index 75%
rename from bin/jbake-2.6.3-bin/lib/flexmark-ext-emoji-0.34.48.jar
rename to bin/jbake-2.6.4-bin/lib/flexmark-ext-emoji-0.40.8.jar
index db75af1..4202cef 100644
--- a/bin/jbake-2.6.3-bin/lib/flexmark-ext-emoji-0.34.48.jar
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-emoji-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-escaped-character-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-escaped-character-0.40.8.jar
new file mode 100644
index 0000000..afbd204
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-escaped-character-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-footnotes-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-footnotes-0.40.8.jar
new file mode 100644
index 0000000..7b4ed22
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-footnotes-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-gfm-strikethrough-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-gfm-strikethrough-0.40.8.jar
new file mode 100644
index 0000000..3775424
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-gfm-strikethrough-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-gfm-tasklist-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-gfm-tasklist-0.40.8.jar
new file mode 100644
index 0000000..40310bf
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-gfm-tasklist-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-ins-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-ins-0.40.8.jar
new file mode 100644
index 0000000..091d580
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-ins-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-jekyll-front-matter-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-jekyll-front-matter-0.40.8.jar
new file mode 100644
index 0000000..f8cb468
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-jekyll-front-matter-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-superscript-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-superscript-0.40.8.jar
new file mode 100644
index 0000000..7f73539
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-superscript-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-tables-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-tables-0.40.8.jar
new file mode 100644
index 0000000..063d1bc
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-tables-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-toc-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-toc-0.40.8.jar
new file mode 100644
index 0000000..d026cef
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-toc-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-typographic-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-typographic-0.40.8.jar
new file mode 100644
index 0000000..117f384
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-typographic-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-wikilink-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-wikilink-0.40.8.jar
new file mode 100644
index 0000000..e36c9ca
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-wikilink-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-ext-yaml-front-matter-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-ext-yaml-front-matter-0.40.8.jar
new file mode 100644
index 0000000..c27b22f
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-ext-yaml-front-matter-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-formatter-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-formatter-0.40.8.jar
new file mode 100644
index 0000000..25fb0cc
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-formatter-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-jira-converter-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-jira-converter-0.40.8.jar
new file mode 100644
index 0000000..d76e625
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-jira-converter-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/flexmark-profile-pegdown-0.34.48.jar b/bin/jbake-2.6.4-bin/lib/flexmark-profile-pegdown-0.40.8.jar
similarity index 64%
rename from bin/jbake-2.6.3-bin/lib/flexmark-profile-pegdown-0.34.48.jar
rename to bin/jbake-2.6.4-bin/lib/flexmark-profile-pegdown-0.40.8.jar
index 42b9392..0d222e4 100644
--- a/bin/jbake-2.6.3-bin/lib/flexmark-profile-pegdown-0.34.48.jar
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-profile-pegdown-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/flexmark-util-0.40.8.jar b/bin/jbake-2.6.4-bin/lib/flexmark-util-0.40.8.jar
new file mode 100644
index 0000000..7c5bfc6
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/flexmark-util-0.40.8.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/freemarker-2.3.28.jar b/bin/jbake-2.6.4-bin/lib/freemarker-2.3.28.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/freemarker-2.3.28.jar
rename to bin/jbake-2.6.4-bin/lib/freemarker-2.3.28.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/groovy-2.5.3.jar b/bin/jbake-2.6.4-bin/lib/groovy-2.5.5.jar
similarity index 71%
rename from bin/jbake-2.6.3-bin/lib/groovy-2.5.3.jar
rename to bin/jbake-2.6.4-bin/lib/groovy-2.5.5.jar
index 5739dba..5b7edb6 100644
--- a/bin/jbake-2.6.3-bin/lib/groovy-2.5.3.jar
+++ b/bin/jbake-2.6.4-bin/lib/groovy-2.5.5.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/groovy-dateutil-2.5.3.jar b/bin/jbake-2.6.4-bin/lib/groovy-dateutil-2.5.5.jar
similarity index 75%
rename from bin/jbake-2.6.3-bin/lib/groovy-dateutil-2.5.3.jar
rename to bin/jbake-2.6.4-bin/lib/groovy-dateutil-2.5.5.jar
index 0570f74..b3e6bad 100644
--- a/bin/jbake-2.6.3-bin/lib/groovy-dateutil-2.5.3.jar
+++ b/bin/jbake-2.6.4-bin/lib/groovy-dateutil-2.5.5.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/groovy-templates-2.5.3.jar b/bin/jbake-2.6.4-bin/lib/groovy-templates-2.5.5.jar
similarity index 60%
rename from bin/jbake-2.6.3-bin/lib/groovy-templates-2.5.3.jar
rename to bin/jbake-2.6.4-bin/lib/groovy-templates-2.5.5.jar
index 52c5909..5c70172 100644
--- a/bin/jbake-2.6.3-bin/lib/groovy-templates-2.5.3.jar
+++ b/bin/jbake-2.6.4-bin/lib/groovy-templates-2.5.5.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/groovy-xml-2.5.5.jar b/bin/jbake-2.6.4-bin/lib/groovy-xml-2.5.5.jar
new file mode 100644
index 0000000..593dabf
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/groovy-xml-2.5.5.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jade4j-1.2.7.jar b/bin/jbake-2.6.4-bin/lib/jade4j-1.2.7.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/jade4j-1.2.7.jar
rename to bin/jbake-2.6.4-bin/lib/jade4j-1.2.7.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/javassist-3.20.0-GA.jar b/bin/jbake-2.6.4-bin/lib/javassist-3.20.0-GA.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/javassist-3.20.0-GA.jar
rename to bin/jbake-2.6.4-bin/lib/javassist-3.20.0-GA.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/javax.servlet-api-3.1.0.jar b/bin/jbake-2.6.4-bin/lib/javax.servlet-api-3.1.0.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/javax.servlet-api-3.1.0.jar
rename to bin/jbake-2.6.4-bin/lib/javax.servlet-api-3.1.0.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/jbake-core-2.6.4.jar b/bin/jbake-2.6.4-bin/lib/jbake-core-2.6.4.jar
new file mode 100644
index 0000000..3a3e288
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/jbake-core-2.6.4.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/jbake-dist-2.6.4.jar b/bin/jbake-2.6.4-bin/lib/jbake-dist-2.6.4.jar
new file mode 100644
index 0000000..278bb6a
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/jbake-dist-2.6.4.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jcommander-1.35.jar b/bin/jbake-2.6.4-bin/lib/jcommander-1.35.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/jcommander-1.35.jar
rename to bin/jbake-2.6.4-bin/lib/jcommander-1.35.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jetty-http-9.2.24.v20180105.jar b/bin/jbake-2.6.4-bin/lib/jetty-http-9.2.26.v20180806.jar
similarity index 76%
rename from bin/jbake-2.6.3-bin/lib/jetty-http-9.2.24.v20180105.jar
rename to bin/jbake-2.6.4-bin/lib/jetty-http-9.2.26.v20180806.jar
index c62ad4d..b7b4725 100644
--- a/bin/jbake-2.6.3-bin/lib/jetty-http-9.2.24.v20180105.jar
+++ b/bin/jbake-2.6.4-bin/lib/jetty-http-9.2.26.v20180806.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jetty-io-9.2.24.v20180105.jar b/bin/jbake-2.6.4-bin/lib/jetty-io-9.2.26.v20180806.jar
similarity index 74%
rename from bin/jbake-2.6.3-bin/lib/jetty-io-9.2.24.v20180105.jar
rename to bin/jbake-2.6.4-bin/lib/jetty-io-9.2.26.v20180806.jar
index 69918be..68195e4 100644
--- a/bin/jbake-2.6.3-bin/lib/jetty-io-9.2.24.v20180105.jar
+++ b/bin/jbake-2.6.4-bin/lib/jetty-io-9.2.26.v20180806.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jetty-server-9.2.24.v20180105.jar b/bin/jbake-2.6.4-bin/lib/jetty-server-9.2.26.v20180806.jar
similarity index 88%
rename from bin/jbake-2.6.3-bin/lib/jetty-server-9.2.24.v20180105.jar
rename to bin/jbake-2.6.4-bin/lib/jetty-server-9.2.26.v20180806.jar
index 48ccf57..a62cc71 100644
--- a/bin/jbake-2.6.3-bin/lib/jetty-server-9.2.24.v20180105.jar
+++ b/bin/jbake-2.6.4-bin/lib/jetty-server-9.2.26.v20180806.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jetty-util-9.2.24.v20180105.jar b/bin/jbake-2.6.4-bin/lib/jetty-util-9.2.26.v20180806.jar
similarity index 90%
rename from bin/jbake-2.6.3-bin/lib/jetty-util-9.2.24.v20180105.jar
rename to bin/jbake-2.6.4-bin/lib/jetty-util-9.2.26.v20180806.jar
index 15e2723..e10680e 100644
--- a/bin/jbake-2.6.3-bin/lib/jetty-util-9.2.24.v20180105.jar
+++ b/bin/jbake-2.6.4-bin/lib/jetty-util-9.2.26.v20180806.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jna-4.5.0.jar b/bin/jbake-2.6.4-bin/lib/jna-4.5.0.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/jna-4.5.0.jar
rename to bin/jbake-2.6.4-bin/lib/jna-4.5.0.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jna-platform-4.5.0.jar b/bin/jbake-2.6.4-bin/lib/jna-platform-4.5.0.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/jna-platform-4.5.0.jar
rename to bin/jbake-2.6.4-bin/lib/jna-platform-4.5.0.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jruby-complete-9.1.17.0.jar b/bin/jbake-2.6.4-bin/lib/jruby-complete-9.1.17.0.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/jruby-complete-9.1.17.0.jar
rename to bin/jbake-2.6.4-bin/lib/jruby-complete-9.1.17.0.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/json-simple-1.1.1.jar b/bin/jbake-2.6.4-bin/lib/json-simple-1.1.1.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/json-simple-1.1.1.jar
rename to bin/jbake-2.6.4-bin/lib/json-simple-1.1.1.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jsoup-1.11.3.jar b/bin/jbake-2.6.4-bin/lib/jsoup-1.11.3.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/jsoup-1.11.3.jar
rename to bin/jbake-2.6.4-bin/lib/jsoup-1.11.3.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/jul-to-slf4j-1.7.25.jar b/bin/jbake-2.6.4-bin/lib/jul-to-slf4j-1.7.25.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/jul-to-slf4j-1.7.25.jar
rename to bin/jbake-2.6.4-bin/lib/jul-to-slf4j-1.7.25.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/logback-classic-1.2.3.jar b/bin/jbake-2.6.4-bin/lib/logback-classic-1.2.3.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/logback-classic-1.2.3.jar
rename to bin/jbake-2.6.4-bin/lib/logback-classic-1.2.3.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/logback-core-1.2.3.jar b/bin/jbake-2.6.4-bin/lib/logback-core-1.2.3.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/logback-core-1.2.3.jar
rename to bin/jbake-2.6.4-bin/lib/logback-core-1.2.3.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/logging/logback.xml b/bin/jbake-2.6.4-bin/lib/logging/logback.xml
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/logging/logback.xml
rename to bin/jbake-2.6.4-bin/lib/logging/logback.xml
diff --git a/bin/jbake-2.6.3-bin/lib/ognl-3.1.12.jar b/bin/jbake-2.6.4-bin/lib/ognl-3.1.12.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/ognl-3.1.12.jar
rename to bin/jbake-2.6.4-bin/lib/ognl-3.1.12.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/orientdb-core-2.2.37.jar b/bin/jbake-2.6.4-bin/lib/orientdb-core-2.2.37.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/orientdb-core-2.2.37.jar
rename to bin/jbake-2.6.4-bin/lib/orientdb-core-2.2.37.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/parboiled-core-1.1.7.jar b/bin/jbake-2.6.4-bin/lib/parboiled-core-1.1.7.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/parboiled-core-1.1.7.jar
rename to bin/jbake-2.6.4-bin/lib/parboiled-core-1.1.7.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/parboiled-java-1.1.7.jar b/bin/jbake-2.6.4-bin/lib/parboiled-java-1.1.7.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/parboiled-java-1.1.7.jar
rename to bin/jbake-2.6.4-bin/lib/parboiled-java-1.1.7.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/pegdown-1.6.0.jar b/bin/jbake-2.6.4-bin/lib/pegdown-1.6.0.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/pegdown-1.6.0.jar
rename to bin/jbake-2.6.4-bin/lib/pegdown-1.6.0.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/slf4j-api-1.7.25.jar b/bin/jbake-2.6.4-bin/lib/slf4j-api-1.7.25.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/slf4j-api-1.7.25.jar
rename to bin/jbake-2.6.4-bin/lib/slf4j-api-1.7.25.jar
Binary files differ
diff --git a/bin/jbake-2.6.3-bin/lib/snappy-java-1.1.0.1.jar b/bin/jbake-2.6.4-bin/lib/snappy-java-1.1.0.1.jar
similarity index 100%
rename from bin/jbake-2.6.3-bin/lib/snappy-java-1.1.0.1.jar
rename to bin/jbake-2.6.4-bin/lib/snappy-java-1.1.0.1.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/thymeleaf-3.0.11.RELEASE.jar b/bin/jbake-2.6.4-bin/lib/thymeleaf-3.0.11.RELEASE.jar
new file mode 100644
index 0000000..57439fa
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/thymeleaf-3.0.11.RELEASE.jar
Binary files differ
diff --git a/bin/jbake-2.6.4-bin/lib/unbescape-1.1.6.RELEASE.jar b/bin/jbake-2.6.4-bin/lib/unbescape-1.1.6.RELEASE.jar
new file mode 100644
index 0000000..10e4da5
--- /dev/null
+++ b/bin/jbake-2.6.4-bin/lib/unbescape-1.1.6.RELEASE.jar
Binary files differ
diff --git a/content/documentation/extensions/mod_camel.adoc b/content/documentation/extensions/mod_camel.adoc
index 64eed8c..41463dd 100644
--- a/content/documentation/extensions/mod_camel.adoc
+++ b/content/documentation/extensions/mod_camel.adoc
@@ -20,18 +20,17 @@
 === Compatibility
 
 The module is based on Java 8. 
-{jbake-tamaya_version}
 
 === Installation
 
 To benefit from configuration builder support you only must add the corresponding dependency to your module:
 
-[source, xml, subs="attributes"]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
   <artifactId>tamaya-camel_beta</artifactId>
-  <version>{jbake-tamaya_version}</version>
+  <version>{tamaya_version}</version>
 </dependency>
 -----------------------------------------------
 
diff --git a/content/documentation/extensions/mod_cdi.adoc b/content/documentation/extensions/mod_cdi.adoc
index 818d891..8d2c0c6 100644
--- a/content/documentation/extensions/mod_cdi.adoc
+++ b/content/documentation/extensions/mod_cdi.adoc
@@ -36,6 +36,7 @@
 code against the injection API without dependency on the concrete injection implementation. As a consequence your
 components will be compatible regardless if deployed in a pure SE or as Java EE (CDI) or Spring environment:
 
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
@@ -56,7 +57,7 @@
 you never have installed both CDI extensions at the same time because this may be lead to unforseen side-effects.
 
 .CDI Java EE Application Configuration
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
@@ -69,7 +70,7 @@
 following dependency. If this dependency is missing injection is purely based on
 CDI injection features.
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_classloader_support.adoc b/content/documentation/extensions/mod_classloader_support.adoc
index d816f50..bfa73cf 100644
--- a/content/documentation/extensions/mod_classloader_support.adoc
+++ b/content/documentation/extensions/mod_classloader_support.adoc
@@ -29,7 +29,7 @@
 
 To benefit from configuration server support you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_collections.adoc b/content/documentation/extensions/mod_collections.adoc
index 8716688..6cfc846 100644
--- a/content/documentation/extensions/mod_collections.adoc
+++ b/content/documentation/extensions/mod_collections.adoc
@@ -27,7 +27,7 @@
 
 To use Tamaya collection support you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
@@ -322,4 +322,4 @@
 server.1.name=server2, localhost:8000, master=true
 server.2=server3, localhost:8003
 [META]server.item-converter=com.mycompany.config.ServerConverter
------------------------------------------------
\ No newline at end of file
+-----------------------------------------------
diff --git a/content/documentation/extensions/mod_consul.adoc b/content/documentation/extensions/mod_consul.adoc
index 094e8be..5791931 100644
--- a/content/documentation/extensions/mod_consul.adoc
+++ b/content/documentation/extensions/mod_consul.adoc
@@ -29,7 +29,7 @@
 
 To use _tamaya-consul_ you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
@@ -73,4 +73,4 @@
 === The AbstractConsulPropertySource
 
 The +AbstractConsulPropertySource+ provides all features from +ConsulPropertySource+ but does not define how the
-property source is exactly configured, so you have full control.
\ No newline at end of file
+property source is exactly configured, so you have full control.
diff --git a/content/documentation/extensions/mod_etcd.adoc b/content/documentation/extensions/mod_etcd.adoc
index 536ff41..b434106 100644
--- a/content/documentation/extensions/mod_etcd.adoc
+++ b/content/documentation/extensions/mod_etcd.adoc
@@ -28,7 +28,7 @@
 To use _etcd_ as a configuration backend you only must add the corresponding dependency to
 your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
@@ -66,4 +66,4 @@
 === The AbstractEtcdPropertySource
 
 The +AbstractEtcdPropertySource+ is the base class used by +EtcdPropertySource+. Use it to implement your own custom
-etcd property source.
\ No newline at end of file
+etcd property source.
diff --git a/content/documentation/extensions/mod_events.adoc b/content/documentation/extensions/mod_events.adoc
index 44b0a94..7d303fe 100644
--- a/content/documentation/extensions/mod_events.adoc
+++ b/content/documentation/extensions/mod_events.adoc
@@ -33,7 +33,7 @@
 
 To benefit from configuration event support you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_features.adoc b/content/documentation/extensions/mod_features.adoc
index c3299bd..4379fe5 100644
--- a/content/documentation/extensions/mod_features.adoc
+++ b/content/documentation/extensions/mod_features.adoc
@@ -25,7 +25,7 @@
 To use Tamaya _Features_ you only must add the corresponding dependency to
 your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_filter.adoc b/content/documentation/extensions/mod_filter.adoc
index a41d187..7c76c16 100644
--- a/content/documentation/extensions/mod_filter.adoc
+++ b/content/documentation/extensions/mod_filter.adoc
@@ -29,7 +29,7 @@
 
 To benefit from filter support you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_formats.adoc b/content/documentation/extensions/mod_formats.adoc
index db3202c..719b877 100644
--- a/content/documentation/extensions/mod_formats.adoc
+++ b/content/documentation/extensions/mod_formats.adoc
@@ -30,7 +30,7 @@
 
 To use the formats module you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_functions.adoc b/content/documentation/extensions/mod_functions.adoc
index 7287924..3a6e6b7 100644
--- a/content/documentation/extensions/mod_functions.adoc
+++ b/content/documentation/extensions/mod_functions.adoc
@@ -35,7 +35,7 @@
 
 For using the functionality shown in this document you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_hazelcast.adoc b/content/documentation/extensions/mod_hazelcast.adoc
index c8cecca..db0d30e 100644
--- a/content/documentation/extensions/mod_hazelcast.adoc
+++ b/content/documentation/extensions/mod_hazelcast.adoc
@@ -30,7 +30,7 @@
 
 To use _tamaya-hazelcast_ you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
@@ -87,4 +87,4 @@
 === The AbstractHazelcastPropertySource
 
 The +AbstractHazelcastPropertySource+ is the baseclass used by +HazelcastPropertySource+. Use it to implement your own
-Hazelcast based property source.
\ No newline at end of file
+Hazelcast based property source.
diff --git a/content/documentation/extensions/mod_injection.adoc b/content/documentation/extensions/mod_injection.adoc
index 3074a5d..1581fc4 100644
--- a/content/documentation/extensions/mod_injection.adoc
+++ b/content/documentation/extensions/mod_injection.adoc
@@ -29,7 +29,7 @@
 
 Basically Tamaya's injection API is deployed as API artifact:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
@@ -40,7 +40,7 @@
 
 To use injection with Java SE you must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_jndi.adoc b/content/documentation/extensions/mod_jndi.adoc
index 74b98bc..4be4d37 100644
--- a/content/documentation/extensions/mod_jndi.adoc
+++ b/content/documentation/extensions/mod_jndi.adoc
@@ -26,7 +26,7 @@
 To use _jndi_ as a configuration backend you only must add the corresponding dependency to
 your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_jodatime.adoc b/content/documentation/extensions/mod_jodatime.adoc
index 13d5035..8849ea6 100644
--- a/content/documentation/extensions/mod_jodatime.adoc
+++ b/content/documentation/extensions/mod_jodatime.adoc
@@ -21,7 +21,7 @@
 To support Joda-Time types as configuration values, you only have to add the following
 maven dependency to your project:
 
-[source, listing]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <grooupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_json.adoc b/content/documentation/extensions/mod_json.adoc
index 9df73c7..adb2ecb 100644
--- a/content/documentation/extensions/mod_json.adoc
+++ b/content/documentation/extensions/mod_json.adoc
@@ -46,7 +46,7 @@
 
 To use the JSON extension module you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_management.adoc b/content/documentation/extensions/mod_management.adoc
index ca38d18..b4f8a16 100644
--- a/content/documentation/extensions/mod_management.adoc
+++ b/content/documentation/extensions/mod_management.adoc
@@ -25,7 +25,7 @@
 To use the _management_ extension you only must add the corresponding dependency
 to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_metamodel.adoc b/content/documentation/extensions/mod_metamodel.adoc
index 3cec143..285542b 100644
--- a/content/documentation/extensions/mod_metamodel.adoc
+++ b/content/documentation/extensions/mod_metamodel.adoc
@@ -78,7 +78,7 @@
 
 To use _metamodel_ features you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_microprofile.adoc b/content/documentation/extensions/mod_microprofile.adoc
index c9cfe3e..a8a4545 100644
--- a/content/documentation/extensions/mod_microprofile.adoc
+++ b/content/documentation/extensions/mod_microprofile.adoc
@@ -33,7 +33,7 @@
 
 To benefit from Tamaya Microprofile you only must one of the following dependencies to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_mutable_config.adoc b/content/documentation/extensions/mod_mutable_config.adoc
index 4a61426..6aa0573 100644
--- a/content/documentation/extensions/mod_mutable_config.adoc
+++ b/content/documentation/extensions/mod_mutable_config.adoc
@@ -28,7 +28,7 @@
 
 To benefit from configuration mutability support you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_optional.adoc b/content/documentation/extensions/mod_optional.adoc
index cc3e58b..03e85a0 100644
--- a/content/documentation/extensions/mod_optional.adoc
+++ b/content/documentation/extensions/mod_optional.adoc
@@ -31,7 +31,7 @@
 
 To use Tamaya _optional_ you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_osgi.adoc b/content/documentation/extensions/mod_osgi.adoc
index 241f795..14f833a 100644
--- a/content/documentation/extensions/mod_osgi.adoc
+++ b/content/documentation/extensions/mod_osgi.adoc
@@ -37,7 +37,7 @@
 To benefit from Tamaya in an OSGI context you must deploy at least the following modules to
 your OSGI runtime environment:
 
-[source, listing]
+[source, listing, subs=attributes+]
 -----------------------------------------------
 # Runtime with OSGI ConfigAdmin support, e.g.
 org.apache.felix:org.apache.felix.configadmin:{felix_version}
@@ -811,4 +811,4 @@
 Apache Tamaya also provides the same commands as described for _Karaf_, but executable in
 plaing Gogo console as used by Apache Felix and Equinox as
 +org.apache.tamaya.ext:tamaya-gogo-shell:{tamaya-version}+. Refer to the previous sections for
-a detailed command description.
\ No newline at end of file
+a detailed command description.
diff --git a/content/documentation/extensions/mod_remote.adoc b/content/documentation/extensions/mod_remote.adoc
index 9c234f1..6758ff9 100644
--- a/content/documentation/extensions/mod_remote.adoc
+++ b/content/documentation/extensions/mod_remote.adoc
@@ -28,7 +28,7 @@
 
 To use remote support you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_resolver.adoc b/content/documentation/extensions/mod_resolver.adoc
index 1bf6b86..1e6cc13 100644
--- a/content/documentation/extensions/mod_resolver.adoc
+++ b/content/documentation/extensions/mod_resolver.adoc
@@ -28,7 +28,7 @@
 
 To benefit from dynamic value resolution you only must add the corresponding dependency to your module:
 
-[source, xml, subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_resources.adoc b/content/documentation/extensions/mod_resources.adoc
index 5ee5657..2c3399a 100644
--- a/content/documentation/extensions/mod_resources.adoc
+++ b/content/documentation/extensions/mod_resources.adoc
@@ -24,7 +24,7 @@
 
 To use this module add the following dependency:
 
-[source, listing, subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <grooupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_server.adoc b/content/documentation/extensions/mod_server.adoc
index 2d38221..9da0d48 100644
--- a/content/documentation/extensions/mod_server.adoc
+++ b/content/documentation/extensions/mod_server.adoc
@@ -27,7 +27,7 @@
 
 To benefit from configuration server support you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_spring.adoc b/content/documentation/extensions/mod_spring.adoc
index a85fff6..d95eb0d 100644
--- a/content/documentation/extensions/mod_spring.adoc
+++ b/content/documentation/extensions/mod_spring.adoc
@@ -31,7 +31,7 @@
 
 To benefit from Tamaya Spring integration add the following dependencies to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_usagetracker.adoc b/content/documentation/extensions/mod_usagetracker.adoc
index 4cd0579..395c048 100644
--- a/content/documentation/extensions/mod_usagetracker.adoc
+++ b/content/documentation/extensions/mod_usagetracker.adoc
@@ -27,7 +27,7 @@
 
 To use Tamaya _usagetracker_ you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_validation.adoc b/content/documentation/extensions/mod_validation.adoc
index 897bb56..acfdcbd 100644
--- a/content/documentation/extensions/mod_validation.adoc
+++ b/content/documentation/extensions/mod_validation.adoc
@@ -27,7 +27,7 @@
 
 To activate configuration _validation_ you only must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_vertx.adoc b/content/documentation/extensions/mod_vertx.adoc
index 906367d..0501f28 100644
--- a/content/documentation/extensions/mod_vertx.adoc
+++ b/content/documentation/extensions/mod_vertx.adoc
@@ -30,7 +30,7 @@
 To use Tamaya's _Vertx_ support you only must add the corresponding dependency to
 your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_yaml.adoc b/content/documentation/extensions/mod_yaml.adoc
index da76eba..cadbc19 100644
--- a/content/documentation/extensions/mod_yaml.adoc
+++ b/content/documentation/extensions/mod_yaml.adoc
@@ -27,7 +27,7 @@
 
 To use YAML as configuration format you must add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/quickstart.adoc b/content/documentation/quickstart.adoc
index 3455b5b..980b63a 100644
--- a/content/documentation/quickstart.adoc
+++ b/content/documentation/quickstart.adoc
@@ -8,7 +8,7 @@
 provides a simple configuration API. To start add the following
 dependency to your project:
 
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
 ----
 <dependency>
     <groupId>{tamaya_mvn_group_id}</groupId>
@@ -116,7 +116,7 @@
 
 ==== Dynamic Resolution and Value Placeholders
 
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
 ----
 <dependency>
   <artifactId>org.apache.tamaya.ext</id>
@@ -140,7 +140,7 @@
 
 ==== Ant-styled Path Resolution of Resources
 
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
 ----
 <dependency>
   <artifactId>org.apache.tamaya.ext</id>
@@ -154,7 +154,7 @@
 description, e.g.
 
 
-[source,xml,subs="verbatim,attributes"]
+[source, xml]
 ----
 Collection<URL> urls = Resolver.getInstance().getResources("META-INF/cfg/**/*.properties");
 ----
@@ -164,7 +164,7 @@
 
 ==== Configuration Injection
 
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
 ----
 <dependency>
   <artifactId>org.apache.tamaya.ext</id>
@@ -178,7 +178,7 @@
 
 Corresponding configuration:
 
-[source,xml,subs="verbatim,attributes"]
+[source, xml]
 ----
 public class MyType {
    @Config("my.key")
@@ -195,7 +195,7 @@
 
 Or the same as template:
 
-[source,xml,subs="verbatim,attributes"]
+[source, xml]
 ----
 public interface MyTypeTemplate {
    @Config("my.key")
diff --git a/content/documentation/spisupport.adoc b/content/documentation/spisupport.adoc
index 82c4cec..610724c 100644
--- a/content/documentation/spisupport.adoc
+++ b/content/documentation/spisupport.adoc
@@ -51,7 +51,7 @@
 
 To use Tamaya's _spisupport_ you only have to add the corresponding dependency to your module:
 
-[source, xml]
+[source, xml, subs=attributes+]
 -----------------------------------------------
 <dependency>
   <groupId>org.apache.tamaya</groupId>
diff --git a/content/download.adoc b/content/download.adoc
index c1caaf6..7d74c42 100644
--- a/content/download.adoc
+++ b/content/download.adoc
@@ -32,7 +32,7 @@
 
 // @todo Source highlighting does not work currently.
 //
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
 ----
 <dependency>
     <groupId>{tamaya_mvn_group_id}</groupId>
diff --git a/copysite.sh b/copysite.sh
index 96da38e..7b7aeff 100755
--- a/copysite.sh
+++ b/copysite.sh
@@ -1,6 +1,6 @@
  #!/bin/bash          
 echo "Starting to bake our project homepage ...."
-export JBAKE_HOME="$(dirname "$0")/bin/jbake-2.6.3-bin"
+export JBAKE_HOME="$(dirname "$0")/bin/jbake-2.6.4-bin"
 echo $JBAKE_HOME
 $JBAKE_HOME/bin/jbake -b
 echo "Copying stuff from original into new branch ..."
diff --git a/jbake.properties b/jbake.properties
index 84b7f80..5a868b7 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -15,8 +15,8 @@
 template.encoding=UTF-8
 # Make properties available in templates
 asciidoctor.attributes.export=true
-asciidoctor.attributes.prefix=jbake-
 twitterhandle=tamayaconf
 tamaya_version_released=0.3-incubating
+tamaya_version_development=0.4-incubating-SNAPSHOT
 tamaya_version=0.4-incubating-SNAPSHOT
 tamaya_mvn_group_id=org.apache.tamaya
diff --git a/templates/footer.thyme b/templates/footer.thyme
index cbdb34f..f42ea04 100644
--- a/templates/footer.thyme
+++ b/templates/footer.thyme
@@ -7,8 +7,8 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span th:text='${#dates.format(published_date,"yyyy")}'>published_date</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span th:text='${version}'>version</span></a>
+		        <p class="muted credit">&copy; 2014-<span th:text='${#dates.format(published_date,"yyyy")}'>published_date</span> Apache Software Foundation | Mixed with <a href="https://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="https://jbake.org">JBake <span th:text='${version}'>version</span></a>
 							at <span th:text='${#dates.format(published_date,"yyyy-MM-dd")}'>published_date</span> |
 						<a class="twitter-follow-button" data-show-count="false" th:href="'https://twitter.com/'+${config.twitterhandle}" th:text="'Follow @'+ ${config.twitterhandle}"></a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
@@ -17,7 +17,7 @@
                     Apache Tamaya (incubating) is an effort undergoing
                     incubation at
                     The Apache Software Foundation (ASF), sponsored by
-                    the name of Apache Incubator. Incubation is required of
+                    the Apache Incubator. Incubation is required of
                     all newly accepted projects until a further review indicates
                     that the infrastructure, communications, and decision making
                     process have stabilized in a manner consistent with other
diff --git a/templates/header.thyme b/templates/header.thyme
index b9c0ff0..5a598f2 100644
--- a/templates/header.thyme
+++ b/templates/header.thyme
@@ -4,10 +4,10 @@
 	    <meta charset="utf-8"/>
 	    <title th:with="title=(${content.title != null} ? ${content.title} : 'Tamaya Incubator')" th:text="${title}"></title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-	    <meta name="description" content=""/>
-	    <meta name="author" content=""/>
-	    <meta name="keywords" content=""/>
-	    <meta name="generator" content="'JBake '+'${version}"/>
+	    <meta name="description" content="Homepage of Apache Tamaya (incubating)"/>
+	    <meta name="author" content="Apache Tamaya Project Team"/>
+	    <meta name="keywords" content="Apache Tamaya Incubating, configuration, Java, ASF, Apache Software Foundation"/>
+      <meta name="generator" th:with="jbakeversion='JBake ${content.version}'" th:content="${jbakeversion}"/>
 
 	    <!-- Le styles -->
 	    <link th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'css/bootstrap.min.css'" rel="stylesheet"/>
diff --git a/templates/menu.thyme b/templates/menu.thyme
index 1aaba7b..6b848f9 100644
--- a/templates/menu.thyme
+++ b/templates/menu.thyme
@@ -53,6 +53,22 @@
 								<li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'history.html'">Release History</a></li>
               </ul>
             </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="https://www.apache.org/">Apache Software Foundation (ASF)</a></li>
+								<li><a href="https://www.apache.org/foundation/how-it-works.html">How the ASF works</a></li>
+								<li><a href="https://www.apache.org/foundation/getinvolved.html">Get Involved</a></li>
+								<li><a href="https://www.apache.org/dev/">Developer Resources</a></li>
+								<li><a href="https://www.apache.org/foundation/policies/conduct.html">Code of Conduct</a></li>
+								<li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+								<li><a href="https://www.apache.org/licenses/">License</a></li>
+								<li><a href="https://www.apache.org/security">Security</a></li>
+								<li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+								<hr/>
+								<li><a  href="https://www.apache.org/events/current-event.html"><img src="https://www.apache.org/events/current-event-125x125.png" alt="Current Apache event"/></a></li>
+              </ul>
+            </li>
 <!-- Example:
 						<li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>