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 2017/02/06 21:31:57 UTC

[2/3] incubator-tamaya-site git commit: TAMAYA-208: Regenerate page.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/blog/2016/tamaya-book.html
----------------------------------------------------------------------
diff --git a/blog/2016/tamaya-book.html b/blog/2016/tamaya-book.html
new file mode 100644
index 0000000..3110921
--- /dev/null
+++ b/blog/2016/tamaya-book.html
@@ -0,0 +1,185 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+	    <meta charset="utf-8"/>
+	    <title>German e-book - Apache Tamaya</title>
+	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	    <meta name="description" content=""/>
+	    <meta name="author" content=""/>
+	    <meta name="keywords" content=""/>
+	    <meta name="generator" content="'JBake '+'${version}"/>
+
+	    <!-- Le styles -->
+	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
+	    <link href="../../css/asciidoctor.css" rel="stylesheet"/>
+	    <link href="../../css/base.css" rel="stylesheet"/>
+	    <link href="../../css/prettify.css" rel="stylesheet"/>
+
+	    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+	    <!--[if lt IE 9]>
+	      <script src="../../js/html5shiv.min.js"></script>
+	    <![endif]-->
+
+	    <!-- Fav and touch icons from ASF -->
+			<link rel="shortcut icon" href="../../favicon.ico"/>
+			<link rel="apple-touch-icon" sizes="57x57" href="../../favicons/apple-touch-icon-57x57.png"/>
+		  <link rel="apple-touch-icon" sizes="60x60" href="../../favicons/apple-touch-icon-60x60.png"/>
+		  <link rel="apple-touch-icon" sizes="72x72" href="../../favicons/apple-touch-icon-72x72.png"/>
+		  <link rel="apple-touch-icon" sizes="76x76" href="../../favicons/apple-touch-icon-76x76.png"/>
+		  <link rel="apple-touch-icon" sizes="114x114" href="../../favicons/apple-touch-icon-114x114.png"/>
+		  <link rel="apple-touch-icon" sizes="120x120" href="../../favicons/apple-touch-icon-120x120.png"/>
+		  <link rel="apple-touch-icon" sizes="144x144" href="../../favicons/apple-touch-icon-144x144.png"/>
+		  <link rel="apple-touch-icon" sizes="152x152" href="../../favicons/apple-touch-icon-152x152.png"/>
+		  <link rel="apple-touch-icon" sizes="180x180" href="../../favicons/apple-touch-icon-180x180.png"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-32x32.png" sizes="32x32"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-194x194.png" sizes="194x194"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-96x96.png" sizes="96x96"/>
+		  <link rel="icon" type="image/png" href="../../favicons/android-chrome-192x192.png" sizes="192x192"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-16x16.png" sizes="16x16"/>
+		  <link rel="manifest" href="../../favicons/manifest.json"/>
+		  <link rel="shortcut icon" href="../../favicons/favicon.ico"/>
+		  <meta name="msapplication-TileColor" content="#603cba"/>
+		  <meta name="msapplication-TileImage" content="../../favicons/mstile-144x144.png"/>
+		  <meta name="msapplication-config" content="../../favicons/browserconfig.xml"/>
+		  <meta name="theme-color" content="#303284"/>
+	</head>
+	<body onload="prettyPrint()">
+	<div id="wrap">
+		<div>
+
+	  <!-- Fixed navbar -->
+      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+						<li><a href="../../start.html">Tamaya in 5 minutes</a></li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../documentation/usecases.html">Use Cases and Requirements</a></li>
+								<li><a href="../../documentation/quickstart.html">Quickstart</a></li>
+								<li><a href="../../documentation/api.html">API</a></li>
+								<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/index.html">Javadoc 0.3-incubating-SNAPSHOT (external)</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Development <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../development/source.html">Sources</a></li>
+								<li><a href="../../development/community.html">Community</a></li>
+								<li><a href="../../development/team.html">Project Team</a></li>
+								<li><a target="_blank" href="https://builds.apache.org/view/S-Z/view/Tamaya/">CI / ASF Jenkins</a></li>
+								<li><a target="_blank" href="https://issues.apache.org/jira/browse/TAMAYA">Issues / ASF Jira</a></li>
+								<li><a href="../../devguide.html">Development Guide</a></li>
+								<li><a href="../../release-guide.html">Release Guide</a></li>
+								<li class="divider"></li>
+								<li><a href="../../development/possible-contributions.html">Possible Contributions</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Releases <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../download.html">Download</a></li>
+								<li><a href="../../history.html">Release History</a></li>
+              </ul>
+            </li>
+<!-- Example:
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li class="dropdown-header">Nav header</li>
+                <li><a href="#">Separated link</a></li>
+                <li><a href="#">One more separated link</a></li>
+              </ul>
+            </li>
+-->
+						<li><a href="../../sitemap.xml">Sitemap</a></li>
+						<li><a href="../../feed.xml">Subscribe</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+	</div>
+		<div class="container">
+
+			<div class="page-header">
+				<h1>German e-book - Apache Tamaya</h1>
+			</div>
+
+			<p><em>2016-01-11</em></p>
+
+			<p><div class="paragraph">
+<p>Anatole Tresch and Thorben Janssen authored a German ebook about Tamaya that derived from a JavaMagzin article series:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://entwickler.de/press/apache-tamaya-196233.html">entwickler.de - e-book</a></p>
+</li>
+<li>
+<p><a href="https://books.google.ch/books?id=SMN-DAAAQBAJ&amp;printsec=frontcover&amp;hl=de#v=onepage&amp;q&amp;f=false">Google book preview</a></p>
+</li>
+<li>
+<p><a href="https://www.amazon.de/Apache-Tamaya-Einstieg-Konfiguration-shortcuts-ebook/dp/B01AIJ7QMM?tag=tendoryuberlin">Apache Tamaya: Einstieg in die Konfiguration in Java (shortcuts 168) Kindle Edition at amazon.de</a></p>
+</li>
+</ul>
+</div></p>
+
+			<hr />
+		</div>
+	</div>
+	<div>
+			<div id="push"></div>
+
+		    <div id="footer">
+		      <div class="container">
+		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
+							at <span>2017-02-06</span>
+						</p>
+						<p>
+								<b>Disclaimer</b>
+                    Apache Tamaya (incubating) is an effort undergoing
+                    incubation at
+                    The Apache Software Foundation (ASF), sponsored by
+                    the name of Apache Incubator. Incubation is required of
+                    all newly accepted projects until a further review indicates
+                    that the infrastructure, communications, and decision making
+                    process have stabilized in a manner consistent with other
+                    successful ASF projects. While incubation status is not
+                    necessarily a reflection of the completeness or stability of
+                    the code, it does indicate that the project has yet to
+                    be fully endorsed by the ASF.<br />
+                    <a href="http://incubator.apache.org/guides/website.html" style="border:0px;" target="_target"><img class="incubator-logo" src="../../logos/egg-logo2.png"/></a>
+							</p>
+		      </div>
+		    </div>
+
+		    <!-- Le javascript
+		    ================================================== -->
+		    <!-- Placed at the end of the document so the pages load faster -->
+		    <script src="../../js/jquery-1.11.1.min.js"></script>
+		    <script src="../../js/bootstrap.min.js"></script>
+		    <script src="../../js/prettify.js"></script>
+
+    	</div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/blog/2016/voxxed-days-zurich.html
----------------------------------------------------------------------
diff --git a/blog/2016/voxxed-days-zurich.html b/blog/2016/voxxed-days-zurich.html
new file mode 100644
index 0000000..d9cb735
--- /dev/null
+++ b/blog/2016/voxxed-days-zurich.html
@@ -0,0 +1,179 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+	    <meta charset="utf-8"/>
+	    <title>Voxxed Days Z�rich - Configuration with Apache Tamaya</title>
+	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	    <meta name="description" content=""/>
+	    <meta name="author" content=""/>
+	    <meta name="keywords" content=""/>
+	    <meta name="generator" content="'JBake '+'${version}"/>
+
+	    <!-- Le styles -->
+	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
+	    <link href="../../css/asciidoctor.css" rel="stylesheet"/>
+	    <link href="../../css/base.css" rel="stylesheet"/>
+	    <link href="../../css/prettify.css" rel="stylesheet"/>
+
+	    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+	    <!--[if lt IE 9]>
+	      <script src="../../js/html5shiv.min.js"></script>
+	    <![endif]-->
+
+	    <!-- Fav and touch icons from ASF -->
+			<link rel="shortcut icon" href="../../favicon.ico"/>
+			<link rel="apple-touch-icon" sizes="57x57" href="../../favicons/apple-touch-icon-57x57.png"/>
+		  <link rel="apple-touch-icon" sizes="60x60" href="../../favicons/apple-touch-icon-60x60.png"/>
+		  <link rel="apple-touch-icon" sizes="72x72" href="../../favicons/apple-touch-icon-72x72.png"/>
+		  <link rel="apple-touch-icon" sizes="76x76" href="../../favicons/apple-touch-icon-76x76.png"/>
+		  <link rel="apple-touch-icon" sizes="114x114" href="../../favicons/apple-touch-icon-114x114.png"/>
+		  <link rel="apple-touch-icon" sizes="120x120" href="../../favicons/apple-touch-icon-120x120.png"/>
+		  <link rel="apple-touch-icon" sizes="144x144" href="../../favicons/apple-touch-icon-144x144.png"/>
+		  <link rel="apple-touch-icon" sizes="152x152" href="../../favicons/apple-touch-icon-152x152.png"/>
+		  <link rel="apple-touch-icon" sizes="180x180" href="../../favicons/apple-touch-icon-180x180.png"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-32x32.png" sizes="32x32"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-194x194.png" sizes="194x194"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-96x96.png" sizes="96x96"/>
+		  <link rel="icon" type="image/png" href="../../favicons/android-chrome-192x192.png" sizes="192x192"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-16x16.png" sizes="16x16"/>
+		  <link rel="manifest" href="../../favicons/manifest.json"/>
+		  <link rel="shortcut icon" href="../../favicons/favicon.ico"/>
+		  <meta name="msapplication-TileColor" content="#603cba"/>
+		  <meta name="msapplication-TileImage" content="../../favicons/mstile-144x144.png"/>
+		  <meta name="msapplication-config" content="../../favicons/browserconfig.xml"/>
+		  <meta name="theme-color" content="#303284"/>
+	</head>
+	<body onload="prettyPrint()">
+	<div id="wrap">
+		<div>
+
+	  <!-- Fixed navbar -->
+      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+						<li><a href="../../start.html">Tamaya in 5 minutes</a></li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../documentation/usecases.html">Use Cases and Requirements</a></li>
+								<li><a href="../../documentation/quickstart.html">Quickstart</a></li>
+								<li><a href="../../documentation/api.html">API</a></li>
+								<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/index.html">Javadoc 0.3-incubating-SNAPSHOT (external)</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Development <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../development/source.html">Sources</a></li>
+								<li><a href="../../development/community.html">Community</a></li>
+								<li><a href="../../development/team.html">Project Team</a></li>
+								<li><a target="_blank" href="https://builds.apache.org/view/S-Z/view/Tamaya/">CI / ASF Jenkins</a></li>
+								<li><a target="_blank" href="https://issues.apache.org/jira/browse/TAMAYA">Issues / ASF Jira</a></li>
+								<li><a href="../../devguide.html">Development Guide</a></li>
+								<li><a href="../../release-guide.html">Release Guide</a></li>
+								<li class="divider"></li>
+								<li><a href="../../development/possible-contributions.html">Possible Contributions</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Releases <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../download.html">Download</a></li>
+								<li><a href="../../history.html">Release History</a></li>
+              </ul>
+            </li>
+<!-- Example:
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li class="dropdown-header">Nav header</li>
+                <li><a href="#">Separated link</a></li>
+                <li><a href="#">One more separated link</a></li>
+              </ul>
+            </li>
+-->
+						<li><a href="../../sitemap.xml">Sitemap</a></li>
+						<li><a href="../../feed.xml">Subscribe</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+	</div>
+		<div class="container">
+
+			<div class="page-header">
+				<h1>Voxxed Days Z�rich - Configuration with Apache Tamaya</h1>
+			</div>
+
+			<p><em>2016-03-03</em></p>
+
+			<p><div class="paragraph">
+<p>Anatole took part in Voxxed Days Z�rich, a recording of his talk is:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://www.youtube.com/watch?v=wgWeDAFET0o">Anatole&#8217;s talk (YouTube)</a></p>
+</li>
+</ul>
+</div></p>
+
+			<hr />
+		</div>
+	</div>
+	<div>
+			<div id="push"></div>
+
+		    <div id="footer">
+		      <div class="container">
+		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
+							at <span>2017-02-06</span>
+						</p>
+						<p>
+								<b>Disclaimer</b>
+                    Apache Tamaya (incubating) is an effort undergoing
+                    incubation at
+                    The Apache Software Foundation (ASF), sponsored by
+                    the name of Apache Incubator. Incubation is required of
+                    all newly accepted projects until a further review indicates
+                    that the infrastructure, communications, and decision making
+                    process have stabilized in a manner consistent with other
+                    successful ASF projects. While incubation status is not
+                    necessarily a reflection of the completeness or stability of
+                    the code, it does indicate that the project has yet to
+                    be fully endorsed by the ASF.<br />
+                    <a href="http://incubator.apache.org/guides/website.html" style="border:0px;" target="_target"><img class="incubator-logo" src="../../logos/egg-logo2.png"/></a>
+							</p>
+		      </div>
+		    </div>
+
+		    <!-- Le javascript
+		    ================================================== -->
+		    <!-- Placed at the end of the document so the pages load faster -->
+		    <script src="../../js/jquery-1.11.1.min.js"></script>
+		    <script src="../../js/bootstrap.min.js"></script>
+		    <script src="../../js/prettify.js"></script>
+
+    	</div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/development/community.html
----------------------------------------------------------------------
diff --git a/development/community.html b/development/community.html
index 3d8e880..58a5ff0 100644
--- a/development/community.html
+++ b/development/community.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya: Community</h1>
 			</div>
 
-			<p><em>2017-01-23</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div class="sect1">
 <h2 id="_users">Users</h2>
@@ -288,7 +288,7 @@ $ irssi
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/development/possible-contributions.html
----------------------------------------------------------------------
diff --git a/development/possible-contributions.html b/development/possible-contributions.html
index 5547371..61aa664 100644
--- a/development/possible-contributions.html
+++ b/development/possible-contributions.html
@@ -124,7 +124,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2017-01-23</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><!-- toc disabled -->
 <h1 id="_apache_tamaya_possible_tasks" class="sect0">Apache Tamaya - Possible Tasks</h1>
@@ -472,7 +472,7 @@ as configured.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/development/source.html
----------------------------------------------------------------------
diff --git a/development/source.html b/development/source.html
index 2d1f8d0..d2259eb 100644
--- a/development/source.html
+++ b/development/source.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya: Source code repositories</h1>
 			</div>
 
-			<p><em>2017-01-23</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -247,7 +247,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-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/development/team.html
----------------------------------------------------------------------
diff --git a/development/team.html b/development/team.html
index 4aaf079..6954771 100644
--- a/development/team.html
+++ b/development/team.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya: Project Team</h1>
 			</div>
 
-			<p><em>2017-01-23</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -286,7 +286,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/devguide.html
----------------------------------------------------------------------
diff --git a/devguide.html b/devguide.html
index 0a30d62..fbe6545 100644
--- a/devguide.html
+++ b/devguide.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya: Development Guide</h1>
 			</div>
 
-			<p><em>2017-01-23</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div class="sect1">
 <h2 id="_suggested_git_workflows">1. Suggested Git Workflows</h2>
@@ -380,7 +380,7 @@ $ git branch -d TAMAYA-XXX</pre>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/api.html
----------------------------------------------------------------------
diff --git a/documentation/api.html b/documentation/api.html
index 1216bf8..3e640d2 100644
--- a/documentation/api.html
+++ b/documentation/api.html
@@ -124,14 +124,14 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2017-01-23</em></p>
+			<p><em>2017-02-06</em></p>
 
 			<p><div class="sect1">
 <h2 id="CoreDesign">Apache Tamaya: API</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Though Tamaya is a very powerful and flexible solution there are basically only a few simple core concepts required
-that are the base of all the other mechanisms. As a starting point we recommend you read the corresponding
+<p>Though Tamaya is a very powerful and flexible solution there are basically only a few simple core concepts required.
+Everything else uses or extends these basic mechanisms. As a starting point we recommend you read the corresponding
 <a href="../highleveldesign.html">High Level Design Documentation</a></p>
 </div>
 </div>
@@ -145,11 +145,11 @@ that are the base of all the other mechanisms. As a starting point we recommend
 <div class="ulist">
 <ul>
 <li>
-<p>A simple but complete SE <strong>API</strong> for accessing key/value based <em>Configuration</em>:</p>
+<p>The package org.apache.tamaya defines a simple but complete SE <strong>API</strong> for accessing key/value based <em>Configuration</em>:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Configuration hereby models configuration, the main interface of Tamaya. Configuration provides</p>
+<p>Configuration hereby models <em>configuration</em>, the main interface of Tamaya. Configuration provides</p>
 <div class="ulist">
 <ul>
 <li>
@@ -169,8 +169,8 @@ a function ConfigurationQuery&lt;T&gt;.</p>
 <p>ConfigException defines a runtime exception for usage by the configuration system.</p>
 </li>
 <li>
-<p>TypeLiteral provides a possibility to type safely define the target type to be returned by a registered
-PropertyProvider.</p>
+<p>TypeLiteral provides a possibility to type safely define the target type to be returned in case non-String types
+are accessed.</p>
 </li>
 <li>
 <p>PropertyConverter, which defines conversion of configuration values (String) into any required target type.</p>
@@ -179,72 +179,73 @@ PropertyProvider.</p>
 </div>
 </li>
 <li>
-<p>Additionally the <strong>SPI</strong> provides:</p>
+<p>The package org.apache.tamaya.spi provides interfaces used for extending and/or
+adapting Tamaya&#8217;s core functionality, as well as artifacts for creating
+Configuration instances programmatically:</p>
 <div class="ulist">
 <ul>
 <li>
-<p><em>PropertySource:</em> is the the SPI for adding configuration data. A PropertySource hereby</p>
+<p><em>PropertySource:</em> is the the interface to be implemented for adding configuration entries. A PropertySource hereby</p>
 <div class="ulist">
 <ul>
 <li>
-<p>is designed as a minimalistic interface that be implemented by any kind of data provider (local or remote)</p>
+<p>is minimalistic and can be implemented in any way. E.g. there is no distiction that
+the configuration data provided is managed locally, remotedely. There is even no
+requirement that the configuration data is always fully available. Summarizing a
+PropertySource</p>
 </li>
 <li>
-<p>provides single access for key/value pairs in raw format as String key/values only (getPropertyValue).</p>
+<p>provides String based property access for single key/value pairs in <em>raw</em> format (meaning no postprocessing
+is applied yet).</p>
 </li>
 <li>
-<p>can optionally support scanning of its provided values, implementing getProperties().</p>
+<p>can <em>optionally</em> provide access to a Map&lt;String,String&gt;, providing all its properties at once.</p>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p><em>PropertySourceProvider:</em> allows to register multiple property sources dynamically, e.g. all config files found in
-file system folder..</p>
+<p><em>PropertySourceProvider:</em> allows to automatically register multiple property sources, e.g. all config files found in
+a file system folder..</p>
 </li>
 <li>
-<p>ConfigurationProviderSpi defines the SPI that is used as a backing bean for the ConfigurationProvider
-singleton.</p>
+<p>ConfigurationProviderSpi defines the interface to be implemented by the delegating bean that is implementing the
+ConfigurationProvider singleton.</p>
 </li>
 <li>
-<p>PropertyFilter, which allows filtering of property values prior getting returned to the caller.</p>
+<p>PropertyFilter allows filtering of property values prior getting returned to the caller. Filters by default are
+registered as global filters, filtering <em>raw</em> values. The final String value of a configuration entry is the
+final value after all registered filters have been applied.</p>
 </li>
 <li>
-<p>PropertyValueCombinationPolicy optionally can be registered to change the way how different key/value
-pairs are combined to build up the final Configuration passed over to the filters registered.</p>
+<p>A PropertyValueCombinationPolicy optionally can be registered to change the logic how key/value
+pairs from subsequent property sources in the property source chain are combined to calculate the final
+<em>raw</em> value passed over to the filters registered.</p>
 </li>
 <li>
-<p>ConfigurationContext, which provides a container for all the artifacts needed to build up a Configuration.
-For example a context contains the property sources, property filters, converters and combination policy used.
-Also the ordering of the property sources is defined by the context. A context instance given a
-Configuration can be created by calling ConfigurationProvider.createConfiguration(context);.</p>
+<p>A ConfigurationContext is the container of all inner components (PropertySource, PropertyFilter,
+PropertyValueCombinationPolicy, PropertyConverter) required to implement a Configuration. Also the ordering
+of the property sources, filters and converters is defined by the context.
+A ConfigurationContext is automatically created on startup collecting and adding all registered artifacts.
+Based on this ConfigurationContext the <em>default</em> Configuration is created, which can be accessed from
+ConfigurationProvider.getConfiguration.
+Summarizing a ConfigurationContext contains the ordered property sources, property filters, converters and combination
+policy used. Once a ConfigurationContext is instanciated a corresponding Configuration instance can be
+created easily by calling ConfigurationProvider.createConfiguration(context).</p>
 </li>
 <li>
-<p>Similarly a ConfigurationContext can be created using a ConfigurationContextBuilder. This builder can be
-obtained calling ConfigurationProvider.getConfigurationContextBuilder();.</p>
+<p>Finally Tamaya also supports <em>programmatically</em> creating Configuration instances and using them in your code
+as needed. This can be achieved most easily by building a custom ConfigurationContext using a
+ConfigurationContextBuilder. This builder can be obtained calling ConfigurationProvider.getConfigurationContextBuilder();.</p>
 </li>
 <li>
-<p>ServiceContext, which provides access to the components loaded, depending on the current runtime stack.</p>
-</li>
-<li>
-<p>ServiceContextManager provides static access to the ServiceContext loaded.</p>
-</li>
-</ul>
-</div>
+<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
+extension programmers will not have to deal with these two artifacts.</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>This is also reflected in the main packages of the API:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>org.apache.tamaya contains the main API abstractions used by users.</p>
-</li>
-<li>
-<p>org.apache.tamaya.spi contains the SPI interfaces to be implemented by implementations and the ServiceContext
-mechanism.</p>
 </li>
 </ul>
 </div>
@@ -356,8 +357,8 @@ accessible.</p>
 <div class="sect2">
 <h3 id="_configuration">Configuration</h3>
 <div class="paragraph">
-<p>Configuration is the main API provided by Tamaya. It allows reading of single property values or the whole
-property map, but also supports type safe access:</p>
+<p>Configuration is the main artifact provided by Tamaya. It allows reading of single property values or all known
+properties, but also supports type safe access:</p>
 </div>
 <div class="listingblock">
 <div class="title">Interface Configuration</div>
@@ -397,6 +398,9 @@ be included.</p>
 <li>
 <p>getOrDefault allows to pass default values as needed, returned if the requested value evaluated to null.</p>
 </li>
+<li>
+<p>getConfigurationContext() allows access to the underlying components of a Configuration instance.</p>
+</li>
 </ul>
 </div>
 <div class="paragraph">
@@ -437,35 +441,35 @@ be included.</p>
 </div>
 </div>
 <div class="paragraph">
-<p>Hereby the singleton is backed up by an instance of ConfigurationProviderSpi.</p>
+<p>Hereby the singleton is backed up by an instance of ConfigurationProviderSpi, which is managed by the
+ServiceContextManager (see later).</p>
 </div>
 <div class="sect3">
 <h4 id="PropertyConverter">Property Type Conversion</h4>
 <div class="paragraph">
-<p>As illustrated in the previous section, Configuration also to access non String types. Nevertheless internally
-all properties are strictly modelled as pure Strings only, so non String types must be derived by converting the
-configured String values into the required target type. This is achieved with the help of PropertyConverters:</p>
+<p>As illustrated in the previous section, Configuration also allows access of typed values. Internally
+all properties are strictly modelled as Strings. As a consequence non String values must be derived by converting the
+String values into the required target type. This is achieved with the help of PropertyConverters:</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface PropertyConverter&lt;T&gt;{
     T convert(String value, ConversionContext context);
-    //X TODO Collection&lt;String&gt; getSupportedFormats();
 }</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>The ConversionContext contains additional meta-information for the accessed key, inclusing the key&#8217;a name and
-additional metadata.</p>
+<p>The ConversionContext contains additional meta-information about the key accessed, including the key&#8217;a name and
+additional metadata. This can be very useful, e.g. when the implementation of a PropertyConverter requires additional
+metadata for determining the correct conversion to be applied.</p>
 </div>
 <div class="paragraph">
-<p>PropertyConverter instances can be implemented and registered by default using the ServiceLoader. Hereby
-a configuration String value is passed to all registered converters for a type in order of their annotated @Priority
-value. The first non-null result of a converter is then returned as the current configuration value.</p>
+<p>PropertyConverter instances can be implemented and registered by default using the Java ServiceLoader. The ordering
+of the registered converters, by default, is based on the annotated @Priority values (priority 0 is assumed if the
+annotation is missing). The first non-null result of a converter is returned as the final configuration value.</p>
 </div>
 <div class="paragraph">
-<p>Access to converters is provided by the current ConfigurationContext, which is accessible from
-the ConfigurationProvider singleton.</p>
+<p>Access to converters is provided by the current ConfigurationContext, which is accessible calling Configuration.getConfigurationContext().</p>
 </div>
 </div>
 </div>
@@ -473,8 +477,8 @@ the ConfigurationProvider singleton.</p>
 <h3 id="ExtensionPoints">Extension Points</h3>
 <div class="paragraph">
 <p>We are well aware of the fact that this library will not be able to cover all kinds of use cases. Therefore
-we have added functional extension mechanisms to Configuration that were used in other areas of the Java eco-system
-as well:</p>
+we have added <em>functional</em> extension mechanisms to Configuration that were used in other areas of the
+Java eco-system (e.g. Java Time API and JSR 354) as well:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -542,11 +546,11 @@ ConfigSecurity is an arbitrary class only for demonstration purposes.
 <h3 id="PropertySource">Interface PropertySource</h3>
 <div class="paragraph">
 <p>We have seen that constraining configuration aspects to simple literal key/value pairs provides us with an easy to
-understand, generic, flexible, yet expendable mechanism. Looking at the Java language features a java.util.Map&lt;String,
+understand, generic, flexible, yet extensible mechanism. Looking at the Java language features a java.util.Map&lt;String,
 String&gt; and java.util.Properties basically model these aspects out of the box.</p>
 </div>
 <div class="paragraph">
-<p>Though there are advantages in using these types as a model, there are some severe drawbacks, notably implementation
+<p>Though there are advantages in using these types as a model, there are some drawbacks. Notably implementation
 of these types is far not trivial and the collection API offers additional functionality not useful when aiming
 for modelling simple property sources.</p>
 </div>
@@ -557,7 +561,7 @@ identified to be necessary:</p>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface PropertySource{
-      int getOrdinal();
+      int getOrdinal(); // This feature is under discussion
       String getName();
       String get(String key);
       boolean isScannable();
@@ -578,14 +582,14 @@ identified to be necessary:</p>
 keySet as well as streaming operations then can be applied on the returned Map instance.</p>
 </li>
 <li>
-<p>But not in all scenarios a property source may be scannable, e.g. when looking up keys is very inefficient, it
-may not make sense to iterator over all keys to collect the corresponding properties.
-This can be evaluated by calling isScannable(). If a PropertySource is defined as non scannable accesses to
+<p>But not in all scenarios a property source is able to provide all values at once (aka to be <em>scannable</em>), e.g.
+when looking up keys is very inefficient, it may not make sense to iterate over all keys to collect the corresponding
+properties. If a PropertySource is defined as non scannable accesses to
 getProperties() may not return all key/value pairs that would be available when accessed directly using the
-String get(String) method.</p>
+String get(String) method. The fact if a PropertySource is <em>scannable</em> can be determined by calling isScannable().</p>
 </li>
 <li>
-<p>getOrdinal() defines the ordinal of the PropertySource. Property sources are managed in an ordered chain, where
+<p>TODO Feature is in question: getOrdinal() defines the ordinal of the PropertySource. Property sources are managed in an ordered chain, where
 property sources with higher ordinals override the ones with lower ordinals. If ordinal are the same, the natural
 ordering of the fulloy qualified class names of the property source implementations are used. The reason for
 not using @Priority annotations is that property sources can define dynamically their ordinals, e.g. based on
@@ -603,8 +607,9 @@ provided by a data grid, a database, the JNDI tree or other resources. Or it can
 property sources with additional combination/aggregation rules in place.</p>
 </div>
 <div class="paragraph">
-<p>PropertySources are by default registered using the Java ServiceLoader or the mechanism provided by the current
- active ServiceContext.</p>
+<p>PropertySources to be picked up automatically and be added to the <em>default</em> Configuration, must be registered
+using the Java +ServiceLoader (or the mechanism provided by the current active ServiceContext, see later in this
+document for further details).</p>
 </div>
 </div>
 <div class="sect2">
@@ -633,8 +638,8 @@ current active ServiceContext.</p>
 <div class="sect2">
 <h3 id="PropertyFilter">Interface PropertyFilter</h3>
 <div class="paragraph">
-<p>Also PropertyFilters can be added to a Configuration. They are evaluated before a Configuration instance is
-passed to the user. Filters can hereby used for multiple purposes, such as</p>
+<p>Also PropertyFilters can be added to a Configuration. They are evaluated each time before a configuration value
+is passed to the user. Filters can be used for multiple purposes, such as</p>
 </div>
 <div class="ulist">
 <ul>
@@ -653,9 +658,10 @@ passed to the user. Filters can hereby used for multiple purposes, such as</p>
 </ul>
 </div>
 <div class="paragraph">
-<p>PropertyFilters are by default registered using the Java ServiceLoader or the mechanism provided by the current
-active ServiceContext. Similar to property sources they are managed in an ordered filter chain, based on the
-applied @Priority annotations.</p>
+<p>For PropertyFilters to be picked up automatically and added to the <em>default</em> Configuration must be,by default,
+registered using the Java ServiceLoader (or the mechanism provided by the current active ServiceContext).
+Similar to property sources they are managed in an ordered filter chain, based on the
+class level @Priority annotations (assuming 0 if none is present).</p>
 </div>
 <div class="paragraph">
 <p>A PropertyFilter is defined as follows:</p>
@@ -674,7 +680,7 @@ public interface PropertyFilter{
 <div class="ulist">
 <ul>
 <li>
-<p>returning null will remove the key from the final result</p>
+<p>returning null will remove the key from the final result.</p>
 </li>
 <li>
 <p>non null values are used as the current value of the key. Nevertheless for resolving multi-step dependencies
@@ -682,7 +688,7 @@ filter evaluation has to be continued as long as filters are still changing some
 To prevent possible endless loops after a defined number of loops evaluation is stopped.</p>
 </li>
 <li>
-<p>FilterContext provides additional metdata, inclusing the key accessed, which is useful in many use cases.</p>
+<p>FilterContext provides additional metdata, including the key accessed, which is useful in many use cases.</p>
 </li>
 </ul>
 </div>
@@ -692,13 +698,10 @@ To prevent possible endless loops after a defined number of loops evaluation is
 <div class="sect3">
 <h4 id="PropertyValueCombinationPolicy">Interface PropertyValueCombinationPolicy</h4>
 <div class="paragraph">
-<p>This interface can be implemented optional. It can be used to adapt the way how property key/value pairs are combined to
-build up the final Configuration to be passed over to the PropertyFilters. The default implementation is just
-overriding all values read before with the new value read. Nevertheless for collections and other use cases it is
-often useful to have alternate combination policies in place, e.g. for combining values from previous sources with the
-new value. Finally looking at the method&#8217;s signature it may be surprising to find a Map for the value. The basic
-value hereby is defined by currentValue.get(key). Nevertheless the Map may also contain additional meta entries,
-which may be considered by the policy implementation.</p>
+<p>This interface is purely optional and can be used to adapt the way how property key/value pairs are combined to
+build up the final configuration <em>raw</em> value to be passed over to the PropertyFilters. The default implementation
+is just overriding all values read before with the new value read. Nevertheless for collections and other use cases
+more intelligent logic is required.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -715,27 +718,33 @@ public interface PropertyValueCombinationPolicy{
        }
    };
 
-   String collect(Map&lt;String,String&gt; currentValue currentValue, String key,
+   Map&lt;String,String&gt; collect(Map&lt;String,String&gt; currentValue currentValue, String key,
                   PropertySource propertySource);
 
 }</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Looking at the collect method&#8217;s signature it may be surprising to find a Map for the return type.
+This is because returning a Map allows also to filter/combine/use meta entries (by default entries starting
+with an '_').</p>
+</div>
 </div>
 <div class="sect3">
 <h4 id="ConfigurationContext">The Configuration Context</h4>
 <div class="paragraph">
-<p>A Configuration is created from a ConfigurationContext, which is
-accessible from Configuration.getContext():</p>
+<p>A Configuration is created from a ConfigurationContext. Each Configuration instance provides it&#8217;s underlying
+context by Configuration.getContext():</p>
 </div>
 <div class="listingblock">
 <div class="title">Accessing the current ConfigurationContext</div>
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationContext context = ConfigurationProvider.getConfiguration().getContext();</code></pre>
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ...;
+ConfigurationContext context = config.getContext();</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>The ConfigurationContext provides access to the internal artifacts that determine the final Configuration and
+<p>The ConfigurationContext provides access to the internal artifacts that determine the Configuration and
 also defines the ordering of the property sources, filters and converters contained:</p>
 </div>
 <div class="ulist">
@@ -782,7 +791,7 @@ tests executed.</p>
 </ul>
 </div>
 <div class="paragraph">
-<p>In such cases the ConfigurationContext must be changed, meaning it must be possible:</p>
+<p>In such cases the ConfigurationContext may change, meaning it must be possible:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -801,8 +810,9 @@ tests executed.</p>
 </ul>
 </div>
 <div class="paragraph">
-<p>This can be achieved by obtaining an instance of ConfigurationContextBuilder. Instances of this builder can be
-accessed either</p>
+<p>This is nothing new, a ConfigurationContextBuilder already allows us to achive this. So we must only ensure that
+we can easily create a new ConfigurationContextBuilder using a given ConfigurationContext as input. This can be
+done by</p>
 </div>
 <div class="ulist">
 <ul>
@@ -811,7 +821,8 @@ accessed either</p>
 current ConfigurationContext.</p>
 </li>
 <li>
-<p>calling ConfigurationProvider.getConfigurationContextBuilder().</p>
+<p>calling ConfigurationProvider.getConfigurationContextBuilder() and then applying the current ConfigurationContext
+by calling setContext(ConfigurationContext) on the ConfigurationContextBuilder instance.</p>
 </li>
 </ul>
 </div>
@@ -823,7 +834,7 @@ ConfigurationContextBuilder emptyContextBuilder = ConfigurationProvider.getConfi
 </div>
 </div>
 <div class="paragraph">
-<p>With such a builder a new ConfigurationContext can be created and then applied:</p>
+<p>Finally when we are finished a new ConfigurationContext can be created:</p>
 </div>
 <div class="listingblock">
 <div class="title">Creating and applying a new ConfigurationContext</div>
@@ -836,8 +847,9 @@ ConfigurationContextBuilder emptyContextBuilder = ConfigurationProvider.getConfi
 </div>
 </div>
 <div class="paragraph">
-<p>Hereby the builder provides several methods for adding, removing of property sources and also operations
-for programmatically change the property sourcepriorities, e.g.</p>
+<p>But let&#8217;s also have a deeper look at what functionality a ConfigurationContextBuilder provides. Basically such a
+builder allows to add, remove or reorder property sources, converters and filters or changing any other aspect
+of a ConfigurationContext:</p>
 </div>
 <div class="listingblock">
 <div class="title">Chain manipulation using ConfigurationContextBuilder</div>
@@ -853,8 +865,9 @@ builder.sortPropertyFilters(MyFilterComparator::compare);</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>Finally if the new context is ready a new configuration can be created, or the context is applied to the
-current configuration.</p>
+<p>Finally if the new ConfigurationContext is ready a new Configuration can be created.
+Optionally the new Configuration can also be installed as the new <em>default</em> Configuration
+instace as illustrated below:</p>
 </div>
 <div class="listingblock">
 <div class="title">Creating and applying a new ConfigurationContext</div>
@@ -865,18 +878,18 @@ current configuration.</p>
 Configuration newConfig = ConfigurationProvider.createConfiguration(context);
 
 // Apply the new context to replace the current configuration:
-ConfigurationProvider.setConfigurationContext(context);</code></pre>
+ConfigurationProvider.setConfiguration(newConfig);</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>Hereby ConfigurationProvider.setConfigurationContext(context) can throw an UnsupportedOperationException.
-This can be checked by calling the method boolean ConfigurationProvider.isConfigurationContextSettable().</p>
+<p>Hereby ConfigurationProvider.setConfiguration(Configuration) can throw an UnsupportedOperationException.
+This can be checked by calling the method boolean ConfigurationProvider.isConfigurationSettable().</p>
 </div>
 </div>
 <div class="sect3">
 <h4 id="ConfigurationProviderSpi">Implementing and Managing Configuration</h4>
 <div class="paragraph">
-<p>One of the most important SPI in Tamaya if the ConfigurationProviderSpi interface, which is backing up the
+<p>One of the most important SPI in Tamaya is the ConfigurationProviderSpi interface, which is backing up the
 ConfigurationProvider singleton. Implementing this class allows</p>
 </div>
 <div class="ulist">
@@ -885,10 +898,10 @@ ConfigurationProvider singleton. Implementing this class allows</p>
 <p>to fully determine the implementation class for Configuration</p>
 </li>
 <li>
-<p>to manage the current ConfigurationContext in the scope and granularity required.</p>
+<p>to manage the current Configuration in the scope and granularity required.</p>
 </li>
 <li>
-<p>to provide access to the right Configuration/ConfigurationContext based on the current runtime context.</p>
+<p>to provide access to the right Configuration based on the current runtime context.</p>
 </li>
 <li>
 <p>Performing changes as set with the current ConfigurationContextBuilder.</p>
@@ -918,7 +931,7 @@ Configuration config = builder.build();</code></pre>
 </div>
 <div class="paragraph">
 <p>Basically the builder allows to create configuration instances completely independent of the current configuration
-setup. This gives you full control on the Configuration setup.</p>
+setup. This gives you full control how and when Configuration is created.</p>
 </div>
 </div>
 <div class="sect2">
@@ -940,7 +953,7 @@ creating a configuration based on a configuration context is already implemented
 API.</p>
 </div>
 <div class="paragraph">
-<p>Similarly you can add filters:</p>
+<p>Similarly you can add PropertyFilters:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -958,7 +971,8 @@ API.</p>
 <div class="sect3">
 <h4 id="ServiceContext">The ServiceContext</h4>
 <div class="paragraph">
-<p>The ServiceContext is also a very important SPI, which allows to define how components are loaded in Tamaya.
+<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.
 The ServiceContext hereby defines access methods to obtain components, whereas itself it is available from the
 ServiceContextManager singleton:</p>
 </div>
@@ -984,8 +998,8 @@ public interface ServiceContext{
 the most significant instance is returned only.</p>
 </li>
 <li>
-<p>access all items given its type. This will return (by default) all  instances loadedable from the current
-runtime context, ordered by priority, hereby the most significant components added first.</p>
+<p>access all items given a type. This will return (by default) all  instances loadedable from the current
+runtime context, ordered by priority (the most significant components added first).</p>
 </li>
 </ol>
 </div>
@@ -1095,7 +1109,7 @@ property to our JVM:</p>
 <h2 id="APIImpl">API Implementation</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>The API is implemented by the Tamaya-Core-module. Refer to the <a href="core.html">Core documentation</a> for
+<p>The API is implemented by the tamaya-core module. Refer to the <a href="core.html">Core documentation</a> for
 further details.</p>
 </div>
 </div>
@@ -1111,7 +1125,7 @@ further details.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/core.html
----------------------------------------------------------------------
diff --git a/documentation/core.html b/documentation/core.html
index 5da510d..13adbfc 100644
--- a/documentation/core.html
+++ b/documentation/core.html
@@ -124,7 +124,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2017-01-23</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div class="sect1">
 <h2 id="Core">Tamaya Core Implementation</h2>
@@ -568,7 +568,7 @@ Loading extensions hereby is trivial: you only are required to add the correspon
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions.html
----------------------------------------------------------------------
diff --git a/documentation/extensions.html b/documentation/extensions.html
index 7ade199..3138a99 100644
--- a/documentation/extensions.html
+++ b/documentation/extensions.html
@@ -124,7 +124,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_extension_modules">Apache Tamaya: Extension Modules</h2>
@@ -379,7 +379,7 @@ All extensions currently run on Java 7 as well as on Java 8.
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_camel.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_camel.html b/documentation/extensions/mod_camel.html
index 31e51d7..df0af38 100644
--- a/documentation/extensions/mod_camel.html
+++ b/documentation/extensions/mod_camel.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Integration with Apache Camel</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -285,7 +285,7 @@ again use Tamaya as the main configuration solutions only using Camel&#8217;s de
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_cdi.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_cdi.html b/documentation/extensions/mod_cdi.html
index 4937824..9976c04 100644
--- a/documentation/extensions/mod_cdi.html
+++ b/documentation/extensions/mod_cdi.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Classloader Isolation Support</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -418,7 +418,7 @@ default section parts.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_classloader_support.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_classloader_support.html b/documentation/extensions/mod_classloader_support.html
index 1ff4bce..b572d4a 100644
--- a/documentation/extensions/mod_classloader_support.html
+++ b/documentation/extensions/mod_classloader_support.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Classloader Isolation Support</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -254,7 +254,7 @@ hierarchies:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_collections.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_collections.html b/documentation/extensions/mod_collections.html
index 73bd83a..cb2ce0b 100644
--- a/documentation/extensions/mod_collections.html
+++ b/documentation/extensions/mod_collections.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Collection Support</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -441,7 +441,7 @@ _redefined-map.item-separator=|</code></pre>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_consul.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_consul.html b/documentation/extensions/mod_consul.html
index 437fdb7..4ea0177 100644
--- a/documentation/extensions/mod_consul.html
+++ b/documentation/extensions/mod_consul.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Integration with consul (Hashicorp)</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -220,7 +220,7 @@ set to cluster-config. a consul key of host:known/all is mapped to cluster-confi
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_environment.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_environment.html b/documentation/extensions/mod_environment.html
index 589c1d2..a448bb1 100644
--- a/documentation/extensions/mod_environment.html
+++ b/documentation/extensions/mod_environment.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Classloader Isolation Support</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -190,7 +190,7 @@ combines them in the given order into an (optional) root context within the syst
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_etcd.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_etcd.html b/documentation/extensions/mod_etcd.html
index 4bcd2e4..290fb11 100644
--- a/documentation/extensions/mod_etcd.html
+++ b/documentation/extensions/mod_etcd.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Integration with etcd (Core OS)</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -356,7 +356,7 @@ set to cluster-config. a etcd key of host:known/all is mapped to cluster-config.
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_events.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_events.html b/documentation/extensions/mod_events.html
index 1ca8dac..4588de9 100644
--- a/documentation/extensions/mod_events.html
+++ b/documentation/extensions/mod_events.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Events</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -525,7 +525,7 @@ active (by default using the Java ServiceLoader mechanism).</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_filter.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_filter.html b/documentation/extensions/mod_filter.html
index 3c7c816..4558171 100644
--- a/documentation/extensions/mod_filter.html
+++ b/documentation/extensions/mod_filter.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: User Filtering</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -276,7 +276,7 @@ managed filters:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_formats.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_formats.html b/documentation/extensions/mod_formats.html
index 03d3723..f21ba6b 100644
--- a/documentation/extensions/mod_formats.html
+++ b/documentation/extensions/mod_formats.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Formats</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -434,7 +434,7 @@ module hereby ships with 3 format classes:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_functions.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_functions.html b/documentation/extensions/mod_functions.html
index 95d14a7..491dcab 100644
--- a/documentation/extensions/mod_functions.html
+++ b/documentation/extensions/mod_functions.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Functions</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -310,7 +310,7 @@ in <em>sectionKeys</em> from a given <em>key</em>.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_injection.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_injection.html b/documentation/extensions/mod_injection.html
index dc3ce95..c96fd8a 100644
--- a/documentation/extensions/mod_injection.html
+++ b/documentation/extensions/mod_injection.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Injection</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -671,7 +671,7 @@ The event published is very simple:
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_jodatime.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_jodatime.html b/documentation/extensions/mod_jodatime.html
index 961d4cc..90cbf77 100644
--- a/documentation/extensions/mod_jodatime.html
+++ b/documentation/extensions/mod_jodatime.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: JodaTime</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -194,7 +194,7 @@ DateTime pit = configuration.get("pointInTime", DateTime.class)</code></pre>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_json.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_json.html b/documentation/extensions/mod_json.html
index 98db02b..95f2ace 100644
--- a/documentation/extensions/mod_json.html
+++ b/documentation/extensions/mod_json.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Builder</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -212,7 +212,7 @@ according property maps. E.g. the following file is a simple and correct JSON co
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_management.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_management.html b/documentation/extensions/mod_management.html
index 30c4894..d1f5ff1 100644
--- a/documentation/extensions/mod_management.html
+++ b/documentation/extensions/mod_management.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: JMX Management Access</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -272,7 +272,7 @@ The instance of ManagedConfigMBean to be created and registered is evaluated by
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_metamodel-staged.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_metamodel-staged.html b/documentation/extensions/mod_metamodel-staged.html
index aa4aa53..94c0006 100644
--- a/documentation/extensions/mod_metamodel-staged.html
+++ b/documentation/extensions/mod_metamodel-staged.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Staged PropertySources</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -227,7 +227,7 @@ provided classes (org.apache.tamaya.staged.StagedConfigPropertiesProvider,</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_model.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_model.html b/documentation/extensions/mod_model.html
index 45e6953..ab61af3 100644
--- a/documentation/extensions/mod_model.html
+++ b/documentation/extensions/mod_model.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Model Documentation and Validation</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -767,7 +767,7 @@ Tamaya&#8217;s injection modules).</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_mutable_config.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_mutable_config.html b/documentation/extensions/mod_mutable_config.html
index b66eb18..104a727 100644
--- a/documentation/extensions/mod_mutable_config.html
+++ b/documentation/extensions/mod_mutable_config.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Mutable Configuration</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -480,7 +480,7 @@ singleton accessor:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_optional.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_optional.html b/documentation/extensions/mod_optional.html
index 73ee35c..ecd9b16 100644
--- a/documentation/extensions/mod_optional.html
+++ b/documentation/extensions/mod_optional.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Optional Tamaya Configuration</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -200,7 +200,7 @@ featured config please consider using the Apache Tamaya as a full configuration
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_osgi.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_osgi.html b/documentation/extensions/mod_osgi.html
index 485cdbe..d4e14ac 100644
--- a/documentation/extensions/mod_osgi.html
+++ b/documentation/extensions/mod_osgi.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extensions: OSGI Integrations</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-02-06</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -158,7 +158,7 @@ runtimes:</p>
 <p>Apache Karaf, version 4.0.7</p>
 </li>
 <li>
-<p>tbd: Apache Felix, version x.x.x.</p>
+<p>Apache Felix, version 5.6.1.</p>
 </li>
 <li>
 <p>tbd: Eclipse Equinox, version x.x.x.</p>
@@ -174,10 +174,13 @@ environment:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing"># API and core
+<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:{tamaya_version}
-org.apache.geronimo.specs:geronimo-annotation_1.2_spec:1.0-alpha-1
 org.apache.tamaya:tamaya-core:{tamaya_version}
+org.apache.tamaya:tamaya-spisupport:{tamaya_version}
 org.apache.tamaya.ext:tamaya-functions:{tamaya_version}
 org.apache.tamaya.ext:tamaya-osgi:{tamaya_version}</code></pre>
 </div>
@@ -273,57 +276,7 @@ key=common.net.port
 <h4 id="_apache_karaf">Apache Karaf</h4>
 <div class="paragraph">
 <p>Apache Tamaya provides a Karaf feature with all required dependencies
-as</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_tamaya_based_injection">Tamaya based Injection</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_what_functionality_ir_provided">What functionality ir provided ?</h3>
-<div class="paragraph">
-<p>OSGI itself already provides injection and configuration mechanism. Since Tamaya is working in the back
-you can continue to use the mechanism of your choice. Nevertheless Tamaya also supports enabling Tamaya
-specific configuration injection.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_installation_2">Installation</h3>
-<div class="paragraph">
-<p>To benefit from Tamaya&#8217;s injection mechanism in your OSGI services you need additionally to the basic
-OSGI support described earlier in this document:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">org.apache.geronimo.specs:geronimo-atinject_1.0_spec:1.0
-org.apache.tamaya.ext:tamaya-inject-api:{tamaya_version}
-org.apache.tamaya.ext:tamaya-inject:{tamaya_version}
-org.apache.tamaya.ext:tamaya-inject-osgi:{tamaya_version}</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_example">Example</h3>
-<div class="paragraph">
-<p>As an example, what is possible you can implement and register an OSGI service and use Tamaya&#8217;s injection
-API for configuring it:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class HelloServiceImpl implements HelloService{
-
-    @Config(value={"example.message"}, defaultValue="A Tamaya default.")
-    private String message;
-
-    @Override
-    public String sayHello() {
-        System.err.println("HELLO: " + message);
-        return message;
-    }
-}</code></pre>
+as org.apache.tamaya.ext:tamaya-karaf-features:{tamaya-version}:features:xml.</p>
 </div>
 </div>
 </div>
@@ -340,7 +293,7 @@ API for configuring it:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_remote.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_remote.html b/documentation/extensions/mod_remote.html
index e9ab787..16a881a 100644
--- a/documentation/extensions/mod_remote.html
+++ b/documentation/extensions/mod_remote.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Remote Configuration</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -263,7 +263,7 @@ PropertySource.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_resolver.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_resolver.html b/documentation/extensions/mod_resolver.html
index 1828343..617cf0d 100644
--- a/documentation/extensions/mod_resolver.html
+++ b/documentation/extensions/mod_resolver.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Resolver</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div class="sect1">
 <h2 id="Resolver">Tamaya Resolver (Extension Module)</h2>
@@ -288,7 +288,7 @@ the default implementation in place.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_resources.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_resources.html b/documentation/extensions/mod_resources.html
index 162b68d..7b196e5 100644
--- a/documentation/extensions/mod_resources.html
+++ b/documentation/extensions/mod_resources.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Resources</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div class="sect1">
 <h2 id="Resources">Tamaya Resources (Extension Module)</h2>
@@ -307,7 +307,7 @@ on your own.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_server.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_server.html b/documentation/extensions/mod_server.html
index 5c6c658..dbaddd3 100644
--- a/documentation/extensions/mod_server.html
+++ b/documentation/extensions/mod_server.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Configuration Server</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -557,7 +557,7 @@ class loads all registered ScopeProvider and manages the configured scope instan
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_spi-support.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_spi-support.html b/documentation/extensions/mod_spi-support.html
index e5375f7..cb52a0c 100644
--- a/documentation/extensions/mod_spi-support.html
+++ b/documentation/extensions/mod_spi-support.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Classloader Isolation Support</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -219,7 +219,7 @@ of the Tamaya API similarly.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_spring.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_spring.html b/documentation/extensions/mod_spring.html
index 0a54507..9488e7d 100644
--- a/documentation/extensions/mod_spring.html
+++ b/documentation/extensions/mod_spring.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Spring Integration</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -306,7 +306,7 @@ public class ConfiguredSpringBean {
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_usagetracker.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_usagetracker.html b/documentation/extensions/mod_usagetracker.html
index 1206585..f0a37b3 100644
--- a/documentation/extensions/mod_usagetracker.html
+++ b/documentation/extensions/mod_usagetracker.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Usage Tracking</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -339,7 +339,7 @@ logic can be adapted or replaced.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cab79ded/documentation/extensions/mod_validation.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_validation.html b/documentation/extensions/mod_validation.html
index 822b8e0..cde46b4 100644
--- a/documentation/extensions/mod_validation.html
+++ b/documentation/extensions/mod_validation.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Configuration Validation</h1>
 			</div>
 
-			<p><em>2017-01-26</em></p>
+			<p><em>2017-01-30</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -274,7 +274,7 @@ a WARNING message.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-2016 Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
 							| Baked with <a href="http://jbake.org">JBake <span>v2.5.0</span></a>
-							at <span>2017-01-30</span>
+							at <span>2017-02-06</span>
 						</p>
 						<p>
 								<b>Disclaimer</b>