You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2019/06/04 19:11:46 UTC

[incubator-tamaya-site] branch asf-site updated: Regen page

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

pottlinger pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 4e8a277  Regen page
4e8a277 is described below

commit 4e8a277cac8fcac5f3ee7de37c996b3ffad6ef4f
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Tue Jun 4 21:11:39 2019 +0200

    Regen page
---
 about.html                                         |  34 +++-
 apidocs/index.html                                 |  34 +++-
 archive.html                                       |  36 ++--
 blog/2014/no-jsr-in-javaee8.html                   |  32 +++-
 blog/2014/whatistamaya.html                        |  32 +++-
 blog/2015/dzone-article.html                       |  32 +++-
 blog/2015/introduction.html                        |  32 +++-
 blog/2015/javaland.html                            |  32 +++-
 blog/2015/new-configuration-api.html               |  32 +++-
 blog/2016/apachecon-seville.html                   |  32 +++-
 blog/2016/apachecon-vancouver.html                 |  32 +++-
 blog/2016/bedcon.html                              |  32 +++-
 blog/2016/dirk-weil-javaeeblog.html                |  32 +++-
 blog/2016/infoq-article.html                       |  32 +++-
 blog/2016/java2days-sofia.html                     |  32 +++-
 blog/2016/javaland.html                            |  32 +++-
 blog/2016/javaone.html                             |  32 +++-
 blog/2016/jug-basel.html                           |  32 +++-
 blog/2016/jug-stgallen.html                        |  32 +++-
 blog/2016/tamaya-book.html                         |  32 +++-
 blog/2016/voxxed-days-zurich.html                  |  32 +++-
 blog/2017/03/javaland.html                         |  32 +++-
 blog/2017/06/release-03.html                       |  32 +++-
 blog/2017/09/new-api-links.html                    |  32 +++-
 blog/2018/02/release-03-announcement.html          |  32 +++-
 development/community.html                         |  34 +++-
 development/possible-contributions.html            |  34 +++-
 development/source.html                            |  34 +++-
 development/team.html                              |  34 +++-
 devguide.html                                      |  34 +++-
 documentation/api.html                             |  34 +++-
 documentation/core.html                            |  34 +++-
 documentation/extensions.html                      |  34 +++-
 documentation/extensions/mod_camel.html            |  34 +++-
 documentation/extensions/mod_cdi.html              |  34 +++-
 .../extensions/mod_classloader_support.html        |  34 +++-
 documentation/extensions/mod_collections.html      |  34 +++-
 documentation/extensions/mod_consul.html           |  34 +++-
 documentation/extensions/mod_etcd.html             |  34 +++-
 documentation/extensions/mod_events.html           |  34 +++-
 documentation/extensions/mod_features.html         |  34 +++-
 documentation/extensions/mod_filter.html           |  34 +++-
 documentation/extensions/mod_formats.html          |  34 +++-
 documentation/extensions/mod_functions.html        |  34 +++-
 documentation/extensions/mod_hazelcast.html        |  34 +++-
 documentation/extensions/mod_injection.html        |  34 +++-
 documentation/extensions/mod_jndi.html             |  34 +++-
 documentation/extensions/mod_jodatime.html         |  34 +++-
 documentation/extensions/mod_json.html             |  34 +++-
 documentation/extensions/mod_management.html       |  34 +++-
 documentation/extensions/mod_metamodel.html        |  34 +++-
 documentation/extensions/mod_microprofile.html     |  34 +++-
 documentation/extensions/mod_mutable_config.html   |  34 +++-
 documentation/extensions/mod_optional.html         |  34 +++-
 documentation/extensions/mod_osgi.html             |  34 +++-
 documentation/extensions/mod_remote.html           |  34 +++-
 documentation/extensions/mod_resolver.html         |  34 +++-
 documentation/extensions/mod_resources.html        |  34 +++-
 documentation/extensions/mod_server.html           |  34 +++-
 documentation/extensions/mod_spring.html           |  34 +++-
 documentation/extensions/mod_usagetracker.html     |  34 +++-
 documentation/extensions/mod_validation.html       |  34 +++-
 documentation/extensions/mod_vertx.html            |  34 +++-
 documentation/extensions/mod_yaml.html             |  34 +++-
 documentation/quickstart.html                      |  34 +++-
 documentation/spisupport.html                      |  34 +++-
 documentation/usecases.html                        |  34 +++-
 download.html                                      |  34 +++-
 examples.html                                      |  34 +++-
 features.html                                      |  34 +++-
 feed.xml                                           |  34 ++--
 highleveldesign.html                               |  34 +++-
 history.html                                       |  34 +++-
 index.html                                         |  32 +++-
 release-guide.html                                 |  34 +++-
 sitemap.xml                                        | 200 ++++++++++-----------
 start.html                                         |  34 +++-
 77 files changed, 1970 insertions(+), 770 deletions(-)

diff --git a/about.html b/about.html
index ab7100f..36609af 100644
--- a/about.html
+++ b/about.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>About Tamaya</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1>About Tamaya</h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -216,9 +232,9 @@ or in a clustered Docker environment in production, it stays the same!</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -226,7 +242,7 @@ or in a clustered Docker environment in production, it stays the same!</p>
                     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/apidocs/index.html b/apidocs/index.html
index 84d5189..cd457fc 100644
--- a/apidocs/index.html
+++ b/apidocs/index.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>API overview</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1>API overview</h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="paragraph">
 <p>At the moment you can see multiple API versions:</p>
@@ -152,9 +168,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -162,7 +178,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/archive.html b/archive.html
index d281fb1..926f4ab 100644
--- a/archive.html
+++ b/archive.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -165,14 +181,14 @@
 			
 			    <h3>November 2016</h3>
 
-				<h4>16 - <a href="blog/2016/java2days-sofia.html">Java2Days (Sofia, Bulgaria) - Configuration for Java EE / Config JSR</a></h4>
+				<h4>16 - <a href="blog/2016/apachecon-seville.html">ApacheCon Europe 2016 - Seville, Spain: Configure Once, run everyhere! Configuration with Apache Tamaya</a></h4>
 				
 			
 
 			
 			    <h3>November 2016</h3>
 
-				<h4>16 - <a href="blog/2016/apachecon-seville.html">ApacheCon Europe 2016 - Seville, Spain: Configure Once, run everyhere! Configuration with Apache Tamaya</a></h4>
+				<h4>16 - <a href="blog/2016/java2days-sofia.html">Java2Days (Sofia, Bulgaria) - Configuration for Java EE / Config JSR</a></h4>
 				
 			
 
@@ -289,9 +305,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -299,7 +315,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/blog/2014/no-jsr-in-javaee8.html b/blog/2014/no-jsr-in-javaee8.html
index 8bd9111..4251cfa 100644
--- a/blog/2014/no-jsr-in-javaee8.html
+++ b/blog/2014/no-jsr-in-javaee8.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Java EE 8 without any configuration JSR (German)</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -152,9 +168,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -162,7 +178,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/blog/2014/whatistamaya.html b/blog/2014/whatistamaya.html
index 0d34ec6..b9815dc 100644
--- a/blog/2014/whatistamaya.html
+++ b/blog/2014/whatistamaya.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Introduction to Apache Tamaya Incubating (German)</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2015/dzone-article.html b/blog/2015/dzone-article.html
index 2f0b181..c0f81d6 100644
--- a/blog/2015/dzone-article.html
+++ b/blog/2015/dzone-article.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>DZone-article - Configure Once, Run Everywhere: Decoupling Configuration and Runtime</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2015/introduction.html b/blog/2015/introduction.html
index b4ff2c0..5988620 100644
--- a/blog/2015/introduction.html
+++ b/blog/2015/introduction.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Introduction to configuration (German)</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2015/javaland.html b/blog/2015/javaland.html
index f22129f..e6e6524 100644
--- a/blog/2015/javaland.html
+++ b/blog/2015/javaland.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>JavaLand 2015 - Slides of talk about Java configuration</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -155,9 +171,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -165,7 +181,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/blog/2015/new-configuration-api.html b/blog/2015/new-configuration-api.html
index adf7ff1..1a85183 100644
--- a/blog/2015/new-configuration-api.html
+++ b/blog/2015/new-configuration-api.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya the new configuration API</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2016/apachecon-seville.html b/blog/2016/apachecon-seville.html
index a82d396..df9e270 100644
--- a/blog/2016/apachecon-seville.html
+++ b/blog/2016/apachecon-seville.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>ApacheCon Europe 2016 - Seville, Spain: Configure Once, run everyhere! Configuration with Apache Tamaya</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -155,9 +171,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -165,7 +181,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/blog/2016/apachecon-vancouver.html b/blog/2016/apachecon-vancouver.html
index 7d71b34..0212945 100644
--- a/blog/2016/apachecon-vancouver.html
+++ b/blog/2016/apachecon-vancouver.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>ApacheCon North America 2016 - Vancouver, Canada</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -152,9 +168,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -162,7 +178,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/blog/2016/bedcon.html b/blog/2016/bedcon.html
index bb8c701..5ffd2ba 100644
--- a/blog/2016/bedcon.html
+++ b/blog/2016/bedcon.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>BedCon 2016 - Slides of talk &quot;Apache Tamaya Configuring your Containers&quot;</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -152,9 +168,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -162,7 +178,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/blog/2016/dirk-weil-javaeeblog.html b/blog/2016/dirk-weil-javaeeblog.html
index 38e1f59..b0ca8ec 100644
--- a/blog/2016/dirk-weil-javaeeblog.html
+++ b/blog/2016/dirk-weil-javaeeblog.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Blog post (German) - Dirk Weil: Anwendungskonfiguration mit Apache Tamaya</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2016/infoq-article.html b/blog/2016/infoq-article.html
index cf07520..471ee0c 100644
--- a/blog/2016/infoq-article.html
+++ b/blog/2016/infoq-article.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>InnoQ-article - Configure Once, Run Everywhere: Decoupling Configuration and Runtime</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2016/java2days-sofia.html b/blog/2016/java2days-sofia.html
index 6655704..190d4aa 100644
--- a/blog/2016/java2days-sofia.html
+++ b/blog/2016/java2days-sofia.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Java2Days (Sofia, Bulgaria) - Configuration for Java EE / Config JSR</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2016/javaland.html b/blog/2016/javaland.html
index 3287c1b..125bd76 100644
--- a/blog/2016/javaland.html
+++ b/blog/2016/javaland.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Javaland - Configuring Containers</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -161,9 +177,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -171,7 +187,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/blog/2016/javaone.html b/blog/2016/javaone.html
index 2971ac6..2f83154 100644
--- a/blog/2016/javaone.html
+++ b/blog/2016/javaone.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>JavaOne 2016 - Configure once and run everywhere</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -155,9 +171,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -165,7 +181,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/blog/2016/jug-basel.html b/blog/2016/jug-basel.html
index 49d2509..4fb7dc0 100644
--- a/blog/2016/jug-basel.html
+++ b/blog/2016/jug-basel.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>JUG Basel - Introduction to Apache Tamaya (German)</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2016/jug-stgallen.html b/blog/2016/jug-stgallen.html
index 4f5f614..c6ec168 100644
--- a/blog/2016/jug-stgallen.html
+++ b/blog/2016/jug-stgallen.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>JUG St. Gallen - Introduction to Apache Tamaya (German)</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2016/tamaya-book.html b/blog/2016/tamaya-book.html
index 57d3cf9..8b97db6 100644
--- a/blog/2016/tamaya-book.html
+++ b/blog/2016/tamaya-book.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>German e-book - Apache Tamaya</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -155,9 +171,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -165,7 +181,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/blog/2016/voxxed-days-zurich.html b/blog/2016/voxxed-days-zurich.html
index 5f847f6..28f7e6d 100644
--- a/blog/2016/voxxed-days-zurich.html
+++ b/blog/2016/voxxed-days-zurich.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Voxxed Days Zürich - Configuration with Apache Tamaya</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -149,9 +165,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -159,7 +175,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/blog/2017/03/javaland.html b/blog/2017/03/javaland.html
index 425e90c..886311d 100644
--- a/blog/2017/03/javaland.html
+++ b/blog/2017/03/javaland.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Javaland - Configuration beyond Java EE8</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../../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>
@@ -155,9 +171,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -165,7 +181,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/blog/2017/06/release-03.html b/blog/2017/06/release-03.html
index 9ce1677..5657d10 100644
--- a/blog/2017/06/release-03.html
+++ b/blog/2017/06/release-03.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya 0.3-incubating release candidate</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../../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>
@@ -152,9 +168,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -162,7 +178,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/blog/2017/09/new-api-links.html b/blog/2017/09/new-api-links.html
index be3978a..864854e 100644
--- a/blog/2017/09/new-api-links.html
+++ b/blog/2017/09/new-api-links.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Homepage improvements - multiple APIs are linked now</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../../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>
@@ -153,9 +169,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -163,7 +179,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/blog/2018/02/release-03-announcement.html b/blog/2018/02/release-03-announcement.html
index 997e0a2..c9d0f0b 100644
--- a/blog/2018/02/release-03-announcement.html
+++ b/blog/2018/02/release-03-announcement.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya 0.3-incubating release announcement</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../../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>
@@ -215,9 +231,9 @@ or in your pom.xml from Maven central:</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -225,7 +241,7 @@ or in your pom.xml from Maven central:</p>
                     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/development/community.html b/development/community.html
index 0aebc8d..a731738 100644
--- a/development/community.html
+++ b/development/community.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya: Community</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya: Community</h1>
 			</div>
 
-			<p><em>2019-05-06</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="_users">Users</h2>
@@ -250,9 +266,9 @@ $ irssi
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -260,7 +276,7 @@ $ irssi
                     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/development/possible-contributions.html b/development/possible-contributions.html
index e9f6f02..d6837b8 100644
--- a/development/possible-contributions.html
+++ b/development/possible-contributions.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><!-- toc disabled -->
 <h1 id="_apache_tamaya_possible_tasks" class="sect0">Apache Tamaya - Possible Tasks</h1>
@@ -474,9 +490,9 @@ as configured.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -484,7 +500,7 @@ as configured.</p>
                     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/development/source.html b/development/source.html
index d704f2b..e43661a 100644
--- a/development/source.html
+++ b/development/source.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya: Source code repositories</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya: Source code repositories</h1>
 			</div>
 
-			<p><em>2019-05-06</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -270,9 +286,9 @@ In case you want to contribute file an issue in our <a href="https://issues.apac
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -280,7 +296,7 @@ In case you want to contribute file an issue in our <a href="https://issues.apac
                     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/development/team.html b/development/team.html
index 510f6a4..e0e7313 100644
--- a/development/team.html
+++ b/development/team.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya: Project Mailinglists</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya: Project Mailinglists</h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -344,9 +360,9 @@ The table below lists all mailings used by the Tamaya project.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -354,7 +370,7 @@ The table below lists all mailings used by the Tamaya project.</p>
                     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/devguide.html b/devguide.html
index 9474559..d5dea04 100644
--- a/devguide.html
+++ b/devguide.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya: Development Guide</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya: Development Guide</h1>
 			</div>
 
-			<p><em>2019-05-06</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="_suggested_git_workflows">1. Suggested Git Workflows</h2>
@@ -382,9 +398,9 @@ $ git branch -d TAMAYA-XXX</pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -392,7 +408,7 @@ $ git branch -d TAMAYA-XXX</pre>
                     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/documentation/api.html b/documentation/api.html
index 0a05045..722c123 100644
--- a/documentation/api.html
+++ b/documentation/api.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="CoreDesign">Apache Tamaya: API</h2>
@@ -1392,9 +1408,9 @@ further details.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -1402,7 +1418,7 @@ further details.</p>
                     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/documentation/core.html b/documentation/core.html
index e0d5fb6..19444e3 100644
--- a/documentation/core.html
+++ b/documentation/core.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="Core">Apache Tamaya: Core Implementation</h2>
@@ -687,9 +703,9 @@ Loading extensions hereby is trivial: you only are required to add the correspon
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -697,7 +713,7 @@ Loading extensions hereby is trivial: you only are required to add the correspon
                     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/documentation/extensions.html b/documentation/extensions.html
index bf68fa6..5ac5078 100644
--- a/documentation/extensions.html
+++ b/documentation/extensions.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_extension_modules">Apache Tamaya: Extension Modules</h2>
@@ -366,9 +382,9 @@ us getting them stable and well tested!</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -376,7 +392,7 @@ us getting them stable and well tested!</p>
                     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/documentation/extensions/mod_camel.html b/documentation/extensions/mod_camel.html
index 470fc5f..c7104d3 100644
--- a/documentation/extensions/mod_camel.html
+++ b/documentation/extensions/mod_camel.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Integration with Apache Camel</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with Apache Camel</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -287,9 +303,9 @@ again use Tamaya as the main configuration solutions only using Camel&#8217;s de
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -297,7 +313,7 @@ again use Tamaya as the main configuration solutions only using Camel&#8217;s de
                     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/documentation/extensions/mod_cdi.html b/documentation/extensions/mod_cdi.html
index 0afabf0..bf6c1ca 100644
--- a/documentation/extensions/mod_cdi.html
+++ b/documentation/extensions/mod_cdi.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: CDI Support</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: CDI Support</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -446,9 +462,9 @@ default section parts.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -456,7 +472,7 @@ default section parts.</p>
                     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/documentation/extensions/mod_classloader_support.html b/documentation/extensions/mod_classloader_support.html
index 5663e72..07f61aa 100644
--- a/documentation/extensions/mod_classloader_support.html
+++ b/documentation/extensions/mod_classloader_support.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Classloader Isolation Support</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Classloader Isolation Support</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -269,9 +285,9 @@ hierarchies:</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -279,7 +295,7 @@ hierarchies:</p>
                     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/documentation/extensions/mod_collections.html b/documentation/extensions/mod_collections.html
index 42c270e..db7cfba 100644
--- a/documentation/extensions/mod_collections.html
+++ b/documentation/extensions/mod_collections.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Collection Support</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Collection Support</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -585,9 +601,9 @@ server.2=server3, localhost:8003
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -595,7 +611,7 @@ server.2=server3, localhost:8003
                     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/documentation/extensions/mod_consul.html b/documentation/extensions/mod_consul.html
index 74e4672..0e056c2 100644
--- a/documentation/extensions/mod_consul.html
+++ b/documentation/extensions/mod_consul.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Integration with Consul (Hashicorp)</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with Consul (Hashicorp)</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -244,9 +260,9 @@ property source is exactly configured, so you have full control.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -254,7 +270,7 @@ property source is exactly configured, so you have full control.</p>
                     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/documentation/extensions/mod_etcd.html b/documentation/extensions/mod_etcd.html
index d8aa79b..3824029 100644
--- a/documentation/extensions/mod_etcd.html
+++ b/documentation/extensions/mod_etcd.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Integration with etcd (Core OS)</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with etcd (Core OS)</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -238,9 +254,9 @@ etcd property source.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -248,7 +264,7 @@ etcd property source.</p>
                     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/documentation/extensions/mod_events.html b/documentation/extensions/mod_events.html
index f9ff828..4771b30 100644
--- a/documentation/extensions/mod_events.html
+++ b/documentation/extensions/mod_events.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Events</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Events</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -530,9 +546,9 @@ active (by default using the Java ServiceLoader mechanism).</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -540,7 +556,7 @@ active (by default using the Java ServiceLoader mechanism).</p>
                     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/documentation/extensions/mod_features.html b/documentation/extensions/mod_features.html
index 21e0270..fda600b 100644
--- a/documentation/extensions/mod_features.html
+++ b/documentation/extensions/mod_features.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Features Check</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Features Check</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -271,9 +287,9 @@ to check, which Tamaya extensions are currently loaded.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -281,7 +297,7 @@ to check, which Tamaya extensions are currently loaded.</p>
                     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/documentation/extensions/mod_filter.html b/documentation/extensions/mod_filter.html
index 0035c18..eea35bb 100644
--- a/documentation/extensions/mod_filter.html
+++ b/documentation/extensions/mod_filter.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: User Filtering</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: User Filtering</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -279,9 +295,9 @@ managed filters:</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -289,7 +305,7 @@ managed filters:</p>
                     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/documentation/extensions/mod_formats.html b/documentation/extensions/mod_formats.html
index b62dd7f..642291d 100644
--- a/documentation/extensions/mod_formats.html
+++ b/documentation/extensions/mod_formats.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Formats</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Formats</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -518,9 +534,9 @@ functionality provided with java.util.Properties:</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -528,7 +544,7 @@ functionality provided with java.util.Properties:</p>
                     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/documentation/extensions/mod_functions.html b/documentation/extensions/mod_functions.html
index 01f94c9..55ea5a5 100644
--- a/documentation/extensions/mod_functions.html
+++ b/documentation/extensions/mod_functions.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Functions</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Functions</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -312,9 +328,9 @@ in <em>sectionKeys</em> from a given <em>key</em>.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -322,7 +338,7 @@ in <em>sectionKeys</em> from a given <em>key</em>.</p>
                     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/documentation/extensions/mod_hazelcast.html b/documentation/extensions/mod_hazelcast.html
index b608330..7171fa7 100644
--- a/documentation/extensions/mod_hazelcast.html
+++ b/documentation/extensions/mod_hazelcast.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Integration with Hazelcast</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with Hazelcast</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -254,9 +270,9 @@ Hazelcast based property source.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -264,7 +280,7 @@ Hazelcast based property source.</p>
                     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/documentation/extensions/mod_injection.html b/documentation/extensions/mod_injection.html
index 379a3e5..f66c5f7 100644
--- a/documentation/extensions/mod_injection.html
+++ b/documentation/extensions/mod_injection.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Injection</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Injection</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -705,9 +721,9 @@ public interface ConfiguredMethod {
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -715,7 +731,7 @@ public interface ConfiguredMethod {
                     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/documentation/extensions/mod_jndi.html b/documentation/extensions/mod_jndi.html
index 4269e15..0e2e402 100644
--- a/documentation/extensions/mod_jndi.html
+++ b/documentation/extensions/mod_jndi.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Integration with JNDI</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with JNDI</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -217,9 +233,9 @@ InitialContext is created, without any environment parameters set.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -227,7 +243,7 @@ InitialContext is created, without any environment parameters set.</p>
                     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/documentation/extensions/mod_jodatime.html b/documentation/extensions/mod_jodatime.html
index 0127e7f..1463403 100644
--- a/documentation/extensions/mod_jodatime.html
+++ b/documentation/extensions/mod_jodatime.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: JodaTime</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: JodaTime</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -294,9 +310,9 @@ DateTime pit = configuration.get("pointInTime", DateTime.class)</code></pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -304,7 +320,7 @@ DateTime pit = configuration.get("pointInTime", DateTime.class)</code></pre>
                     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/documentation/extensions/mod_json.html b/documentation/extensions/mod_json.html
index cf85e54..5d28182 100644
--- a/documentation/extensions/mod_json.html
+++ b/documentation/extensions/mod_json.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Builder</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Builder</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -230,9 +246,9 @@ registers the <em>json</em> format automatically using the <code>ServiceContext<
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -240,7 +256,7 @@ registers the <em>json</em> format automatically using the <code>ServiceContext<
                     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/documentation/extensions/mod_management.html b/documentation/extensions/mod_management.html
index 3bfc3a4..854a4bc 100644
--- a/documentation/extensions/mod_management.html
+++ b/documentation/extensions/mod_management.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: JMX Management Access</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: JMX Management Access</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -276,9 +292,9 @@ The instance of ManagedConfigMBean to be created and registered is evaluated by
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -286,7 +302,7 @@ The instance of ManagedConfigMBean to be created and registered is evaluated by
                     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/documentation/extensions/mod_metamodel.html b/documentation/extensions/mod_metamodel.html
index c85a816..8b4251a 100644
--- a/documentation/extensions/mod_metamodel.html
+++ b/documentation/extensions/mod_metamodel.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Metamodel (Configuration of Tamaya)</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Metamodel (Configuration of Tamaya)</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -873,9 +889,9 @@ never change later.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -883,7 +899,7 @@ never change later.</p>
                     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/documentation/extensions/mod_microprofile.html b/documentation/extensions/mod_microprofile.html
index fe43034..6294223 100644
--- a/documentation/extensions/mod_microprofile.html
+++ b/documentation/extensions/mod_microprofile.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Microprofile Implementation</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Microprofile Implementation</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -247,9 +263,9 @@ public class InjectedConfigUsageSample {
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -257,7 +273,7 @@ public class InjectedConfigUsageSample {
                     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/documentation/extensions/mod_mutable_config.html b/documentation/extensions/mod_mutable_config.html
index a7ec8de..985003b 100644
--- a/documentation/extensions/mod_mutable_config.html
+++ b/documentation/extensions/mod_mutable_config.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Mutable Configuration</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Mutable Configuration</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -416,9 +432,9 @@ singleton accessor:</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -426,7 +442,7 @@ singleton accessor:</p>
                     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/documentation/extensions/mod_optional.html b/documentation/extensions/mod_optional.html
index e9796d7..a61b040 100644
--- a/documentation/extensions/mod_optional.html
+++ b/documentation/extensions/mod_optional.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Optional Tamaya Configuration</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Optional Tamaya Configuration</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -206,9 +222,9 @@ Additionally an EvaluationPolicy lets you define the precedence of configured va
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -216,7 +232,7 @@ Additionally an EvaluationPolicy lets you define the precedence of configured va
                     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/documentation/extensions/mod_osgi.html b/documentation/extensions/mod_osgi.html
index 3f36020..7c0d89e 100644
--- a/documentation/extensions/mod_osgi.html
+++ b/documentation/extensions/mod_osgi.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extensions: OSGI Integration</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extensions: OSGI Integration</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -1166,9 +1182,9 @@ a detailed command description.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -1176,7 +1192,7 @@ a detailed command description.</p>
                     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/documentation/extensions/mod_remote.html b/documentation/extensions/mod_remote.html
index fc5bd2b..90c771b 100644
--- a/documentation/extensions/mod_remote.html
+++ b/documentation/extensions/mod_remote.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Remote Configuration</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Remote Configuration</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -257,9 +273,9 @@ first accessible URL determines the configuration read.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -267,7 +283,7 @@ first accessible URL determines the configuration read.</p>
                     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/documentation/extensions/mod_resolver.html b/documentation/extensions/mod_resolver.html
index c50420b..cc9a998 100644
--- a/documentation/extensions/mod_resolver.html
+++ b/documentation/extensions/mod_resolver.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Resolver</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Resolver</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="Resolver">Tamaya Resolver (Extension Module)</h2>
@@ -310,9 +326,9 @@ the default implementation in place.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -320,7 +336,7 @@ the default implementation in place.</p>
                     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/documentation/extensions/mod_resources.html b/documentation/extensions/mod_resources.html
index 47d4192..600aa6e 100644
--- a/documentation/extensions/mod_resources.html
+++ b/documentation/extensions/mod_resources.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Resources</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Resources</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="Resources">Tamaya Resources (Extension Module)</h2>
@@ -322,9 +338,9 @@ alternate implementation with an overriding @Priority annotation added using the
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -332,7 +348,7 @@ alternate implementation with an overriding @Priority annotation added using the
                     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/documentation/extensions/mod_server.html b/documentation/extensions/mod_server.html
index 5278da6..9c8864d 100644
--- a/documentation/extensions/mod_server.html
+++ b/documentation/extensions/mod_server.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Configuration Server</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Configuration Server</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -404,9 +420,9 @@ Configuration:
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -414,7 +430,7 @@ Configuration:
                     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/documentation/extensions/mod_spring.html b/documentation/extensions/mod_spring.html
index 968ce30..4509787 100644
--- a/documentation/extensions/mod_spring.html
+++ b/documentation/extensions/mod_spring.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Spring Integration</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Spring Integration</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -361,9 +377,9 @@ For a full description of Tamaya&#8217;s injection API please
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -371,7 +387,7 @@ For a full description of Tamaya&#8217;s injection API please
                     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/documentation/extensions/mod_usagetracker.html b/documentation/extensions/mod_usagetracker.html
index fa9315e..b8864bb 100644
--- a/documentation/extensions/mod_usagetracker.html
+++ b/documentation/extensions/mod_usagetracker.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Usage Tracking</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Usage Tracking</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -344,9 +360,9 @@ logic can be adapted or replaced.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -354,7 +370,7 @@ logic can be adapted or replaced.</p>
                     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/documentation/extensions/mod_validation.html b/documentation/extensions/mod_validation.html
index ea324aa..527e098 100644
--- a/documentation/extensions/mod_validation.html
+++ b/documentation/extensions/mod_validation.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Configuration Validation</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Configuration Validation</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -276,9 +292,9 @@ a WARNING message.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -286,7 +302,7 @@ a WARNING message.</p>
                     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/documentation/extensions/mod_vertx.html b/documentation/extensions/mod_vertx.html
index 50df0eb..30a2be4 100644
--- a/documentation/extensions/mod_vertx.html
+++ b/documentation/extensions/mod_vertx.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Integration for Vertx</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration for Vertx</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -360,9 +376,9 @@ private String valBusTarget;</code></pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -370,7 +386,7 @@ private String valBusTarget;</code></pre>
                     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/documentation/extensions/mod_yaml.html b/documentation/extensions/mod_yaml.html
index a20b91a..0064aca 100644
--- a/documentation/extensions/mod_yaml.html
+++ b/documentation/extensions/mod_yaml.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya - Extension: Builder</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Builder</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -265,9 +281,9 @@ comments -&gt; Late afternoon is best. Backup contact is Nancy Billsmer @ 338-43
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -275,7 +291,7 @@ comments -&gt; Late afternoon is best. Backup contact is Nancy Billsmer @ 338-43
                     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/documentation/quickstart.html b/documentation/quickstart.html
index c2d43d9..e05ebe4 100644
--- a/documentation/quickstart.html
+++ b/documentation/quickstart.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_quickstart">Apache Tamaya: Quickstart</h2>
@@ -439,9 +455,9 @@ MyTypeTemplate type = ConfigurationInjector.getInstance().createTemplate(MyTypeT
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -449,7 +465,7 @@ MyTypeTemplate type = ConfigurationInjector.getInstance().createTemplate(MyTypeT
                     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/documentation/spisupport.html b/documentation/spisupport.html
index 78a664c..9084b0f 100644
--- a/documentation/spisupport.html
+++ b/documentation/spisupport.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya: SPI Support Module</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya: SPI Support Module</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -235,9 +251,9 @@ of the Tamaya API as well.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -245,7 +261,7 @@ of the Tamaya API as well.</p>
                     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/documentation/usecases.html b/documentation/usecases.html
index 9adb2c7..e2d59a1 100644
--- a/documentation/usecases.html
+++ b/documentation/usecases.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Why should you rely on Tamaya?</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="../css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="../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>
@@ -128,7 +144,7 @@
 				<h1>Why should you rely on Tamaya?</h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -1086,9 +1102,9 @@ on Configuration.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -1096,7 +1112,7 @@ on Configuration.</p>
                     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/download.html b/download.html
index 629a305..60d3605 100644
--- a/download.html
+++ b/download.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya: Download</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya: Download</h1>
 			</div>
 
-			<p><em>2019-05-16</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -244,9 +260,9 @@ $ gpg --verify tamaya-project-1.2.0-source-release.zip.asc</code></pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -254,7 +270,7 @@ $ gpg --verify tamaya-project-1.2.0-source-release.zip.asc</code></pre>
                     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/examples.html b/examples.html
index d419a60..879be63 100644
--- a/examples.html
+++ b/examples.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya: Examples</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya: Examples</h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -210,9 +226,9 @@ adapted.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -220,7 +236,7 @@ adapted.</p>
                     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/features.html b/features.html
index a25de27..572d898 100644
--- a/features.html
+++ b/features.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya&#39;s Features</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1>Tamaya&#39;s Features</h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -278,9 +294,9 @@ So let&#8217;s have a quick look at some of the most commonly used features&#823
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -288,7 +304,7 @@ So let&#8217;s have a quick look at some of the most commonly used features&#823
                     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/feed.xml b/feed.xml
index e7d4a75..45c4d1a 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
     <atom:link href="https://tamaya.incubator.apache.org/feed.xml" rel="self" type="application/rss+xml" />
     <description>Apache Tamaya RSS feed template</description>
     <language>en-gb</language>
-    <pubDate>Thu, 16 May 2019 17:50:04 +0200</pubDate>
-    <lastBuildDate>Thu, 16 May 2019 17:50:04 +0200</lastBuildDate>
+    <pubDate>Tue, 4 Jun 2019 21:10:22 +0200</pubDate>
+    <lastBuildDate>Tue, 4 Jun 2019 21:10:22 +0200</lastBuildDate>
 
     <item>
       <title>Tamaya 0.3-incubating release announcement</title>
@@ -164,21 +164,6 @@ or in your pom.xml from Maven central:&amp;lt;/p&amp;gt;
 &amp;lt;/ul&amp;gt;
 &amp;lt;/div&amp;gt;</description>
     </item><item>
-      <title>Java2Days (Sofia, Bulgaria) - Configuration for Java EE / Config JSR</title>
-      <link>https://tamaya.incubator.apache.org/blog/2016/java2days-sofia.html</link>
-      <pubDate>Wed, 16 Nov 2016 00:00:00 +0100</pubDate>
-      <guid isPermaLink="false">blog/2016/java2days-sofia.html</guid>
-      <description>&amp;lt;div class=&amp;quot;paragraph&amp;quot;&amp;gt;
-&amp;lt;p&amp;gt;Werner and Dmitry (Oracle) presented the concepts and ideas of Tamaya at the conference in Bulgaria:&amp;lt;/p&amp;gt;
-&amp;lt;/div&amp;gt;
-&amp;lt;div class=&amp;quot;ulist&amp;quot;&amp;gt;
-&amp;lt;ul&amp;gt;
-&amp;lt;li&amp;gt;
-&amp;lt;p&amp;gt;&amp;lt;a href=&amp;quot;http://www.slideshare.net/DmitryKornilov/configuration-for-java-ee-config-jsr-and-tamaya&amp;quot;&amp;gt;Slides&amp;lt;/a&amp;gt;&amp;lt;/p&amp;gt;
-&amp;lt;/li&amp;gt;
-&amp;lt;/ul&amp;gt;
-&amp;lt;/div&amp;gt;</description>
-    </item><item>
       <title>ApacheCon Europe 2016 - Seville, Spain: Configure Once, run everyhere! Configuration with Apache Tamaya</title>
       <link>https://tamaya.incubator.apache.org/blog/2016/apachecon-seville.html</link>
       <pubDate>Wed, 16 Nov 2016 00:00:00 +0100</pubDate>
@@ -200,6 +185,21 @@ or in your pom.xml from Maven central:&amp;lt;/p&amp;gt;
 &amp;lt;/ul&amp;gt;
 &amp;lt;/div&amp;gt;</description>
     </item><item>
+      <title>Java2Days (Sofia, Bulgaria) - Configuration for Java EE / Config JSR</title>
+      <link>https://tamaya.incubator.apache.org/blog/2016/java2days-sofia.html</link>
+      <pubDate>Wed, 16 Nov 2016 00:00:00 +0100</pubDate>
+      <guid isPermaLink="false">blog/2016/java2days-sofia.html</guid>
+      <description>&amp;lt;div class=&amp;quot;paragraph&amp;quot;&amp;gt;
+&amp;lt;p&amp;gt;Werner and Dmitry (Oracle) presented the concepts and ideas of Tamaya at the conference in Bulgaria:&amp;lt;/p&amp;gt;
+&amp;lt;/div&amp;gt;
+&amp;lt;div class=&amp;quot;ulist&amp;quot;&amp;gt;
+&amp;lt;ul&amp;gt;
+&amp;lt;li&amp;gt;
+&amp;lt;p&amp;gt;&amp;lt;a href=&amp;quot;http://www.slideshare.net/DmitryKornilov/configuration-for-java-ee-config-jsr-and-tamaya&amp;quot;&amp;gt;Slides&amp;lt;/a&amp;gt;&amp;lt;/p&amp;gt;
+&amp;lt;/li&amp;gt;
+&amp;lt;/ul&amp;gt;
+&amp;lt;/div&amp;gt;</description>
+    </item><item>
       <title>JavaOne 2016 - Configure once and run everywhere</title>
       <link>https://tamaya.incubator.apache.org/blog/2016/javaone.html</link>
       <pubDate>Tue, 27 Sep 2016 00:00:00 +0200</pubDate>
diff --git a/highleveldesign.html b/highleveldesign.html
index a782bb4..5c56f9b 100644
--- a/highleveldesign.html
+++ b/highleveldesign.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="_the_tamaya_high_level_design">The Tamaya High Level Design</h2>
@@ -404,9 +420,9 @@ and of its current available <a href="documentation/extensions.html">modules</a>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -414,7 +430,7 @@ and of its current available <a href="documentation/extensions.html">modules</a>
                     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/history.html b/history.html
index b6752c6..7851b55 100644
--- a/history.html
+++ b/history.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-05-06</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_release_history">Apache Tamaya: Release History</h2>
@@ -181,9 +197,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -191,7 +207,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/index.html b/index.html
index fda7b3e..2e385f1 100644
--- a/index.html
+++ b/index.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya Incubator</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -186,9 +202,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -196,7 +212,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/release-guide.html b/release-guide.html
index ab5d0f2..4978225 100644
--- a/release-guide.html
+++ b/release-guide.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Apache Tamaya Release Guide</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1>Apache Tamaya Release Guide</h1>
 			</div>
 
-			<p><em>2019-05-06</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -1117,9 +1133,9 @@ for the new version and the announcement of the new version.</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -1127,7 +1143,7 @@ for the new version and the announcement of the new version.</p>
                     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/sitemap.xml b/sitemap.xml
index dc12146..5922d95 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,158 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
     <url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_features.html</loc>
-        <lastmod>2019-05-16</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_json.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/release-guide.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resolver.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/start.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_camel.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/history.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_filter.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_usagetracker.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_management.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/download.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resources.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_validation.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/quickstart.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_cdi.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/examples.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_formats.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_vertx.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_metamodel.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/spisupport.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_server.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/features.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/spisupport.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_spring.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_classloader_support.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_yaml.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_functions.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/usecases.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_microprofile.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/highleveldesign.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_spring.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/core.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_collections.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_features.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_hazelcast.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_json.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_mutable_config.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_usagetracker.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resolver.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/download.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions.html</loc>
+        <lastmod>2019-06-04</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_camel.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_consul.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_filter.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_injection.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_management.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_optional.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_validation.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resources.html</loc>
+        <lastmod>2019-06-04</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_cdi.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_etcd.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_formats.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jndi.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_osgi.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_metamodel.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_vertx.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_osgi.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_events.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_server.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jodatime.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/api.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_remote.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_classloader_support.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_yaml.html</loc>
-        <lastmod>2019-05-16</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_events.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/history.html</loc>
-        <lastmod>2019-05-06</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_functions.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/release-guide.html</loc>
-        <lastmod>2019-05-06</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jodatime.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/community.html</loc>
-        <lastmod>2019-05-06</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_microprofile.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/source.html</loc>
-        <lastmod>2019-05-06</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_remote.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/devguide.html</loc>
-        <lastmod>2019-05-06</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/about.html</loc>
-        <lastmod>2019-02-25</lastmod>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/core.html</loc>
-        <lastmod>2019-02-25</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions.html</loc>
-        <lastmod>2019-02-25</lastmod>
+        <loc>https://tamaya.incubator.apache.org/development/team.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/apidocs/index.html</loc>
-        <lastmod>2019-02-25</lastmod>
+        <loc>https://tamaya.incubator.apache.org/development/source.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/start.html</loc>
-        <lastmod>2019-02-25</lastmod>
+        <loc>https://tamaya.incubator.apache.org/development/community.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/development/possible-contributions.html</loc>
-        <lastmod>2019-02-25</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/usecases.html</loc>
-        <lastmod>2019-02-25</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/team.html</loc>
-        <lastmod>2019-02-25</lastmod>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/examples.html</loc>
-        <lastmod>2019-02-25</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/features.html</loc>
-        <lastmod>2019-02-25</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/api.html</loc>
-        <lastmod>2019-02-25</lastmod>
+        <loc>https://tamaya.incubator.apache.org/about.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/highleveldesign.html</loc>
-        <lastmod>2019-02-25</lastmod>
+        <loc>https://tamaya.incubator.apache.org/apidocs/index.html</loc>
+        <lastmod>2019-06-04</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/blog/2018/02/release-03-announcement.html</loc>
         <lastmod>2018-02-08</lastmod>
@@ -169,10 +169,10 @@
         <loc>https://tamaya.incubator.apache.org/blog/2016/dirk-weil-javaeeblog.html</loc>
         <lastmod>2016-12-01</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/blog/2016/java2days-sofia.html</loc>
+        <loc>https://tamaya.incubator.apache.org/blog/2016/apachecon-seville.html</loc>
         <lastmod>2016-11-16</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/blog/2016/apachecon-seville.html</loc>
+        <loc>https://tamaya.incubator.apache.org/blog/2016/java2days-sofia.html</loc>
         <lastmod>2016-11-16</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/blog/2016/javaone.html</loc>
diff --git a/start.html b/start.html
index 2a2b877..d6f52ff 100644
--- a/start.html
+++ b/start.html
@@ -5,10 +5,10 @@
 	    <meta charset="utf-8"/>
 	    <title>Tamaya in 5 minutes - a short introduction</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" content="JBake ${content.version}"/>
 
 	    <!-- Le styles -->
 	    <link href="css/bootstrap.min.css" rel="stylesheet"/>
@@ -97,6 +97,22 @@
 								<li><a href="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>
@@ -128,7 +144,7 @@
 				<h1>Tamaya in 5 minutes - a short introduction</h1>
 			</div>
 
-			<p><em>2019-02-25</em></p>
+			<p><em>2019-06-04</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -240,9 +256,9 @@ or in a clustered Docker environment in production, it stays the same!</p>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
-							at <span>2019-05-16</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</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>v2.6.4</span></a>
+							at <span>2019-06-04</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
@@ -250,7 +266,7 @@ or in a clustered Docker environment in production, it stays the same!</p>
                     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