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/11/16 23:27:21 UTC

[incubator-tamaya-site] branch asf-site updated: TAMAYA-412: Publish homepage / API is missing

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 4e10f9e  TAMAYA-412: Publish homepage / API is missing
4e10f9e is described below

commit 4e10f9e57ebfcf2f6eb50ed39c700ac78b837e2a
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Sun Nov 17 00:27:14 2019 +0100

    TAMAYA-412: Publish homepage / API is missing
---
 about.html                                         |  10 +-
 apidocs/index.html                                 |  12 +-
 archive.html                                       |  10 +-
 blog/2014/no-jsr-in-javaee8.html                   |   6 +-
 blog/2014/whatistamaya.html                        |   6 +-
 blog/2015/dzone-article.html                       |   6 +-
 blog/2015/introduction.html                        |   6 +-
 blog/2015/javaland.html                            |   6 +-
 blog/2015/new-configuration-api.html               |   6 +-
 blog/2016/apachecon-seville.html                   |   6 +-
 blog/2016/apachecon-vancouver.html                 |   6 +-
 blog/2016/bedcon.html                              |   6 +-
 blog/2016/dirk-weil-javaeeblog.html                |   6 +-
 blog/2016/infoq-article.html                       |   6 +-
 blog/2016/java2days-sofia.html                     |   6 +-
 blog/2016/javaland.html                            |   6 +-
 blog/2016/javaone.html                             |   6 +-
 blog/2016/jug-basel.html                           |   6 +-
 blog/2016/jug-stgallen.html                        |   6 +-
 blog/2016/tamaya-book.html                         |   6 +-
 blog/2016/voxxed-days-zurich.html                  |   6 +-
 blog/2017/03/javaland.html                         |   6 +-
 blog/2017/06/release-03.html                       |   6 +-
 blog/2017/09/new-api-links.html                    |   6 +-
 blog/2018/02/release-03-announcement.html          |   6 +-
 development/community.html                         |   8 +-
 development/possible-contributions.html            |  12 +-
 development/source.html                            |   8 +-
 development/team.html                              |   8 +-
 devguide.html                                      |   8 +-
 documentation/api.html                             |  16 +-
 documentation/core.html                            |  10 +-
 documentation/extensions.html                      |  40 +++-
 documentation/extensions/mod_camel.html            |  10 +-
 documentation/extensions/mod_cdi.html              |  16 +-
 .../extensions/mod_classloader_support.html        |  10 +-
 documentation/extensions/mod_collections.html      |  10 +-
 documentation/extensions/mod_consul.html           |  10 +-
 documentation/extensions/mod_etcd.html             |  10 +-
 documentation/extensions/mod_events.html           |  10 +-
 documentation/extensions/mod_features.html         |  12 +-
 documentation/extensions/mod_filter.html           |  10 +-
 documentation/extensions/mod_formats.html          |  10 +-
 documentation/extensions/mod_functions.html        |  10 +-
 documentation/extensions/mod_hazelcast.html        |  10 +-
 .../extensions/{mod_json.html => mod_hjson.html}   |  57 +++---
 .../extensions/{mod_json.html => mod_hocon.html}   |  61 +++---
 documentation/extensions/mod_injection.html        |  14 +-
 documentation/extensions/mod_jndi.html             |  10 +-
 documentation/extensions/mod_jodatime.html         |  10 +-
 documentation/extensions/mod_json.html             |  26 +--
 documentation/extensions/mod_management.html       |  10 +-
 documentation/extensions/mod_metamodel.html        |  10 +-
 documentation/extensions/mod_microprofile.html     |  10 +-
 documentation/extensions/mod_mutable_config.html   |  10 +-
 documentation/extensions/mod_optional.html         |  10 +-
 documentation/extensions/mod_osgi.html             | 206 ++++++++++----------
 documentation/extensions/mod_remote.html           |  10 +-
 documentation/extensions/mod_resolver.html         |  10 +-
 documentation/extensions/mod_resources.html        |  10 +-
 documentation/extensions/mod_server.html           |  10 +-
 documentation/extensions/mod_spring.html           | 115 ++++--------
 documentation/extensions/mod_usagetracker.html     |  12 +-
 documentation/extensions/mod_validation.html       |  10 +-
 documentation/extensions/mod_vertx.html            |  10 +-
 documentation/extensions/mod_yaml.html             |  10 +-
 documentation/quickstart.html                      |  16 +-
 documentation/spisupport.html                      |  10 +-
 documentation/usecases.html                        |  10 +-
 download.html                                      |  14 +-
 examples.html                                      |   8 +-
 features.html                                      |   8 +-
 feed.xml                                           |  34 ++--
 highleveldesign.html                               |  12 +-
 history.html                                       |  14 +-
 index.html                                         |   6 +-
 release-guide.html                                 |  35 +++-
 sitemap.xml                                        | 207 +++++++++++----------
 start.html                                         |  10 +-
 examples.html => tamayaasastandard.html            | 113 ++++++-----
 80 files changed, 780 insertions(+), 750 deletions(-)

diff --git a/about.html b/about.html
index 36609af..a832361 100644
--- a/about.html
+++ b/about.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>About Tamaya</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -202,7 +202,7 @@ or in a clustered Docker environment in production, it stays the same!</p>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Add <code>org.apache.tamaya:tamaya-core:0.4-incubating-SNAPSHOT</code> to your dependencies.</p>
+<p>Add <code>org.apache.tamaya:tamaya-core:0.5-incubating-SNAPSHOT</code> to your dependencies.</p>
 </li>
 <li>
 <p>Add some config to <code>META-INF/javaconfiguration.properties</code></p>
@@ -234,7 +234,7 @@ or in a clustered Docker environment in production, it stays the same!</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/apidocs/index.html b/apidocs/index.html
index cd457fc..8a3246c 100644
--- a/apidocs/index.html
+++ b/apidocs/index.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>API overview</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="paragraph">
 <p>At the moment you can see multiple API versions:</p>
@@ -152,10 +152,10 @@
 <div class="ulist">
 <ul>
 <li>
-<p>stable version (latest official release): <a href="./stable/index.html">0.3-incubating</a></p>
+<p>stable version (latest official release): <a href="./stable/index.html">0.4-incubating</a></p>
 </li>
 <li>
-<p>development version (upcoming release): <a href="./development/index.html">0.4-incubating-SNAPSHOT</a></p>
+<p>development version (upcoming release): <a href="./development/index.html">0.5-incubating-SNAPSHOT</a></p>
 </li>
 </ul>
 </div></p>
@@ -170,7 +170,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/archive.html b/archive.html
index 926f4ab..47af17c 100644
--- a/archive.html
+++ b/archive.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -181,14 +181,14 @@
 			
 			    <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>
 				
 			
 
 			
 			    <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>
 				
 			
 
@@ -307,7 +307,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2014/no-jsr-in-javaee8.html b/blog/2014/no-jsr-in-javaee8.html
index 4251cfa..67a256d 100644
--- a/blog/2014/no-jsr-in-javaee8.html
+++ b/blog/2014/no-jsr-in-javaee8.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -170,7 +170,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2014/whatistamaya.html b/blog/2014/whatistamaya.html
index b9815dc..eeb0b89 100644
--- a/blog/2014/whatistamaya.html
+++ b/blog/2014/whatistamaya.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2015/dzone-article.html b/blog/2015/dzone-article.html
index c0f81d6..2ed131d 100644
--- a/blog/2015/dzone-article.html
+++ b/blog/2015/dzone-article.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2015/introduction.html b/blog/2015/introduction.html
index 5988620..6f70c22 100644
--- a/blog/2015/introduction.html
+++ b/blog/2015/introduction.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2015/javaland.html b/blog/2015/javaland.html
index e6e6524..6c25b80 100644
--- a/blog/2015/javaland.html
+++ b/blog/2015/javaland.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -173,7 +173,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2015/new-configuration-api.html b/blog/2015/new-configuration-api.html
index 1a85183..600b3a6 100644
--- a/blog/2015/new-configuration-api.html
+++ b/blog/2015/new-configuration-api.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/apachecon-seville.html b/blog/2016/apachecon-seville.html
index df9e270..bd8c653 100644
--- a/blog/2016/apachecon-seville.html
+++ b/blog/2016/apachecon-seville.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -173,7 +173,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/apachecon-vancouver.html b/blog/2016/apachecon-vancouver.html
index 0212945..aa32cf8 100644
--- a/blog/2016/apachecon-vancouver.html
+++ b/blog/2016/apachecon-vancouver.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -170,7 +170,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/bedcon.html b/blog/2016/bedcon.html
index 5ffd2ba..c37311c 100644
--- a/blog/2016/bedcon.html
+++ b/blog/2016/bedcon.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -170,7 +170,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/dirk-weil-javaeeblog.html b/blog/2016/dirk-weil-javaeeblog.html
index b0ca8ec..f33bf09 100644
--- a/blog/2016/dirk-weil-javaeeblog.html
+++ b/blog/2016/dirk-weil-javaeeblog.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/infoq-article.html b/blog/2016/infoq-article.html
index 471ee0c..23c5cc4 100644
--- a/blog/2016/infoq-article.html
+++ b/blog/2016/infoq-article.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/java2days-sofia.html b/blog/2016/java2days-sofia.html
index 190d4aa..ecc5df0 100644
--- a/blog/2016/java2days-sofia.html
+++ b/blog/2016/java2days-sofia.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/javaland.html b/blog/2016/javaland.html
index 125bd76..9375209 100644
--- a/blog/2016/javaland.html
+++ b/blog/2016/javaland.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -179,7 +179,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/javaone.html b/blog/2016/javaone.html
index 2f83154..eb4d09a 100644
--- a/blog/2016/javaone.html
+++ b/blog/2016/javaone.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -173,7 +173,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/jug-basel.html b/blog/2016/jug-basel.html
index 4fb7dc0..a362dfc 100644
--- a/blog/2016/jug-basel.html
+++ b/blog/2016/jug-basel.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/jug-stgallen.html b/blog/2016/jug-stgallen.html
index c6ec168..f2bfcac 100644
--- a/blog/2016/jug-stgallen.html
+++ b/blog/2016/jug-stgallen.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/tamaya-book.html b/blog/2016/tamaya-book.html
index 8b97db6..35c56d9 100644
--- a/blog/2016/tamaya-book.html
+++ b/blog/2016/tamaya-book.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -173,7 +173,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2016/voxxed-days-zurich.html b/blog/2016/voxxed-days-zurich.html
index 28f7e6d..184e07e 100644
--- a/blog/2016/voxxed-days-zurich.html
+++ b/blog/2016/voxxed-days-zurich.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -167,7 +167,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2017/03/javaland.html b/blog/2017/03/javaland.html
index 886311d..585bc81 100644
--- a/blog/2017/03/javaland.html
+++ b/blog/2017/03/javaland.html
@@ -72,8 +72,8 @@
 								<li><a href="../../../documentation/core.html">Core</a></li>
 								<li><a href="../../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -173,7 +173,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2017/06/release-03.html b/blog/2017/06/release-03.html
index 5657d10..eedfbf8 100644
--- a/blog/2017/06/release-03.html
+++ b/blog/2017/06/release-03.html
@@ -72,8 +72,8 @@
 								<li><a href="../../../documentation/core.html">Core</a></li>
 								<li><a href="../../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -170,7 +170,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2017/09/new-api-links.html b/blog/2017/09/new-api-links.html
index 864854e..020b9cd 100644
--- a/blog/2017/09/new-api-links.html
+++ b/blog/2017/09/new-api-links.html
@@ -72,8 +72,8 @@
 								<li><a href="../../../documentation/core.html">Core</a></li>
 								<li><a href="../../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -171,7 +171,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/blog/2018/02/release-03-announcement.html b/blog/2018/02/release-03-announcement.html
index c9d0f0b..4bea657 100644
--- a/blog/2018/02/release-03-announcement.html
+++ b/blog/2018/02/release-03-announcement.html
@@ -72,8 +72,8 @@
 								<li><a href="../../../documentation/core.html">Core</a></li>
 								<li><a href="../../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -233,7 +233,7 @@ or in your pom.xml from Maven central:</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/development/community.html b/development/community.html
index a731738..38eca27 100644
--- a/development/community.html
+++ b/development/community.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya: Community</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="_users">Users</h2>
@@ -268,7 +268,7 @@ $ irssi
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/development/possible-contributions.html b/development/possible-contributions.html
index d6837b8..215c6ca 100644
--- a/development/possible-contributions.html
+++ b/development/possible-contributions.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><!-- toc disabled -->
 <h1 id="_apache_tamaya_possible_tasks" class="sect0">Apache Tamaya - Possible Tasks</h1>
@@ -162,7 +162,7 @@
 <p>{name} is the Apache standard for flexible and powerful configuration. Objective is to provide flavors for
 Java SE, ME as well as to ship with powerful features for Java EE and Cloud Solutions. All functions provided
 is build on top of a small but very powerful, flexible and extendible API. This API is implemented by a core implementation,
-which then can be extended or adapted for use in different runtime scenarios, such as SE, ME, EE, Spring, OSGI
+which then can be extended or adapted for use in different runtime scenarios, such as SE, ME, EE, Spring, OSGi
 and more. Similarly additional modules may be provided that help also existing solution to be plugged into
 {name}, so you can start right away using {name} without having to rebuild/change your existing application.</p>
 </div>
@@ -283,7 +283,7 @@ storing/retreiving/managing configuration:</p>
 <div class="sect2">
 <h3 id="_integration_with_jigsaw">3.4. Integration with Jigsaw</h3>
 <div class="paragraph">
-<p>Once Jigsaw is mature and in a usable (still early) stage, examples are to be created and tested, where OSGI is used as
+<p>Once Jigsaw is mature and in a usable (still early) stage, examples are to be created and tested, where OSGi is used as
 the basic runtime platform, e.g. Apache Felix, but as well others.</p>
 </div>
 </div>
@@ -492,7 +492,7 @@ as configured.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/development/source.html b/development/source.html
index e43661a..c88aa12 100644
--- a/development/source.html
+++ b/development/source.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya: Source code repositories</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -288,7 +288,7 @@ In case you want to contribute file an issue in our <a href="https://issues.apac
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/development/team.html b/development/team.html
index e0e7313..4cb3fbc 100644
--- a/development/team.html
+++ b/development/team.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya: Project Mailinglists</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -362,7 +362,7 @@ The table below lists all mailings used by the Tamaya project.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/devguide.html b/devguide.html
index d5dea04..e3584ff 100644
--- a/devguide.html
+++ b/devguide.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya: Development Guide</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="_suggested_git_workflows">1. Suggested Git Workflows</h2>
@@ -400,7 +400,7 @@ $ git branch -d TAMAYA-XXX</pre>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/api.html b/documentation/api.html
index 722c123..e2e273f 100644
--- a/documentation/api.html
+++ b/documentation/api.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="CoreDesign">Apache Tamaya: API</h2>
@@ -267,7 +267,7 @@ ConfigurationContextBuilder. This builder can be obtained calling Configuration.
 <li>
 <p>Finally ServiceContext and ServiceContextManager provide an abstraction to the underlying runtime environment,
 allowing different component loading and lifecycle strategies to be used. This is very useful since component (service)
-loading in Java SE, Java EE, OSGI and other runtime environments may be differ significantly. In most cases even
+loading in Java SE, Java EE, OSGi and other runtime environments may be differ significantly. In most cases even
 extension programmers will not have to deal with these internals.</p>
 </li>
 </ul>
@@ -1208,7 +1208,7 @@ API.</p>
 <div class="sectionbody">
 <div class="paragraph">
 <p>The ServiceContext allows to define how components are loaded in Tamaya. It is the glue layer, which interacts
-with the underlying runtime system such as Java SE, Java EE, OSGI, VertX etc.
+with the underlying runtime system such as Java SE, Java EE, OSGi, VertX etc.
 The ServiceContext hereby defines access methods to obtain components, whereas itself it is available from the
 ServiceContextManager singleton:</p>
 </div>
@@ -1262,7 +1262,7 @@ registered.</p>
 </li>
 <li>
 <p>Finally the methods <code>getResource(s)</code> allow to load resources from the classpath. This is especially useful
-when running in an OSGI context, where loading of resources from the classloaders will fail.</p>
+when running in an OSGi context, where loading of resources from the classloaders will fail.</p>
 </li>
 </ol>
 </div>
@@ -1390,7 +1390,7 @@ further details.</p>
 <p>the Spring Configuration Mechanism</p>
 </li>
 <li>
-<p>integration with the OSGI <code>ConfigAdmin</code> API.</p>
+<p>integration with the OSGi <code>ConfigAdmin</code> API.</p>
 </li>
 <li>
 <p>the Apache Camel Configuration SPI</p>
@@ -1410,7 +1410,7 @@ further details.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/core.html b/documentation/core.html
index 19444e3..62f51b6 100644
--- a/documentation/core.html
+++ b/documentation/core.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="Core">Apache Tamaya: Core Implementation</h2>
@@ -162,7 +162,7 @@ and building blocks for supporting SPI implementations.</p>
 <ul>
 <li>
 <p>A service loader implementation, configurations and further logic required to run
-in an OSGI environment.</p>
+in an OSGi environment.</p>
 </li>
 <li>
 <p>Numerous <strong>converters</strong>, including an EnumConverter, that is a converter implementation that can automatically select
@@ -705,7 +705,7 @@ Loading extensions hereby is trivial: you only are required to add the correspon
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions.html b/documentation/extensions.html
index 5ac5078..c6e208b 100644
--- a/documentation/extensions.html
+++ b/documentation/extensions.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_extension_modules">Apache Tamaya: Extension Modules</h2>
@@ -215,6 +215,16 @@
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_hazelcast.html">Documentation</a></p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-hocon</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides format support for HOCON based configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_hocon.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-hjson</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides format support for HJSON based configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_hjson.html">Documentation</a></p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-injection-api</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Provides Tamaya&#8217;s injection annotations API.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_injection.html">Documentation</a></p></td>
@@ -256,7 +266,7 @@
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-osgi</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Integration with OSGI containers.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Integration with OSGi containers.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_osgi.html">Documentation</a></p></td>
 </tr>
 <tr>
@@ -299,7 +309,7 @@ us getting them stable and well tested!</p>
 <tr>
 <th class="tableblock halign-left valign-top"><em>Artifact</em></th>
 <th class="tableblock halign-left valign-top"><em>Description</em></th>
-<th class="tableblock halign-left valign-top"><em>Links</em></th>
+<th class="tableblock halign-left valign-top"><em>Links (if available)</em></th>
 </tr>
 </thead>
 <tbody>
@@ -309,14 +319,14 @@ us getting them stable and well tested!</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_camel.html">Documentation</a></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-commons_beta</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-commons-config_beta</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Integration Support for Apache Commons.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">-</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-configured-sysprops_beta</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Tamaya configuration to be provided as System.getProperties().</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_sysprops.html">Documentation</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-doc_alpha</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides support for generating Configuration Documentation.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">-</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-jodatime_beta</p></td>
@@ -324,6 +334,11 @@ us getting them stable and well tested!</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_jodatime.html">Documentation</a></p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-jsr382</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Implementation of the current JSR 382 API.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">- (Checkout the JSR&#8217;s documentation)</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-management_alpha</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Provides JMX support for inspecting configuration.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_management.html">Documentation</a></p></td>
@@ -334,6 +349,11 @@ us getting them stable and well tested!</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_metamodel-staged.html">Documentation</a></p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-propertysources</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides different property source base classes.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">-</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-remote_alpha</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Remote configuration support using the server API.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_remote.html">Documentation</a></p></td>
@@ -384,7 +404,7 @@ us getting them stable and well tested!</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_camel.html b/documentation/extensions/mod_camel.html
index c7104d3..fd61ebc 100644
--- a/documentation/extensions/mod_camel.html
+++ b/documentation/extensions/mod_camel.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with Apache Camel</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -180,7 +180,7 @@ configuration with Apache Camel.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-camel_beta&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -305,7 +305,7 @@ again use Tamaya as the main configuration solutions only using Camel&#8217;s de
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_cdi.html b/documentation/extensions/mod_cdi.html
index bf6c1ca..94edb69 100644
--- a/documentation/extensions/mod_cdi.html
+++ b/documentation/extensions/mod_cdi.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: CDI Support</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -186,7 +186,7 @@ beans managed by the CDI systems.</p>
 </li>
 <li>
 <p>tamaya-injection-standalone implements injection by integrating the tamaya-injection SE based injection module (also used
-for Spring and OSGI injection) with CDI. Injection hereby is performed by the Tamaya SE module, whereas
+for Spring and OSGi injection) with CDI. Injection hereby is performed by the Tamaya SE module, whereas
 beans and injection control overall are still managed by CDI.</p>
 </li>
 <li>
@@ -205,7 +205,7 @@ components will be compatible regardless if deployed in a pure SE or as Java EE
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-injection-api&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -228,7 +228,7 @@ you never have installed both CDI extensions at the same time because this may b
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-cdi&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -242,7 +242,7 @@ CDI injection features.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-injection-standalone&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -464,7 +464,7 @@ default section parts.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_classloader_support.html b/documentation/extensions/mod_classloader_support.html
index 07f61aa..42ae363 100644
--- a/documentation/extensions/mod_classloader_support.html
+++ b/documentation/extensions/mod_classloader_support.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Classloader Isolation Support</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -193,7 +193,7 @@ of classloaders, hereby preventing multiple loading of components within a class
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-classloader-support&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -287,7 +287,7 @@ hierarchies:</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_collections.html b/documentation/extensions/mod_collections.html
index db7cfba..7faf071 100644
--- a/documentation/extensions/mod_collections.html
+++ b/documentation/extensions/mod_collections.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Collection Support</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -181,7 +181,7 @@ Collections extension adds this functionality to the Tamaya eco-system.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-collections&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -603,7 +603,7 @@ server.2=server3, localhost:8003
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_consul.html b/documentation/extensions/mod_consul.html
index 0e056c2..a4a09a1 100644
--- a/documentation/extensions/mod_consul.html
+++ b/documentation/extensions/mod_consul.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with Consul (Hashicorp)</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -183,7 +183,7 @@ defined by the <a href="mod_mutable_config.html">tamaya-mutable-config</a> exten
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-consul&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -262,7 +262,7 @@ property source is exactly configured, so you have full control.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_etcd.html b/documentation/extensions/mod_etcd.html
index 3824029..0c6036f 100644
--- a/documentation/extensions/mod_etcd.html
+++ b/documentation/extensions/mod_etcd.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with etcd (Core OS)</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -183,7 +183,7 @@ your module:</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-etcd&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -256,7 +256,7 @@ etcd property source.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_events.html b/documentation/extensions/mod_events.html
index 4771b30..6117d86 100644
--- a/documentation/extensions/mod_events.html
+++ b/documentation/extensions/mod_events.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Events</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -190,7 +190,7 @@ change events.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-events&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -548,7 +548,7 @@ active (by default using the Java ServiceLoader mechanism).</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_features.html b/documentation/extensions/mod_features.html
index fda600b..36c8f99 100644
--- a/documentation/extensions/mod_features.html
+++ b/documentation/extensions/mod_features.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Features Check</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -181,7 +181,7 @@ your module:</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-features&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -268,7 +268,7 @@ to check, which Tamaya extensions are currently loaded.</p>
 <p>extSpringCoreAvailable(); checks if Spring Core is on the classpath.</p>
 </li>
 <li>
-<p>extOSGIAvailable(); checks the OSGI framework is on the classpath.</p>
+<p>extOSGIAvailable(); checks the OSGi framework is on the classpath.</p>
 </li>
 <li>
 <p>Finally checkClassIsLoaded(String) tries to load a class. If it fails, <code>false</code> is returned.</p>
@@ -289,7 +289,7 @@ to check, which Tamaya extensions are currently loaded.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_filter.html b/documentation/extensions/mod_filter.html
index eea35bb..c25f935 100644
--- a/documentation/extensions/mod_filter.html
+++ b/documentation/extensions/mod_filter.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: User Filtering</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -183,7 +183,7 @@ explicitily no filtering is applied and everything is visible.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-filter&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -297,7 +297,7 @@ managed filters:</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_formats.html b/documentation/extensions/mod_formats.html
index 642291d..b787adf 100644
--- a/documentation/extensions/mod_formats.html
+++ b/documentation/extensions/mod_formats.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Formats</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -192,7 +192,7 @@ frameworks that provide logic for reading configuration files, such as Apache co
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-formats&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -536,7 +536,7 @@ functionality provided with java.util.Properties:</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_functions.html b/documentation/extensions/mod_functions.html
index 55ea5a5..165079b 100644
--- a/documentation/extensions/mod_functions.html
+++ b/documentation/extensions/mod_functions.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Functions</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -192,7 +192,7 @@ So given the entries a.b.entry1, a.b.entry2, a.a.entry3, a.b.c.entry4 the reult
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-functions&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -330,7 +330,7 @@ in <em>sectionKeys</em> from a given <em>key</em>.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_hazelcast.html b/documentation/extensions/mod_hazelcast.html
index 7171fa7..6f01aa6 100644
--- a/documentation/extensions/mod_hazelcast.html
+++ b/documentation/extensions/mod_hazelcast.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with Hazelcast</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -183,7 +183,7 @@ defined by the <a href="mod_mutable_config.html">tamaya-mutable-config</a> exten
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-hazelcast&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -272,7 +272,7 @@ Hazelcast based property source.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_json.html b/documentation/extensions/mod_hjson.html
similarity index 87%
copy from documentation/extensions/mod_json.html
copy to documentation/extensions/mod_hjson.html
index 5d28182..ce83b77 100644
--- a/documentation/extensions/mod_json.html
+++ b/documentation/extensions/mod_hjson.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 	    <meta charset="utf-8"/>
-	    <title>Apache Tamaya - Extension: Builder</title>
+	    <title>Apache Tamaya - Extension: HJSON Format</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 	    <meta name="description" content="Homepage of Apache Tamaya (incubating)"/>
 	    <meta name="author" content="Apache Tamaya Project Team"/>
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -141,10 +141,10 @@
 		<div class="container">
 
 			<div class="page-header">
-				<h1>Apache Tamaya - Extension: Builder</h1>
+				<h1>Apache Tamaya - Extension: HJSON Format</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -152,39 +152,44 @@
 </div>
 </div>
 <div class="sect1">
-<h2 id="JSON">Tamaya JSON (Extension Module)</h2>
+<h2 id="HJSON">Tamaya HJSON (Extension Module)</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Tamaya <em>JSON</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+<p>Tamaya <em>HJSON</em> is an extension module. Refer also to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
 </div>
 <div class="sect2">
-<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<h3 id="_what_functionality_does_this_module_provide">What functionality does this module provide?</h3>
 <div class="paragraph">
-<p>Tamaya <em>JSON</em> provides support for reading configuration using JSON
-format:</p>
+<p>Tamaya <em>HJSON</em> provides support for reading configuration in HJSON, a JSP similar format better
+suited for humans:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-json" data-lang="json">{
-  "a.b"{
-    "key1": "blabla",
-    "key2": true,
+<pre class="prettyprint highlight"><code class="language-hjson" data-lang="hjson">{
+  a : A
+  b : {
+    o : O
+    p : P
   }
+  c : C
 }</code></pre>
 </div>
 </div>
 <div class="paragraph">
 <p>Hereby the hierarchical structure of the JSON document will be mapped to a
-flat key-value pairs of type <code>String</code>, e.g. the bove will be mapped to</p>
+corresponding <code>PropertyValue</code> tree structure. This structure can be mapped
+to flat key-value pairs of type <code>String</code>, e.g. the above will be mapped to</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">a.b.key1=blabla
-a.b.key2=true</code></pre>
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">a=A
+b.o=O
+b.p=P
+c=C</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>This extension uses SPI defined by the tamaya.formats extension module.</p>
+<p>This extension implements the SPI defined by the tamaya.formats extension module.</p>
 </div>
 </div>
 <div class="sect2">
@@ -196,14 +201,14 @@ a.b.key2=true</code></pre>
 <div class="sect2">
 <h3 id="_installation">Installation</h3>
 <div class="paragraph">
-<p>To use the JSON extension module you only must add the corresponding dependency to your module:</p>
+<p>To use the HJSON extension module you only must add the corresponding dependency to your project:</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
-  &lt;artifactId&gt;tamaya-json&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;artifactId&gt;tamaya-hjson&lt;/artifactId&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -212,15 +217,15 @@ a.b.key2=true</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_reading_configuration_in_json">Reading configuration in JSON</h3>
+<h3 id="_reading_configuration_in_hjson">Reading configuration in HJSON</h3>
 <div class="paragraph">
-<p>For reading JSON based onfiguration most easily a JSONFormat can be
+<p>For reading HJSON based configuration most easily a HJSONFormat can be
 used:</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationData dataRead = ConfigurationFormats.getInstance().readConfig(
-    getClassLoader().getResource("myFileConfig.json"), new JSONFormat()));</code></pre>
+    getClassLoader().getResource("myFileConfig.json"), new HJSONFormat()));</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -231,7 +236,7 @@ registers the <em>json</em> format automatically using the <code>ServiceContext<
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertySource ps = ConfigurationFormats.getInstance().createPropertySource(
-    getClassLoader().getResource("myFileConfig.json"));</code></pre>
+    getClassLoader().getResource("myFileConfig.hjson"));</code></pre>
 </div>
 </div>
 </div>
@@ -248,7 +253,7 @@ registers the <em>json</em> format automatically using the <code>ServiceContext<
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_json.html b/documentation/extensions/mod_hocon.html
similarity index 86%
copy from documentation/extensions/mod_json.html
copy to documentation/extensions/mod_hocon.html
index 5d28182..d2c26ad 100644
--- a/documentation/extensions/mod_json.html
+++ b/documentation/extensions/mod_hocon.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 	    <meta charset="utf-8"/>
-	    <title>Apache Tamaya - Extension: Builder</title>
+	    <title>Apache Tamaya - Extension: HOCON Format</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 	    <meta name="description" content="Homepage of Apache Tamaya (incubating)"/>
 	    <meta name="author" content="Apache Tamaya Project Team"/>
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -141,10 +141,10 @@
 		<div class="container">
 
 			<div class="page-header">
-				<h1>Apache Tamaya - Extension: Builder</h1>
+				<h1>Apache Tamaya - Extension: HOCON Format</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -152,39 +152,44 @@
 </div>
 </div>
 <div class="sect1">
-<h2 id="JSON">Tamaya JSON (Extension Module)</h2>
+<h2 id="JSON">Tamaya HOCON (Extension Module)</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Tamaya <em>JSON</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+<p>Tamaya <em>HOCON</em> is an extension module. Refer also to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
 </div>
 <div class="sect2">
-<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<h3 id="_what_functionality_does_this_module_provide">What functionality does this module provide?</h3>
 <div class="paragraph">
-<p>Tamaya <em>JSON</em> provides support for reading configuration using JSON
-format:</p>
+<p>Tamaya <em>HOCON</em> provides support for reading configuration using Human Optimized Configuration (HOCON)
+format as defined by <a href="http://https://lightbend.github.io/config/">Lightbend Typesafe Config</a>:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-json" data-lang="json">{
-  "a.b"{
-    "key1": "blabla",
-    "key2": true,
+<pre class="prettyprint highlight"><code class="language-hcon" data-lang="hcon">{
+  a : A
+  b : B
+  c {
+    o: O
+    p: P
   }
 }</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>Hereby the hierarchical structure of the JSON document will be mapped to a
-flat key-value pairs of type <code>String</code>, e.g. the bove will be mapped to</p>
+<p>Hereby the hierarchical structure of the HOCON document will be mapped
+into an according <code>PropertyValue</code> tree structure. By default this structure can be
+mapped to flat key-value pairs of type <code>String</code>, e.g. the above will be mapped to</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">a.b.key1=blabla
-a.b.key2=true</code></pre>
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">a=A
+b=B
+c.o=O
+c.p=P</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>This extension uses SPI defined by the tamaya.formats extension module.</p>
+<p>This extension implements the SPI defined by the tamaya.formats extension module.</p>
 </div>
 </div>
 <div class="sect2">
@@ -196,14 +201,14 @@ a.b.key2=true</code></pre>
 <div class="sect2">
 <h3 id="_installation">Installation</h3>
 <div class="paragraph">
-<p>To use the JSON extension module you only must add the corresponding dependency to your module:</p>
+<p>To use the HOCON extension module you only must add the corresponding dependency to your module:</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
-  &lt;artifactId&gt;tamaya-json&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;artifactId&gt;tamaya-hocon&lt;/artifactId&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -212,26 +217,26 @@ a.b.key2=true</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_reading_configuration_in_json">Reading configuration in JSON</h3>
+<h3 id="_reading_configuration_in_hocon">Reading configuration in HOCON</h3>
 <div class="paragraph">
-<p>For reading JSON based onfiguration most easily a JSONFormat can be
+<p>For reading HOCON based onfiguration most easily a HOCONFormat can be
 used:</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationData dataRead = ConfigurationFormats.getInstance().readConfig(
-    getClassLoader().getResource("myFileConfig.json"), new JSONFormat()));</code></pre>
+    getClassLoader().getResource("myFileConfig.hocon"), new HOCONFormat()));</code></pre>
 </div>
 </div>
 <div class="paragraph">
 <p>Or, if you are fine with the <em>default</em> mapping you can directly create a
 PropertySource using the <em>formats</em> API (this works since this module
-registers the <em>json</em> format automatically using the <code>ServiceContext</code>):</p>
+registers the <em>hocon</em> format automatically in the <code>ServiceContext</code>):</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertySource ps = ConfigurationFormats.getInstance().createPropertySource(
-    getClassLoader().getResource("myFileConfig.json"));</code></pre>
+    getClassLoader().getResource("myFileConfig.hocon"));</code></pre>
 </div>
 </div>
 </div>
@@ -248,7 +253,7 @@ registers the <em>json</em> format automatically using the <code>ServiceContext<
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_injection.html b/documentation/extensions/mod_injection.html
index f66c5f7..29ac420 100644
--- a/documentation/extensions/mod_injection.html
+++ b/documentation/extensions/mod_injection.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Injection</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -186,7 +186,7 @@ according injection services. This module adds this functionality to Tamaya.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-injection-api&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -198,7 +198,7 @@ according injection services. This module adds this functionality to Tamaya.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-injection&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -311,7 +311,7 @@ ConfigurationInjector.getInstance().configure(tenant);</code></pre>
 </td>
 <td class="content">
 Configuration injection works similarly, when used with other integration modules, e.g. when Tamaya is used
-with CDI, Spring or within an OSGI container. For further details refer also to the corresponding integration module&#8217;s
+with CDI, Spring or within an OSGi container. For further details refer also to the corresponding integration module&#8217;s
 documentation.
 </td>
 </tr>
@@ -723,7 +723,7 @@ public interface ConfiguredMethod {
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_jndi.html b/documentation/extensions/mod_jndi.html
index 0e2e402..7f655f5 100644
--- a/documentation/extensions/mod_jndi.html
+++ b/documentation/extensions/mod_jndi.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration with JNDI</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -181,7 +181,7 @@ your module:</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-jndi&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -235,7 +235,7 @@ InitialContext is created, without any environment parameters set.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_jodatime.html b/documentation/extensions/mod_jodatime.html
index 1463403..af23b7d 100644
--- a/documentation/extensions/mod_jodatime.html
+++ b/documentation/extensions/mod_jodatime.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: JodaTime</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -176,7 +176,7 @@ maven dependency to your project:</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;grooupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-jodatime&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -312,7 +312,7 @@ DateTime pit = configuration.get("pointInTime", DateTime.class)</code></pre>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_json.html b/documentation/extensions/mod_json.html
index 5d28182..05414d1 100644
--- a/documentation/extensions/mod_json.html
+++ b/documentation/extensions/mod_json.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 	    <meta charset="utf-8"/>
-	    <title>Apache Tamaya - Extension: Builder</title>
+	    <title>Apache Tamaya - Extension: JSON Format</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 	    <meta name="description" content="Homepage of Apache Tamaya (incubating)"/>
 	    <meta name="author" content="Apache Tamaya Project Team"/>
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -141,10 +141,10 @@
 		<div class="container">
 
 			<div class="page-header">
-				<h1>Apache Tamaya - Extension: Builder</h1>
+				<h1>Apache Tamaya - Extension: JSON Format</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -155,13 +155,12 @@
 <h2 id="JSON">Tamaya JSON (Extension Module)</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Tamaya <em>JSON</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+<p>Tamaya <em>JSON</em> is an extension module. Refer also to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
 </div>
 <div class="sect2">
-<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<h3 id="_what_functionality_does_this_module_provide">What functionality does this module provide?</h3>
 <div class="paragraph">
-<p>Tamaya <em>JSON</em> provides support for reading configuration using JSON
-format:</p>
+<p>Tamaya <em>JSON</em> provides support for reading configuration in JSON (Java Serialized Object Notation):</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -175,7 +174,8 @@ format:</p>
 </div>
 <div class="paragraph">
 <p>Hereby the hierarchical structure of the JSON document will be mapped to a
-flat key-value pairs of type <code>String</code>, e.g. the bove will be mapped to</p>
+corresponding <code>PropertyValue</code> tree structure. This structure can be mapped
+to flat key-value pairs of type <code>String</code>, e.g. the above will be mapped to</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -184,7 +184,7 @@ a.b.key2=true</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>This extension uses SPI defined by the tamaya.formats extension module.</p>
+<p>This extension implements the SPI defined by the tamaya.formats extension module.</p>
 </div>
 </div>
 <div class="sect2">
@@ -203,7 +203,7 @@ a.b.key2=true</code></pre>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-json&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -248,7 +248,7 @@ registers the <em>json</em> format automatically using the <code>ServiceContext<
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_management.html b/documentation/extensions/mod_management.html
index 854a4bc..191bbb9 100644
--- a/documentation/extensions/mod_management.html
+++ b/documentation/extensions/mod_management.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: JMX Management Access</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -181,7 +181,7 @@ to your module:</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-management&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -294,7 +294,7 @@ The instance of ManagedConfigMBean to be created and registered is evaluated by
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_metamodel.html b/documentation/extensions/mod_metamodel.html
index 8b4251a..aab8f2b 100644
--- a/documentation/extensions/mod_metamodel.html
+++ b/documentation/extensions/mod_metamodel.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Metamodel (Configuration of Tamaya)</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -233,7 +233,7 @@ as the system&#8217;s <em>default</em> configuration (accessible from <code>Conf
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-model&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -891,7 +891,7 @@ never change later.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_microprofile.html b/documentation/extensions/mod_microprofile.html
index 6294223..2d96f5d 100644
--- a/documentation/extensions/mod_microprofile.html
+++ b/documentation/extensions/mod_microprofile.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Microprofile Implementation</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -197,7 +197,7 @@ version 1.1.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-microprofile&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -265,7 +265,7 @@ public class InjectedConfigUsageSample {
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_mutable_config.html b/documentation/extensions/mod_mutable_config.html
index 985003b..73bf7b1 100644
--- a/documentation/extensions/mod_mutable_config.html
+++ b/documentation/extensions/mod_mutable_config.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Mutable Configuration</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -181,7 +181,7 @@ functionality.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-mutable-config&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -434,7 +434,7 @@ singleton accessor:</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_optional.html b/documentation/extensions/mod_optional.html
index a61b040..0b48412 100644
--- a/documentation/extensions/mod_optional.html
+++ b/documentation/extensions/mod_optional.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Optional Tamaya Configuration</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -185,7 +185,7 @@ Additionally an EvaluationPolicy lets you define the precedence of configured va
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-optional&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -224,7 +224,7 @@ Additionally an EvaluationPolicy lets you define the precedence of configured va
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_osgi.html b/documentation/extensions/mod_osgi.html
index 7c0d89e..6b0ec57 100644
--- a/documentation/extensions/mod_osgi.html
+++ b/documentation/extensions/mod_osgi.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 	    <meta charset="utf-8"/>
-	    <title>Apache Tamaya - Extensions: OSGI Integration</title>
+	    <title>Apache Tamaya - Extensions: OSGi Integration</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 	    <meta name="description" content="Homepage of Apache Tamaya (incubating)"/>
 	    <meta name="author" content="Apache Tamaya Project Team"/>
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -141,10 +141,10 @@
 		<div class="container">
 
 			<div class="page-header">
-				<h1>Apache Tamaya - Extensions: OSGI Integration</h1>
+				<h1>Apache Tamaya - Extensions: OSGi Integration</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -152,15 +152,15 @@
 </div>
 </div>
 <div class="sect1">
-<h2 id="OSGI">Tamaya OSGI Support</h2>
+<h2 id="OSGi">Tamaya OSGi Support</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Tamaya <em>OSGI</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+<p>Tamaya <em>OSGi</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
 </div>
 <div class="sect2">
 <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
 <div class="paragraph">
-<p>Tamaya <em>OSGI</em> provides support for integration with OSGI. Hereby Tamaya does actively override or extend the OSGI
+<p>Tamaya <em>OSGi</em> provides support for integration with OSGi. Hereby Tamaya does actively override or extend the OSGi
 ConfigAdmin based configuration with entries stored and managed by Tamaya. Tamaya provides also shell extensions
 to enable/perform configuration loading and restoring actions.
 Optionally Tamaya also provides extension for automatically trigger configuration updates, when configuration has
@@ -171,8 +171,8 @@ been changed and configuration injection using Tamaya&#8217;s injection API.</p>
 <h3 id="_compatibility">Compatibility</h3>
 <div class="paragraph">
 <p>All module described are based on Java 8, so it will run on Java 8 and beyond.
-The modules are built against <strong>OSGI Compendium version 5.0</strong>. Tamaya OSGI support
-is tested against the following OSGI runtimes:</p>
+The modules are built against <strong>OSGi Compendium version 5.0</strong>. Tamaya OSGi support
+is tested against the following OSGi runtimes:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -191,40 +191,40 @@ is tested against the following OSGI runtimes:</p>
 <div class="sect2">
 <h3 id="_installation">Installation</h3>
 <div class="paragraph">
-<p>To benefit from Tamaya in an OSGI context you must deploy at least the following modules to
-your OSGI runtime environment:</p>
+<p>To benefit from Tamaya in an OSGi context you must deploy at least the following modules to
+your OSGi runtime environment:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing"># Runtime with OSGI ConfigAdmin support, e.g.
+<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing"># Runtime with OSGi ConfigAdmin support, e.g.
 org.apache.felix:org.apache.felix.configadmin:{felix_version}
 # API and core
 org.apache.geronimo.specs:geronimo-annotation_1.2_spec:1.0
-org.apache.tamaya:tamaya-api:0.4-incubating-SNAPSHOT
-org.apache.tamaya:tamaya-spisupport:0.4-incubating-SNAPSHOT
-org.apache.tamaya:tamaya-core:0.4-incubating-SNAPSHOT
+org.apache.tamaya:tamaya-api:0.5-incubating-SNAPSHOT
+org.apache.tamaya:tamaya-spisupport:0.5-incubating-SNAPSHOT
+org.apache.tamaya:tamaya-core:0.5-incubating-SNAPSHOT
 # Required extensions
-org.apache.tamaya.ext:tamaya-functions:0.4-incubating-SNAPSHOT
-org.apache.tamaya.ext:tamaya-osgi:0.4-incubating-SNAPSHOT</code></pre>
+org.apache.tamaya.ext:tamaya-functions:0.5-incubating-SNAPSHOT
+org.apache.tamaya.ext:tamaya-osgi:0.5-incubating-SNAPSHOT</code></pre>
 </div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_tamaya_service_loading_in_osgi">Tamaya Service Loading in OSGI</h3>
+<h3 id="_tamaya_service_loading_in_osgi">Tamaya Service Loading in OSGi</h3>
 <div class="paragraph">
-<p>Important to know is that within OSGI class- and resource loading is not compatible with standard Java SE. Also
-in OSGI, bundles can be loaded or unloaded at any time, so Tamaya&#8217;s logic must cope with this as well.
+<p>Important to know is that within OSGi class- and resource loading is not compatible with standard Java SE. Also
+in OSGi, bundles can be loaded or unloaded at any time, so Tamaya&#8217;s logic must cope with this as well.
 These constraints are handled by Tamaya (implemented in tamaya-core and tamaya-osgi) as follows:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
 <p>Tamaya registers a OSGIServiceContext which reads all java.util.ServiceLoader configurations and
-registers them as OSGI services. Hereby integration is two-way: The core module contains an
-OSGI Activator that replaces Tamaya&#8217;s default ServiceContext with an OSGI based implementation that
-will consume all services from the OSGI service API. Consequently you can also register Tamaya extensions
-as OSGI services using standard OSGI tooling (e.g. your own PropertySource instances). Tamaya hereby
-also does not store any service references, so the dynamic nature of OSGI is fully honored.</p>
+registers them as OSGi services. Hereby integration is two-way: The core module contains an
+OSGi Activator that replaces Tamaya&#8217;s default ServiceContext with an OSGi based implementation that
+will consume all services from the OSGi service API. Consequently you can also register Tamaya extensions
+as OSGi services using standard OSGi tooling (e.g. your own PropertySource instances). Tamaya hereby
+also does not store any service references, so the dynamic nature of OSGi is fully honored.</p>
 </li>
 <li>
 <p>Tamaya&#8217;s ServiceContext SPI does additionally provide functionality for loading of (classpath)
@@ -232,7 +232,7 @@ resources using the bundle&#8217;s getEntry(String) method.</p>
 </li>
 <li>
 <p>Tamaya similarly checks the classpath of all bundles for Tamaya SPI services to be registered thus
-implementing the ServiceLoader logic in OSGI. Hereby Tamaya will only register services with the
+implementing the ServiceLoader logic in OSGi. Hereby Tamaya will only register services with the
 org.apache.tamaya as root package.</p>
 </li>
 </ul>
@@ -244,8 +244,8 @@ org.apache.tamaya as root package.</p>
 <div class="title">Note</div>
 </td>
 <td class="content">
-Tamaya actually does not replace any existing ConfigAdmin component, Tamaya modifies any existing OSGI
-      configuration on changes detected and stores backups of any OSGI configuration before applying any
+Tamaya actually does not replace any existing ConfigAdmin component, Tamaya modifies any existing OSGi
+      configuration on changes detected and stores backups of any OSGi configuration before applying any
       changes.
 </td>
 </tr>
@@ -257,13 +257,13 @@ Tamaya actually does not replace any existing ConfigAdmin component, Tamaya modi
 <div class="sect3">
 <h4 id="_mapping_of_pids_and_factorypids">Mapping of pids and factoryPids</h4>
 <div class="paragraph">
-<p>When accessing configuration from the OSGI ConfigAdmin a pid and an optional location can be provided.
+<p>When accessing configuration from the OSGi ConfigAdmin a pid and an optional location can be provided.
 Tamaya requires all configuration for a PID to be located in keys starting [PID]:</p>
 </div>
 <div class="listingblock">
-<div class="title">OSGI pid mapping</div>
+<div class="title">OSGi pid mapping</div>
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing"># OSGI settings
+<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing"># OSGi settings
 pid=myBundle
 key=common.net.port
 
@@ -275,8 +275,8 @@ key=common.net.port
 <div class="sect3">
 <h4 id="_enablingdisabling_tamaya">Enabling/Disabling Tamaya</h4>
 <div class="paragraph">
-<p>By default, Tamaya doesn&#8217;t do anything, unless it is told to so so. So having installed the Tamaya OSGI plugin,
-you will see the bundles are loaded, but your OSGI environment still works the same. This is not accidentally, since
+<p>By default, Tamaya doesn&#8217;t do anything, unless it is told to so so. So having installed the Tamaya OSGi plugin,
+you will see the bundles are loaded, but your OSGi environment still works the same. This is not accidentally, since
 configuration is a crucial part. This means Tamaya, by default, is disabled for all bundles. You have now several
 options to enabled Tamaya:</p>
 </div>
@@ -290,7 +290,7 @@ options to enabled Tamaya:</p>
 <p>setting the -Dtamaya-enabled=true system property.</p>
 </li>
 <li>
-<p>by setting tamaya-enabled=true in the OSGI Configuration for the PID TamayaConfigPlugin.</p>
+<p>by setting tamaya-enabled=true in the OSGi Configuration for the PID TamayaConfigPlugin.</p>
 </li>
 </ul>
 </div>
@@ -300,7 +300,7 @@ options to enabled Tamaya:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>by setting tamaya-enabled=true in the OSGI Configuration for the given bundle.</p>
+<p>by setting tamaya-enabled=true in the OSGi Configuration for the given bundle.</p>
 </li>
 <li>
 <p>by adding Tamaya-Enabled: true to the bundle&#8217;s MANIFEST.</p>
@@ -323,7 +323,7 @@ options to enabled Tamaya:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>by setting tamaya-enabled=false in the OSGI Configuration for the given bundle.</p>
+<p>by setting tamaya-enabled=false in the OSGi Configuration for the given bundle.</p>
 </li>
 <li>
 <p>by adding Tamaya-Enabled: false to the bundle&#8217;s MANIFEST.</p>
@@ -335,14 +335,14 @@ options to enabled Tamaya:</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_controlling_how_tamaya_changes_your_osgi_configuration">Controlling How Tamaya changes your OSGI Configuration</h4>
+<h4 id="_controlling_how_tamaya_changes_your_osgi_configuration">Controlling How Tamaya changes your OSGi Configuration</h4>
 <div class="paragraph">
-<p>Tamaya supports different policies that define how Tamaya is changing the OSGI configuration:</p>
+<p>Tamaya supports different policies that define how Tamaya is changing the OSGi configuration:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p><strong>EXTEND</strong>: Only add properties not existing in the OSGI configuration, but never override
+<p><strong>EXTEND</strong>: Only add properties not existing in the OSGi configuration, but never override
 or remove existing properties.</p>
 </li>
 <li>
@@ -367,7 +367,7 @@ ways and with different scopes:</p>
 <p>setting the -Dtamaya-policy=POLICY system property.</p>
 </li>
 <li>
-<p>by setting tamaya-policy=POLICY in the OSGI Configuration for the PID TamayaConfigPlugin.</p>
+<p>by setting tamaya-policy=POLICY in the OSGi Configuration for the PID TamayaConfigPlugin.</p>
 </li>
 </ul>
 </div>
@@ -384,7 +384,7 @@ ways and with different scopes:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>by setting tamaya-policy=POLICY in the OSGI Configuration for the given bundle.</p>
+<p>by setting tamaya-policy=POLICY in the OSGi Configuration for the given bundle.</p>
 </li>
 <li>
 <p>by adding Tamaya-Policy: POLICY to the bundle&#8217;s MANIFEST.</p>
@@ -396,10 +396,10 @@ ways and with different scopes:</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_mapping_osgi_pids_to_tamaya_configuration">Mapping OSGI PIDs to Tamaya Configuration</h4>
+<h4 id="_mapping_osgi_pids_to_tamaya_configuration">Mapping OSGi PIDs to Tamaya Configuration</h4>
 <div class="paragraph">
-<p>Tamaya configuration is a single Map&lt;String,String&gt; with String keys and String values. Whereas OSGI configuration are
-multiple +Dictionary&lt;String,?&gt; (for several PIDs). The Tamaya OSGI extension implements the following mapping:</p>
+<p>Tamaya configuration is a single Map&lt;String,String&gt; with String keys and String values. Whereas OSGi configuration are
+multiple +Dictionary&lt;String,?&gt; (for several PIDs). The Tamaya OSGi extension implements the following mapping:</p>
 </div>
 <div class="paragraph">
 <p>As an example refer to the followinf Tamaya configuration entries:</p>
@@ -413,10 +413,10 @@ multiple +Dictionary&lt;String,?&gt; (for several PIDs). The Tamaya OSGI extensi
 </div>
 </div>
 <div class="paragraph">
-<p>The OSGI Configuration Plugin now provides the following configuration for PID:</p>
+<p>The OSGi Configuration Plugin now provides the following configuration for PID:</p>
 </div>
 <div class="listingblock">
-<div class="title">OSGI configuration for PID 'MyPlugin'</div>
+<div class="title">OSGi configuration for PID 'MyPlugin'</div>
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">ch.base.pack.Main.use=100        (Integer)
 ch.base.pack.Main.switch=on      (Boolean)
@@ -424,11 +424,11 @@ ch.base.pack.Main.customer=NONE  (String)</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>Now using Policy.OVERRIDE (as desribed in the previous section), Tamaya will change the OSGI configuration
+<p>Now using Policy.OVERRIDE (as desribed in the previous section), Tamaya will change the OSGi configuration
 as follows:</p>
 </div>
 <div class="listingblock">
-<div class="title">OSGI configuration after Tamaya update for PID 'MyPlugin'</div>
+<div class="title">OSGi configuration after Tamaya update for PID 'MyPlugin'</div>
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">ch.base.pack.Main.use=234                   (Integer)
 ch.base.pack.Main.switch=on                 (Boolean)
@@ -442,10 +442,10 @@ ch.base.pack.Main.customer=Native Inc       (String)
 <div class="ulist">
 <ul>
 <li>
-<p>The OSGI PID is mapped to a Tamaya prefix [PID].</p>
+<p>The OSGi PID is mapped to a Tamaya prefix [PID].</p>
 </li>
 <li>
-<p>The OSGI keys are the exact same keys as from Tamaya with the <em>[PID]</em> prefix removed.</p>
+<p>The OSGi keys are the exact same keys as from Tamaya with the <em>[PID]</em> prefix removed.</p>
 </li>
 <li>
 <p>New entries are added (depending on the Policy) as String values.</p>
@@ -458,12 +458,12 @@ to add custom converters).</p>
 </ul>
 </div>
 <div class="paragraph">
-<p>Finally, the mapping of the OSGI <em>PID</em> to the Tamaya <em>[PID]</em> prefix also can be customized by</p>
+<p>Finally, the mapping of the OSGi <em>PID</em> to the Tamaya <em>[PID]</em> prefix also can be customized by</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>adding tamaya-config-root as an OSGI configuration property to the OSGI configuration.</p>
+<p>adding tamaya-config-root as an OSGi configuration property to the OSGi configuration.</p>
 </li>
 <li>
 <p>adding Tamaya-Config-Root as a MANIFEST entry to the bundle.</p>
@@ -475,11 +475,11 @@ to add custom converters).</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_osgi_configuration_backup">OSGI Configuration Backup</h4>
+<h4 id="_osgi_configuration_backup">OSGi Configuration Backup</h4>
 <div class="paragraph">
-<p>Before Tamaya changes any OSGI configuration it creates a <em>Backup</em> of the existing OSGI
-configuration dictionary and stores it in serialized form in the plugin&#8217;s OSGI configuration.
-This allows you to restore the original OSGI configuration in case of problems. Hereby Tamaya
+<p>Before Tamaya changes any OSGi configuration it creates a <em>Backup</em> of the existing OSGi
+configuration dictionary and stores it in serialized form in the plugin&#8217;s OSGi configuration.
+This allows you to restore the original OSGi configuration in case of problems. Hereby Tamaya
 automatically sets the tamaya-enabled=false property to disable Tamaya for the given
 configuration (bundle).</p>
 </div>
@@ -489,14 +489,14 @@ configuration (bundle).</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_osgi_configuration_change_log">OSGI Configuration Change Log</h4>
+<h4 id="_osgi_configuration_change_log">OSGi Configuration Change Log</h4>
 <div class="paragraph">
 <p>All changes applied by Tamaya are logged as well using
 ConfigHistory entry items. The history can be accessed from the Tamaya Configuration Plugin Service
 (shown later):</p>
 </div>
 <div class="listingblock">
-<div class="title">OSGI ConfigHistory Entry</div>
+<div class="title">OSGi ConfigHistory Entry</div>
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-Java" data-lang="Java">public final class ConfigHistory implements Serializable{
 
@@ -533,10 +533,10 @@ ConfigHistory entry items. The history can be accessed from the Tamaya Configura
 </div>
 </div>
 <div class="sect3">
-<h4 id="_the_tamaya_osgi_configuration_service">The Tamaya OSGI Configuration Service</h4>
+<h4 id="_the_tamaya_osgi_configuration_service">The Tamaya OSGi Configuration Service</h4>
 <div class="paragraph">
-<p>As mentioned Tamaya exposes it&#8217;s OSGI functionality, allowing programmatic access to Tamaya configuration
-logic with the TamayaConfigService OSGI service:</p>
+<p>As mentioned Tamaya exposes it&#8217;s OSGi functionality, allowing programmatic access to Tamaya configuration
+logic with the TamayaConfigService OSGi service:</p>
 </div>
 <div class="listingblock">
 <div class="title">The exposed TamayaConfigService</div>
@@ -580,39 +580,39 @@ logic with the TamayaConfigService OSGI service:</p>
     boolean isTamayaEnabledByDefault();
 
     /**
-     * Get the default policy Tamaya is using for adapting OSGI configuration.
+     * Get the default policy Tamaya is using for adapting OSGi configuration.
      * @return the default policy, never null.
      */
     Policy getDefaultPolicy();
 
     /**
-     * Set the default policy Tamaya is using for adapting OSGI configuration.
+     * Set the default policy Tamaya is using for adapting OSGi configuration.
      * @param policy the policy, not null.
      */
     void setDefaultPolicy(Policy policy);
 
     /**
-     * Updates the given OSGI configuration with Tamaya configuration.
+     * Updates the given OSGi configuration with Tamaya configuration.
      * @param pid the target PID, not null.
      * @return the new configuration.
      */
     Dictionary&lt;String,Object&gt; updateConfig(String pid);
 
     /**
-     * Updates the given OSGI configuration with Tamaya configuration.
+     * Updates the given OSGi configuration with Tamaya configuration.
      * @param pid the target PID, not null.
-     * @param dryRun if true, the changes will not be applied to the OSGI configuration.
+     * @param dryRun if true, the changes will not be applied to the OSGi configuration.
      * @return the configuration that would be applied, has been applied.
      */
     Dictionary&lt;String,Object&gt; updateConfig(String pid, boolean dryRun);
 
     /**
-     * Updates the given OSGI configuration with Tamaya configuration.
+     * Updates the given OSGi configuration with Tamaya configuration.
      * @param pid the target PID, not null.
      * @param policy the updating policy to be used, by default.
      * @param forcePolicy if set to true, the given policy will be used, even if an alternate policy is configured
      *                    for the given PID.
-     * @param dryRun if true, the changes will not be applied to the OSGI configuration.
+     * @param dryRun if true, the changes will not be applied to the OSGi configuration.
      * @return the configuration that would be applied, has been applied.
      */
     Dictionary&lt;String,Object&gt; updateConfig(String pid, Policy policy, boolean forcePolicy, boolean dryRun);
@@ -644,7 +644,7 @@ logic with the TamayaConfigService OSGI service:</p>
     Set&lt;String&gt; getBackupPids();
 
     /**
-     * Restores a backup, replacing the current OSGI configuration with the backup and
+     * Restores a backup, replacing the current OSGi configuration with the backup and
      * disabling Tamaya for this PID.
      * @param pid the PID, not null.
      * @return true, if a backup has been restored successfully.
@@ -652,7 +652,7 @@ logic with the TamayaConfigService OSGI service:</p>
     boolean restoreBackup(String pid);
 
     /**
-     * Stores the current OSGI configuration as a backup (only if no backup is existing).
+     * Stores the current OSGi configuration as a backup (only if no backup is existing).
      * @param pid the target PID, not null.
      * @return true, if a backup has been stored successfully.
      */
@@ -702,10 +702,10 @@ logic with the TamayaConfigService OSGI service:</p>
     List&lt;ConfigHistory&gt; getHistory(String pid);
 
     /**
-     * Access the current OSGI configuration for a PID.
+     * Access the current OSGi configuration for a PID.
      * @param pid the target PID, not null.
      * @param section a subsection to be filter (using startsWith).
-     * @return the (optionally filtered) OSGI configuration.
+     * @return the (optionally filtered) OSGi configuration.
      */
     Dictionary&lt;String,Object&gt; getOSGIConfiguration(String pid, String section);
 
@@ -720,9 +720,9 @@ logic with the TamayaConfigService OSGI service:</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_the_tamaya_osgi_configuration_service_2">The Tamaya OSGI Configuration Service</h4>
+<h4 id="_the_tamaya_osgi_configuration_service_2">The Tamaya OSGi Configuration Service</h4>
 <div class="paragraph">
-<p>Finally Tamaya also provides support for using Tamaya&#8217;s injection API with your OSGI project. To enable injection
+<p>Finally Tamaya also provides support for using Tamaya&#8217;s injection API with your OSGi project. To enable injection
 you must install a few additional bundles:</p>
 </div>
 <div class="listingblock">
@@ -730,17 +730,17 @@ you must install a few additional bundles:</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
    &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
    &lt;artifactId&gt;tamaya-osgi-injection&lt;/artifactId&gt;
-   &lt;version&gt;${tamaya.version}&lt;/version&gt;
+   &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;
 &lt;dependency&gt;
    &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
    &lt;artifactId&gt;tamaya-injection&lt;/artifactId&gt;
-   &lt;version&gt;${tamaya.version}&lt;/version&gt;
+   &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;
 &lt;dependency&gt;
    &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
    &lt;artifactId&gt;injection-api&lt;/artifactId&gt;
-   &lt;version&gt;${tamaya.version}&lt;/version&gt;
+   &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -772,7 +772,7 @@ you must install a few additional bundles:</p>
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface ConfigInjectionService {
     /** The manifest entry to enable Tamaya injection. */
     String TAMAYA_INJECTION_ENABLED_MANIFEST = "Tamaya-Config-Inject";
-    /** The OSGI config entry to enable Tamaya injection. */
+    /** The OSGi config entry to enable Tamaya injection. */
     String TAMAYA_INJECTION_ENABLED_PROP = "tamaya-config-inject";
 
     /**
@@ -831,7 +831,7 @@ you must install a few additional bundles:</p>
     &lt;T&gt; T configure(Bundle bundle, T instance);
 
     /**
-     * Creates a suzpplier, which supplies events as created by the basic supplier, which are
+     * Creates a supplier, which supplies events as created by the basic supplier, which are
      * automatically configured, when supplying.
      * @param supplier the base supplier, not null.
      * @param bundle the target bundle, not null.
@@ -859,8 +859,8 @@ you must install a few additional bundles:</p>
 <div class="title">Note</div>
 </td>
 <td class="content">
-Injection hereby is based on the OSGI ConfigAdmin values only. To use Tamaya configuration you have to additionally
-install the Tamaya common OSGI support as described in the previous sections.
+Injection hereby is based on the OSGi ConfigAdmin values only. To use Tamaya configuration you have to additionally
+install the Tamaya common OSGi support as described in the previous sections.
 </td>
 </tr>
 </table>
@@ -871,13 +871,13 @@ install the Tamaya common OSGI support as described in the previous sections.
 </div>
 </div>
 <div class="sect2">
-<h3 id="_special_osgi_platform_support">Special OSGI Platform support</h3>
+<h3 id="_special_osgi_platform_support">Special OSGi Platform support</h3>
 <div class="sect3">
 <h4 id="_apache_karaf_shell">Apache Karaf Shell</h4>
 <div class="paragraph">
 <p>Apache Tamaya provides a Karaf Shell Extension providing commands for performing several actions related
 to Tamaya configuration. To use them, simply add the org.apache.tamaya.ext:tamaya-osgi-karaf-shell bundle
-to your OSGI runtime. The extension will add the following commands to your Karaf conaole (with prefix tamaya):</p>
+to your OSGi runtime. The extension will add the following commands to your Karaf conaole (with prefix tamaya):</p>
 </div>
 <table class="tableblock frame-1 grid-all stretch">
 <colgroup>
@@ -901,16 +901,16 @@ to your OSGI runtime. The extension will add the following commands to your Kara
 <b>SYNTAX</b>
 tamaya:tm_apply_config [options] pid
 <b>ARGUMENTS</b>
-<i>pid</i>  The target OSGI component PID.
+<i>pid</i>  The target OSGi component PID.
 <b>OPTIONS</b>
 <i>operationMode, -m, --opmode</i> Explicitly set (override) the operation mode to use.
-<i>dryRun, -d, --dryrun</i> If set to true no OSGI configuration gets changed.
+<i>dryRun, -d, --dryrun</i> If set to true no OSGi configuration gets changed.
 </pre>
 </p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_backup_create</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Creates a backup of a current OSGI configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Creates a backup of a current OSGi configuration.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -924,7 +924,7 @@ tamaya:tm_backup_create [options] pid
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_backup_delete</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Deletes the OSGI configuration backup  of Tamya.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Deletes the OSGi configuration backup of Tamaya.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -936,7 +936,7 @@ tamaya:tm_backup_delete pid
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_backup_list</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">List the backed-up OSGI configuration before Tamya applied changes.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">List the backed-up OSGi configuration before Tamaya applied changes.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -948,7 +948,7 @@ tamaya:tm_backup_list [pid]
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_backup_restore</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Restores the OSGI configuration backup of Tamya and disabled the PID for Tamaya configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Restores the OSGi configuration backup of Tamaya and disabled the PID for Tamaya configuration.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -966,7 +966,7 @@ tamaya:tm_backup_restore pid
 <b>SYNTAX</b>
 tamaya:tm_config [options]
 <b>OPTIONS</b>
-<i>pi, -p, --pid</i> Apply filtering for the given OSGI component PID.
+<i>pi, -p, --pid</i> Apply filtering for the given OSGi component PID.
 <i>section, -s, --section</i> A starting expression selecting the section to be filtered.
 </pre>
 </p></td>
@@ -974,7 +974,7 @@ tamaya:tm_config [options]
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_enable</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Enables or disable Tamaya by default for all bundles/services (default: enabled=false). Disabling still allows to explicitly enable
-  bundles using 'tamaya-enable' manifest or OSGI config entries.</p></td>
+  bundles using 'tamaya-enable' manifest or OSGi config entries.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -987,7 +987,7 @@ tamaya:tm_enable enabled
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_enabled</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Check if Tamaya is currently by default enabled for all bundles/services (default: enabled=false). If disabled still Tamaya allows to
-  explicitly enable bundles using 'tamaya-enable' manifest or OSGI config entries.</p></td>
+  explicitly enable bundles using 'tamaya-enable' manifest or OSGi config entries.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -997,7 +997,7 @@ tamaya:tm_enabled
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_history</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Gets the getHistory of changes Tamaya applied to the OSGI configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Gets the getHistory of changes Tamaya applied to the OSGi configuration.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -1010,7 +1010,7 @@ tamaya:tm_history [options] [pid]
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_history_delete</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Deletes the getHistory of changes Tamaya applied to the OSGI configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Deletes the getHistory of changes Tamaya applied to the OSGi configuration.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -1022,7 +1022,7 @@ tamaya:tm_history_delete pid
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_history_delete_all</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Deletes the full getHistory of changes Tamaya applied to the OSGI configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Deletes the full getHistory of changes Tamaya applied to the OSGi configuration.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -1053,7 +1053,7 @@ tamaya:tm_history_maxsize_set size
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_info</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Show he current Tamaya status.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Show the current Tamaya status.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -1063,13 +1063,13 @@ tamaya:tm_info
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_osgi_config</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Show the current OSGI configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Show the current OSGi configuration.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
 tamaya:tm_osgi_config [options] pid
 <b>ARGUMENTS</b>
-<i>pid</i> The target OSGI component PID.
+<i>pid</i> The target OSGi component PID.
 <b>OPTIONS</b>
 <i>section, -s, --section</i>: A starting expression selecting the keys to be filtered.
 </pre>
@@ -1093,12 +1093,12 @@ tamaya:tm_policy
 <b>SYNTAX</b>
 tamaya:tm_policy_set tm_policy_set
 <b>ARGUMENTS</b>
-<i>tm_policy_set</i>: The operation policy how Tamaya intercepts OSGI configuration.
+<i>tm_policy_set</i>: The operation policy how Tamaya intercepts OSGi configuration.
 </p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_propagate_updates</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Flag if Tamaya is automatically triggering OSGI config updates, when according Tamaya configuration changes.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Flag if Tamaya is automatically triggering OSGi config updates, when according Tamaya configuration changes.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -1107,7 +1107,7 @@ tm_propagate_updates
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">tm_propagate_updates_set</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Configure if Tamaya is automatically triggering OSGI config updates, when according Tamaya configuration changes.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Configure if Tamaya is automatically triggering OSGi config updates, when according Tamaya configuration changes.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">
 <pre>
 <b>SYNTAX</b>
@@ -1184,7 +1184,7 @@ a detailed command description.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_remote.html b/documentation/extensions/mod_remote.html
index 90c771b..0567d3a 100644
--- a/documentation/extensions/mod_remote.html
+++ b/documentation/extensions/mod_remote.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Remote Configuration</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -181,7 +181,7 @@ provided with the Tamaya <em>server</em> module .</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-remote&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -275,7 +275,7 @@ first accessible URL determines the configuration read.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_resolver.html b/documentation/extensions/mod_resolver.html
index cc9a998..fe9ccad 100644
--- a/documentation/extensions/mod_resolver.html
+++ b/documentation/extensions/mod_resolver.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Resolver</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="Resolver">Tamaya Resolver (Extension Module)</h2>
@@ -180,7 +180,7 @@ cycles to loop endlessly.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-resolver&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -328,7 +328,7 @@ the default implementation in place.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_resources.html b/documentation/extensions/mod_resources.html
index 600aa6e..1a3ac97 100644
--- a/documentation/extensions/mod_resources.html
+++ b/documentation/extensions/mod_resources.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Resources</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="Resources">Tamaya Resources (Extension Module)</h2>
@@ -175,7 +175,7 @@ descriptive ant-styled resource patterns.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;grooupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-resources&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -340,7 +340,7 @@ alternate implementation with an overriding @Priority annotation added using the
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_server.html b/documentation/extensions/mod_server.html
index 9c8864d..d912a15 100644
--- a/documentation/extensions/mod_server.html
+++ b/documentation/extensions/mod_server.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Configuration Server</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -180,7 +180,7 @@ configuration properties.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-server&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -422,7 +422,7 @@ Configuration:
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_spring.html b/documentation/extensions/mod_spring.html
index 4509787..0507448 100644
--- a/documentation/extensions/mod_spring.html
+++ b/documentation/extensions/mod_spring.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Spring Integration</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -160,24 +160,16 @@
 <div class="sect2">
 <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
 <div class="paragraph">
-<p>Tamaya <em>Spring</em> currently provides full integration with Spring and Spring Boot:</p>
+<p>Tamaya <em>Spring</em> allows to use Tamaya as a configuration backend for Spring or Spring Boot:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>A Spring @Configuration implementation that also provides a Tamaya based version of
-org.springframework.context.support.PropertySourcesPlaceholderConfigurer.</p>
-</li>
-<li>
-<p>org.apache.tamaya.integration.spring.TamayaEnvironment is the Tamaya based implementation of the Spring
-Environment interface.</p>
-</li>
-<li>
-<p>TamayaSpringPropertySource implements an additional Spring PropertySource.</p>
+<p>Tamaya is added via a TamayaSpringPropertySource as an additional Spring PropertySource.</p>
 </li>
 <li>
 <p>Finally org.apache.tamaya.integration.spring.SpringConfigInjectionPostProcessor implements a Bean PostProcessor,
-which adds all the fully fledged Tamaya configuration capabilities to Spring.</p>
+which adds all the fully fledged Tamaya configuration injection capabilities to Spring.</p>
 </li>
 </ul>
 </div>
@@ -199,21 +191,21 @@ Spring Framework as well as Spring Boot.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-spring&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_registering_tamaya_spring_configuration">Registering Tamaya Spring Configuration</h3>
+<h3 id="_configuring_tamaya_spring_configuration">Configuring Tamaya Spring Configuration</h3>
 <div class="paragraph">
-<p>Basically to activate the Tamaya Spring support the most simple thing is to a enable the Tamaya package for being
-scanned for Spring components, e.g. using by annotation:</p>
+<p>Tamaya leverages standard Spring functionality of Spring. To activate and configure Tamaya just add the
+corresponding Tamaya annotation to your Spring Configuration:</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">@SpringBootApplication
-@ComponentScan({"org.apache.tamaya.integration.spring"})
+@EnableTamayaConfig
 public class SampleWebFreeMarkerApplication {
 
 	public static void main(String[] args) throws Exception {
@@ -223,57 +215,28 @@ public class SampleWebFreeMarkerApplication {
 }</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>Of course, you can still use Spring&#8217;s XML configuration in a similar way:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"&gt;
-
-    &lt;context:annotation-config /&gt;
-    &lt;context:component-scan base-package="org.apache.tamaya.integration.spring"/&gt;
-
-    ...
-
-&lt;/beans&gt;</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Though not recommended you can explicitly register the Tamaya related beans in your context configuration by hand:
-files:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;bean id="tamayaInjectionProcessor" name="tamayaInjectionProcessor" class="org.apache.tamaya.integration.spring.SpringConfigInjectionPostProcessor"/&gt;
-&lt;bean id="tamayaConfigProvider" name="tamayaConfigProvider" class="org.apache.tamaya.integration.spring.TamayaSpringConfig"/&gt;</code></pre>
-</div>
-</div>
 </div>
 <div class="sect2">
-<h3 id="_configuring_your_context">Configuring your Context</h3>
+<h3 id="_extending_or_overriding_existing_spring_configuration">Extending or Overriding existing Spring Configuration</h3>
 <div class="paragraph">
-<p>After activation you can use Tamaya as a backend for property resolution, e.g. propertyValue
-is resolved from the current Tamaya configuration. See example below:</p>
+<p>By default Tamaya is overriding any existing Spring configuration. But you can also configure Tamaya to extend
+Spring configuration only as follows:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;bean id="configuredBean" name="configuredBean" class="org.apache.tamaya.integration.spring.ConfiguredSpringBean"&gt;
-    &lt;property name="message" value="${propertyValue}"/&gt;
-&lt;/bean&gt;</code></pre>
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@EnableTamayaConfig(extendOnly=true)</code></pre>
 </div>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_configuring_your_beans">Configuring your Beans</h3>
 <div class="paragraph">
-<p>Similarly you can inject any kind of configuration as supported by Tamaya into your Spring managed beans:</p>
+<p>Similarly you can inject any kind of configuration as supported by Tamaya into your Spring managed beans.
+Hereby both, Spring injection and Tamaya injection mechanisms are supported:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@ConfigDefaultSections("app.root") // optional <b class="conum">(1)</b>
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@ConfigSection("app.root") // optional <b class="conum">(1)</b>
 @Component
 public class ConfiguredSpringBean {
 
@@ -327,36 +290,11 @@ for the given keyset.</p>
 <p>Summarizing you get all the nice features of Tamaya out of the box running
 with your Spring code.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_working_with_dynamic_values">Working with Dynamic Values</h3>
-<div class="paragraph">
-<p>Integration into Spring also includes for support for <em>dynamic values</em>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Config(value = "foreground.color", required = false, defaultValue = "#DDDDDD")
-private DynamicValue&lt;Color&gt; foregroundColor;</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Dynamic values are a very flexible mechanism for managing configuration changes.
-You can even use an update policy to define how you want to handle configuration
-changes for your configuration parameter:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">foregroundColor.setUpdatePolicy(UpdatePolicy.IMMEDEATE);
-foregroundColor.addPropertyChangeListener(() -&gt; {
-   System.out.println("New forground color: " + foregroundColor.get();
-});</code></pre>
-</div>
-</div>
-<div class="admonitionblock important">
+<div class="admonitionblock note">
 <table>
 <tr>
 <td class="icon">
-<div class="title">Important</div>
+<div class="title">Note</div>
 </td>
 <td class="content">
 For a full description of Tamaya&#8217;s injection API please
@@ -366,6 +304,17 @@ For a full description of Tamaya&#8217;s injection API please
 </table>
 </div>
 </div>
+<div class="sect2">
+<h3 id="_disabling_tamaya_injection">Disabling Tamaya Injection</h3>
+<div class="paragraph">
+<p>If you dont like Tamaya injection, you can simply disable it:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@EnableTamayaConfig(disableTamayaInjection=true)</code></pre>
+</div>
+</div>
+</div>
 </div>
 </div></p>
 
@@ -379,7 +328,7 @@ For a full description of Tamaya&#8217;s injection API please
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_usagetracker.html b/documentation/extensions/mod_usagetracker.html
index b8864bb..6d08a78 100644
--- a/documentation/extensions/mod_usagetracker.html
+++ b/documentation/extensions/mod_usagetracker.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Usage Tracking</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -180,7 +180,7 @@ VM.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-usagetracker&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -329,7 +329,7 @@ DATE: Sat Apr 30 21:51:09 CEST 2016
 <p>A special feature of this module is that it observes ConfigEvent published through Tamaya&#8217;as event channel
 (tamaya-events module). If no metaconfiguration model is found the model manager by default automatically creates
 models for all injected instances on the fly. In the case of CDI integration this happens typically during deployment
-time, since CDI initializes during deployment time. Other runtime platforms, such as OSGI, may have rather different
+time, since CDI initializes during deployment time. Other runtime platforms, such as OSGi, may have rather different
 behaviour. Nevertheless this means that after your system has been started you should have access to a complete
 set of ConfigModel instances that automatically document all the classes in your system that consume configuration
 (through injection).</p>
@@ -362,7 +362,7 @@ logic can be adapted or replaced.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_validation.html b/documentation/extensions/mod_validation.html
index 527e098..0fb2456 100644
--- a/documentation/extensions/mod_validation.html
+++ b/documentation/extensions/mod_validation.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Configuration Validation</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -180,7 +180,7 @@ defined in a Tamaya Metaconfiguration XML file.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-validation&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -294,7 +294,7 @@ a WARNING message.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_vertx.html b/documentation/extensions/mod_vertx.html
index 30a2be4..22a8713 100644
--- a/documentation/extensions/mod_vertx.html
+++ b/documentation/extensions/mod_vertx.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Integration for Vertx</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -192,7 +192,7 @@ your module:</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-vertx-alpha&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -378,7 +378,7 @@ private String valBusTarget;</code></pre>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/extensions/mod_yaml.html b/documentation/extensions/mod_yaml.html
index 0064aca..52f60f2 100644
--- a/documentation/extensions/mod_yaml.html
+++ b/documentation/extensions/mod_yaml.html
@@ -72,8 +72,8 @@
 								<li><a href="../../documentation/core.html">Core</a></li>
 								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya - Extension: Builder</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -180,7 +180,7 @@ use intendation for expressing hierarchy, which makes yaml configuration files v
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-yaml&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -283,7 +283,7 @@ comments -&gt; Late afternoon is best. Backup contact is Nancy Billsmer @ 338-43
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/quickstart.html b/documentation/quickstart.html
index e05ebe4..39be678 100644
--- a/documentation/quickstart.html
+++ b/documentation/quickstart.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_quickstart">Apache Tamaya: Quickstart</h2>
@@ -159,7 +159,7 @@ dependency to your project:</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
     &lt;groupId&gt;org.apache.tamaya&lt;/groupId&gt;
     &lt;artifactId&gt;tamaya-core&lt;/artifactId&gt;
-    &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+    &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -327,7 +327,7 @@ overview.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;artifactId&gt;org.apache.tamaya.ext&lt;/id&gt;
   &lt;artifactId&gt;tamaya-resolver&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -351,7 +351,7 @@ String resolved = Resolver.getInstance().evaluateExpression(myExpression);</code
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;artifactId&gt;org.apache.tamaya.ext&lt;/id&gt;
   &lt;artifactId&gt;tamaya-resolution&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -376,7 +376,7 @@ description, e.g.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;artifactId&gt;org.apache.tamaya.ext&lt;/id&gt;
   &lt;artifactId&gt;tamaya-inject&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -457,7 +457,7 @@ MyTypeTemplate type = ConfigurationInjector.getInstance().createTemplate(MyTypeT
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/spisupport.html b/documentation/spisupport.html
index 9084b0f..74f4b2a 100644
--- a/documentation/spisupport.html
+++ b/documentation/spisupport.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya: SPI Support Module</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -230,7 +230,7 @@ It is highly recommended that you also read the <a href="../core.html">documenta
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-spisupport&lt;/artifactId&gt;
-  &lt;version&gt;0.4-incubating-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.5-incubating-SNAPSHOT&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -253,7 +253,7 @@ of the Tamaya API as well.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/documentation/usecases.html b/documentation/usecases.html
index e2d59a1..db7c1e1 100644
--- a/documentation/usecases.html
+++ b/documentation/usecases.html
@@ -72,8 +72,8 @@
 								<li><a href="../documentation/core.html">Core</a></li>
 								<li><a href="../documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="../apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="../apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="../apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="../apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Why should you rely on Tamaya?</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -159,7 +159,7 @@ code from configuration concerns.</p>
 </li>
 <li>
 <p><strong>Tamaya is flexible</strong>: Regardless of working
-with Vanilla Java SE or with OSGI or Jakarta EE, Tamaya can be the tool
+with Vanilla Java SE or with OSGi or Jakarta EE, Tamaya can be the tool
 of choice for your configuration concerns.</p>
 </li>
 <li>
@@ -1104,7 +1104,7 @@ on Configuration.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/download.html b/download.html
index 60d3605..ac00488 100644
--- a/download.html
+++ b/download.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,12 +144,12 @@
 				<h1>Apache Tamaya: Download</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>The latest release is Apache Tamaya 0.3-incubating.
+<p>The latest release is Apache Tamaya 0.4-incubating.
 You can download it it from the
 <a href="http://www.apache.org/dyn/closer.cgi/incubator/tamaya" target="_blank" rel="noopener">Apache Software Foundation Distribution Directory</a>.</p>
 </div>
@@ -185,12 +185,12 @@ can be found at the <a href="history.html">release history page</a>.</p>
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
     &lt;groupId&gt;org.apache.tamaya&lt;/groupId&gt;
     &lt;artifactId&gt;tamaya-api&lt;/artifactId&gt;
-    &lt;version&gt;0.3-incubating&lt;/version&gt;
+    &lt;version&gt;0.4-incubating&lt;/version&gt;
 &lt;/dependency&gt;
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.tamaya&lt;/groupId&gt;
     &lt;artifactId&gt;tamaya-core&lt;/artifactId&gt;
-    &lt;version&gt;0.3-incubating&lt;/version&gt;
+    &lt;version&gt;0.4-incubating&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -262,7 +262,7 @@ $ gpg --verify tamaya-project-1.2.0-source-release.zip.asc</code></pre>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/examples.html b/examples.html
index 879be63..5333ed6 100644
--- a/examples.html
+++ b/examples.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya: Examples</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -228,7 +228,7 @@ adapted.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/features.html b/features.html
index 572d898..7b3e932 100644
--- a/features.html
+++ b/features.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Tamaya&#39;s Features</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -296,7 +296,7 @@ So let&#8217;s have a quick look at some of the most commonly used features&#823
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/feed.xml b/feed.xml
index 45c4d1a..1330347 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>Tue, 4 Jun 2019 21:10:22 +0200</pubDate>
-    <lastBuildDate>Tue, 4 Jun 2019 21:10:22 +0200</lastBuildDate>
+    <pubDate>Sun, 17 Nov 2019 00:26:44 +0100</pubDate>
+    <lastBuildDate>Sun, 17 Nov 2019 00:26:44 +0100</lastBuildDate>
 
     <item>
       <title>Tamaya 0.3-incubating release announcement</title>
@@ -164,6 +164,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>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>
@@ -185,21 +200,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>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 5c56f9b..0dc35e7 100644
--- a/highleveldesign.html
+++ b/highleveldesign.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="_the_tamaya_high_level_design">The Tamaya High Level Design</h2>
@@ -180,7 +180,7 @@ that build the base of all the other mechanisms:</p>
   </strong> Several extension points for adding additional configuration property sources or adapting the internal workings
      of the overall system.
   ** A ServiceContext / ServiceContextManager that controls the loading of the components in Tamaya. This allows to
-     adapt the behaviour depending on the runtime environment in use, e.g. a Java standalone application, an OSGI
+     adapt the behaviour depending on the runtime environment in use, e.g. a Java standalone application, an OSGi
      container or a Java EE application server.</p>
 </div>
 <div class="paragraph">
@@ -202,7 +202,7 @@ functionality you want. E.g. modules are providing features such as</p>
 <p>Dynamic configuration updates and change events</p>
 </li>
 <li>
-<p>Support for OSGI/Java EE Classloading</p>
+<p>Support for OSGi/Java EE Classloading</p>
 </li>
 <li>
 <p>A configuration server/client</p>
@@ -422,7 +422,7 @@ and of its current available <a href="documentation/extensions.html">modules</a>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/history.html b/history.html
index 7851b55..2b8b8f6 100644
--- a/history.html
+++ b/history.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_release_history">Apache Tamaya: Release History</h2>
@@ -167,6 +167,12 @@
 <td class="tableblock halign-left valign-top"><p class="tableblock">Download</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">0.4-incubating</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">2019-11-11</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">n/a</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://archive.apache.org/dist/incubator/tamaya/0.4-incubating/" target="_blank" rel="noopener">Download of 0.4 incubating</a></p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">0.3-incubating</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">2016-09-12</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">n/a</p></td>
@@ -199,7 +205,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/index.html b/index.html
index 2e385f1..0b9c46f 100644
--- a/index.html
+++ b/index.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -204,7 +204,7 @@
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/release-guide.html b/release-guide.html
index 4978225..5318b9d 100644
--- a/release-guide.html
+++ b/release-guide.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Apache Tamaya Release Guide</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -409,9 +409,34 @@ Nexus.</p>
 <div class="listingblock">
 <div class="title">Deploying the vote candidate to Apache&#8217;s Nexus'</div>
 <div class="content">
-<pre>$ mvn deploy</pre>
+<pre>$ mvn deploy -DperformRelease=true</pre>
 </div>
 </div>
+<div class="admonitionblock caution">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Caution</div>
+</td>
+<td class="content">
+If you forget the <em>performRelease</em> flag the signature files will be missing.
+</td>
+</tr>
+</table>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+Ensure you have configured your Apache <em>userid</em> and <em>password</em> in your <code>settings.xml</code> for the Apache
+      Nexus server (id: <code>apache.releases.https</code>). Without uploading of your artifacts will fail.
+</td>
+</tr>
+</table>
+</div>
 <div class="paragraph">
 <p>After deploying the artifacts you have to check the staging repository
 created in Apache&#8217;s Nexus:</p>
@@ -1135,7 +1160,7 @@ for the new version and the announcement of the new version.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/sitemap.xml b/sitemap.xml
index 5922d95..1edfd95 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,158 +1,167 @@
 <?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/release-guide.html</loc>
-        <lastmod>2019-06-04</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/start.html</loc>
-        <lastmod>2019-06-04</lastmod>
-    </url><url>
-        <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_usagetracker.html</loc>
-        <lastmod>2019-06-04</lastmod>
-    </url><url>
-        <loc>https://tamaya.incubator.apache.org/download.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/core.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_validation.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_features.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/quickstart.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jndi.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/examples.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_osgi.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <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/spisupport.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/features.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_spring.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_camel.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_yaml.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_filter.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/usecases.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jodatime.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/highleveldesign.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_remote.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/core.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_yaml.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_collections.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/highleveldesign.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_features.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_cdi.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_hazelcast.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_formats.html</loc>
+        <lastmod>2019-11-17</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-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resolver.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_camel.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/history.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_consul.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/development/possible-contributions.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_filter.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_classloader_support.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_injection.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_functions.html</loc>
+        <lastmod>2019-11-17</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-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resources.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_cdi.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/quickstart.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_etcd.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/release-guide.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_formats.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/development/source.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jndi.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_collections.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_metamodel.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_hazelcast.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_osgi.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_metamodel.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_server.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/api.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/spisupport.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_classloader_support.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/start.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_events.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/development/team.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_functions.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_consul.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jodatime.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_hjson.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_microprofile.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_remote.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_spring.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/usecases.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/tamayaasastandard.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/devguide.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/team.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_etcd.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/source.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_hocon.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/community.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_mutable_config.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/possible-contributions.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_usagetracker.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/download.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/api.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_events.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_injection.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_optional.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_validation.html</loc>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/examples.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/about.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/apidocs/index.html</loc>
-        <lastmod>2019-06-04</lastmod>
+        <lastmod>2019-11-17</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/development/community.html</loc>
+        <lastmod>2019-11-17</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/blog/2018/02/release-03-announcement.html</loc>
         <lastmod>2018-02-08</lastmod>
@@ -169,10 +178,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/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/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/javaone.html</loc>
diff --git a/start.html b/start.html
index d6f52ff..c1c8b25 100644
--- a/start.html
+++ b/start.html
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -144,7 +144,7 @@
 				<h1>Tamaya in 5 minutes - a short introduction</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -215,7 +215,7 @@ powerful environment model and a flexible SPI.</p>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Add <code>org.apache.tamaya:tamaya-core:0.4-incubating-SNAPSHOT</code> to your dependencies.</p>
+<p>Add <code>org.apache.tamaya:tamaya-core:0.5-incubating-SNAPSHOT</code> to your dependencies.</p>
 </li>
 <li>
 <p>Add your config to <code>META-INF/javaconfiguration.properties</code></p>
@@ -258,7 +258,7 @@ or in a clustered Docker environment in production, it stays the same!</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>
diff --git a/examples.html b/tamayaasastandard.html
similarity index 76%
copy from examples.html
copy to tamayaasastandard.html
index 879be63..f84eb12 100644
--- a/examples.html
+++ b/tamayaasastandard.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 	    <meta charset="utf-8"/>
-	    <title>Apache Tamaya: Examples</title>
+	    <title>Tamaya as a Standard</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 	    <meta name="description" content="Homepage of Apache Tamaya (incubating)"/>
 	    <meta name="author" content="Apache Tamaya Project Team"/>
@@ -72,8 +72,8 @@
 								<li><a href="documentation/core.html">Core</a></li>
 								<li><a href="documentation/extensions.html">Extension Guide</a></li>
 								<li class="divider"></li>
-								<li><a href="apidocs/stable/index.html">Javadoc 0.3-incubating (release/stable)</a></li>
-								<li><a href="apidocs/development/index.html">Javadoc 0.4-incubating-SNAPSHOT (development)</a></li>
+								<li><a href="apidocs/stable/index.html">Javadoc 0.4-incubating (release/stable)</a></li>
+								<li><a href="apidocs/development/index.html">Javadoc 0.5-incubating-SNAPSHOT (development)</a></li>
               </ul>
             </li>
 						<li class="dropdown">
@@ -141,79 +141,90 @@
 		<div class="container">
 
 			<div class="page-header">
-				<h1>Apache Tamaya: Examples</h1>
+				<h1>Tamaya as a Standard</h1>
 			</div>
 
-			<p><em>2019-06-04</em></p>
+			<p><em>2019-11-17</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
-<!-- toc disabled -->
+<div class="paragraph">
+<p>Apache Tamaya (incubating) actually supports several configuration standards to
+provide a long term stable configuration solution.</p>
+</div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_tamaya_examples">Tamaya Examples</h2>
+<h2 id="_jsr_382">JSR 382</h2>
 <div class="sectionbody">
-<div class="sect2">
-<h3 id="_minimal">Minimal</h3>
 <div class="paragraph">
-<p>This example shows the basic functionality that is available when Tamaya is used without any further extensions.
-It shows how configuration can be added to the classpath and how it can be accessed.</p>
+<p>Tamaya implements a recent state of the Configuration JSR. The exact commit
+version of the JSR API implemented (the JSR has not yet released any version
+as of now) can be evaluated by looking at the <em>tamaya-jsr382</em> <code>pom.xml</code> in the
+sandbox repository.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_simple_propertysource">Simple PropertySource</h3>
 <div class="paragraph">
-<p>This example shows how to write and register an additional PropertySource and PropertySourceProvider, which is
-the SPI to add your own configuration data and locations. For a more advanced example you may also have a look at
-the provided default metamodels, e.g. the simple metamodel (currently in the experimental part and not shipped with
-the current release).</p>
+<p>To use Tamaya as a JSR-382 Configuration provider you must add the following
+dependency:</p>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+    &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
+    &lt;artifactId&gt;tamaya-jsr382&lt;/artifactId&gt;
+    &lt;version&gt;${tamaya.version}&lt;/version&gt;
+&lt;/dependency&gt;</code></pre>
 </div>
-<div class="sect2">
-<h3 id="_resources">Resources</h3>
-<div class="paragraph">
-<p>This example shows how resources can be located using ANT-styled paths and this feature can help you to implement
-PropertySourceProvider instances that provide configuration for a set of files/folders at a certain (searchable)
-location, as provided by the resource extension_.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_resolver">Resolver</h3>
 <div class="paragraph">
-<p>The resolver example defines a configuration file that illustrates the usage of placeholders that are resolved on
-configuration access, as provided by the <em>resolver extension</em>.</p>
+<p>Since this component is not yet officially released you must use the current snapshot
+version 0.4-incubating-SNAPSHOT. In order for that to work, you need to add the Apache Snapshot Repository to your build:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;repository&gt;
+    &lt;id&gt;apache.snapshots&lt;/id&gt;
+    &lt;name&gt;Apache Development Snapshot Repository&lt;/name&gt;
+    &lt;url&gt;https://repository.apache.org/content/repositories/snapshots/&lt;/url&gt;
+    &lt;releases&gt;
+        &lt;enabled&gt;false&lt;/enabled&gt;
+    &lt;/releases&gt;
+    &lt;snapshots&gt;
+        &lt;enabled&gt;true&lt;/enabled&gt;
+    &lt;/snapshots&gt;
+&lt;/repository&gt;</code></pre>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_injection">Injection</h3>
-<div class="paragraph">
-<p>The injection sample shows how to inject configuration into a created object instance, or how to instantiate a proxied
-configuration template, which provides a type-safe configuration access mechanism. This functionality is provided
-by the <em>injection extension</em>. Hereby neither JSR 330 nor 299 are used, so it is pure and minimal SE based
-implementation.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_fileobserver">FileObserver</h3>
+<div class="sect1">
+<h2 id="_microprofile_configuration_api">Microprofile Configuration API</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>This example shows how the event extension can be used to automatically adapt the current configuration when
-the underlying configuration data is changing, e.g. when new configuration is added to a file folder, or removed or
-adapted.</p>
+<p>Tamaya implements the Microprofile Configuration API Version 1.1. To use Tamaya
+as a Micropropfile Configuration provider you must add the following dependency:</p>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+    &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
+    &lt;artifactId&gt;tamaya-microprofile&lt;/artifactId&gt;
+    &lt;version&gt;${tamaya.version}&lt;/version&gt;
+&lt;/dependency&gt;</code></pre>
 </div>
-<div class="sect2">
-<h3 id="_builder">Builder</h3>
-<div class="paragraph">
-<p>This example shows how to build a Configuration using a simple pure SE builder API as provided by the
-<em>builder extension</em>.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_remote">Remote</h3>
-<div class="paragraph">
-<p>THe remote example shows a simple setup where parts of the Configuration are read remotedly.</p>
 </div>
+<div class="sect1">
+<h2 id="_osgi_configadmin">OSGi ConfigAdmin</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya&#8217;s OSGi Support leverages the OSGi org.osgi.service.cm.ConfigurationAdmin
+configuration manager as defined in OSGi Compendium Version 4.3.1. Hereby
+Tamaya can add or modify Configuration in OSGi, which may trigger change events.
+The exact behaviour can be controlled in many ways. By default Tamaya, does not change
+anything, when deployed in OSGi, without being configured todo so. For details
+check <a href="documentation/extensions/mod_osgi.html">Tamaya&#8217;s OSGi Documentation</a>.</p>
 </div>
 </div>
 </div></p>
@@ -228,7 +239,7 @@ adapted.</p>
 		      <div class="container">
 		        <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> |
+							at <span>2019-11-17</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>