http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cddd52a8/development/possible-contributions.html
----------------------------------------------------------------------
diff --git a/development/possible-contributions.html 
b/development/possible-contributions.html
index 3c02e2f..9502a47 100644
--- a/development/possible-contributions.html
+++ b/development/possible-contributions.html
@@ -125,96 +125,83 @@
                                <h1></h1>
                        </div>
 
-                       <p><em>2018-04-26</em></p>
+                       <p><em>2018-05-17</em></p>
 
-                       <p><!-- toc disabled -->
-<h1 id="_apache_tamaya_possible_tasks" class="sect0">Apache Tamaya - Possible 
Tasks</h1>
-<div style="page-break-after: always;"></div>
-<div class="sect1">
-<h2 id="_introduction">1. Introduction</h2>
-<div class="sectionbody">
-
-</div>
-</div>
-<div class="sect1">
-<h2 id="_what_is_tamaya">2. What is Tamaya</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<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
-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>
-<div class="sect2">
-<h3 id="_purpose_of_this_document">2.1. Purpose of this Document</h3>
-<div class="paragraph">
-<p>The document should help to organize people and ideas around the Apache 
Tamaya Library. It list possible features,
-ideas and tasks that need to be done. Everybody can have a look at and see, 
where hos contribution and capabilities
-would fit best.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_main_features">3. Main Features</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_metadata_model">3.1. Metadata Model</h3>
-<div class="paragraph">
-<p>Currently MetaInfo models metadata as a separate constuct. It has been 
shown that this leads to more complex
-handling when creating composites and makes the API overall more complex. The 
idea is to model metadata as simple
-key/value pairs, that are part of the provider/configuration data as well, but 
handled separately. Metadata hereby
-is identified by a starting '_' character in its key. For example refer to the 
following configuration properties:</p>
-</div>
-<div class="listingblock">
-<div class="title">Basic Properties</div>
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-listing" 
data-lang="listing">a.b.Foo=foo
+                       <p><!-- toc disabled --> 
+<h1 id="_apache_tamaya_possible_tasks" class="sect0">Apache Tamaya - Possible 
Tasks</h1> 
+<div style="page-break-after: always;"></div> 
+<div class="sect1"> 
+ <h2 id="_introduction">1. Introduction</h2> 
+ <div class="sectionbody"> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_what_is_tamaya">2. What is Tamaya</h2> 
+ <div class="sectionbody"> 
+  <div class="paragraph"> 
+   <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 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> 
+  <div class="sect2"> 
+   <h3 id="_purpose_of_this_document">2.1. Purpose of this Document</h3> 
+   <div class="paragraph"> 
+    <p>The document should help to organize people and ideas around the Apache 
Tamaya Library. It list possible features, ideas and tasks that need to be 
done. Everybody can have a look at and see, where hos contribution and 
capabilities would fit best.</p> 
+   </div> 
+  </div> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_main_features">3. Main Features</h2> 
+ <div class="sectionbody"> 
+  <div class="sect2"> 
+   <h3 id="_metadata_model">3.1. Metadata Model</h3> 
+   <div class="paragraph"> 
+    <p>Currently MetaInfo models metadata as a separate constuct. It has been 
shown that this leads to more complex handling when creating composites and 
makes the API overall more complex. The idea is to model metadata as simple 
key/value pairs, that are part of the provider/configuration data as well, but 
handled separately. Metadata hereby is identified by a starting '_' character 
in its key. For example refer to the following configuration properties:</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="title">
+     Basic Properties
+    </div> 
+    <div class="content"> 
+     <pre class="prettyprint highlight"><code class="language-listing" 
data-lang="listing">a.b.Foo=foo
 a.b.Bar=bar
 a.AnyOther=whatelse
-Something=none</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Now we can model meta-data as follows:</p>
-</div>
-<div class="listingblock">
-<div class="title">Metadata Properties</div>
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-listing" 
data-lang="listing">[a.b].info=An area info
+Something=none</code></pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Now we can model meta-data as follows:</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="title">
+     Metadata Properties
+    </div> 
+    <div class="content"> 
+     <pre class="prettyprint highlight"><code class="language-listing" 
data-lang="listing">[a.b].info=An area info
 [a.b.Foo].auth=role1,role2
 [a.b.Foo].encrypt=PGP
 [a.b.Foo].sensitive=true
-[].info=This is a test configuration example.</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The above would model the following:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>The area a.b has the meta property info.</p>
-</li>
-<li>
-<p>The entry a.b.Foo has three meta properties auth,encrypt and sensitive. 
These could be interpreted by a security
-view and used to encrypt the values returned by the configuration instance, if 
not the current user has one of the
-specified roles.</p>
-</li>
-<li>
-<p>The last meta data defines an attribute info for the whole 
provider/configuration (the root area).</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Given that the overall entries would be as follows:</p>
-</div>
-<div class="listingblock">
-<div class="title">Full Properties with Meta Properties</div>
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-listing" 
data-lang="listing">[a.b].info=An area info
+[].info=This is a test configuration example.</code></pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>The above would model the following:</p> 
+   </div> 
+   <div class="ulist"> 
+    <ul> 
+     <li> <p>The area a.b has the meta property info.</p> </li> 
+     <li> <p>The entry a.b.Foo has three meta properties auth,encrypt and 
sensitive. These could be interpreted by a security view and used to encrypt 
the values returned by the configuration instance, if not the current user has 
one of the specified roles.</p> </li> 
+     <li> <p>The last meta data defines an attribute info for the whole 
provider/configuration (the root area).</p> </li> 
+    </ul> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Given that the overall entries would be as follows:</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="title">
+     Full Properties with Meta Properties
+    </div> 
+    <div class="content"> 
+     <pre class="prettyprint highlight"><code class="language-listing" 
data-lang="listing">[a.b].info=An area info
 a.b.Foo=foo
 [a.b.Foo].auth=role1,role2
 [a.b.Foo].encrypt=PGP
@@ -222,245 +209,196 @@ a.b.Foo=foo
 a.b.Bar=bar
 [].info=This is a test configuration example.
 a.AnyOther=whatelse
-Something=none</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The current MetaInfo class could be adapted, so it is reading data from the 
underlying configuration/provider,
-instead of its own datastructure. This would make a later mapping of 
configuration and its metadata into DB table, JSON
-etc, much more easier.
-The providers on the other side may suppress any metadata from ordinary 
output, such
-as toString(), Similarly accessing metadata using the official config API 
(get, getOrDefault, getAreas etc)
-should be disabled. The MetaInfoBuilder must probably as well adapted or 
redesigned.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_management_client">3.2. Management Client</h3>
-<div class="paragraph">
-<p>A nice web-based client to manage configuration data would be nice as well. 
This also includes a UI for creating new
-configurations.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_mapping_configuration_to_a_database">3.3. Mapping Configuration to a 
Database</h3>
-<div class="paragraph">
-<p>A flexible mechanism should be implemented that allows the use of databases 
(SQL/JPA as well as non-SQL) for
-storing/retreiving/managing configuration:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>JPA, Hibernate</p>
-</li>
-<li>
-<p>MongoDB</p>
-</li>
-<li>
-<p>&#8230;&#8203;</p>
-</li>
-</ul>
-</div>
-</div>
-<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
-the basic runtime platform, e.g. Apache Felix, but as well others.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_distributed_remote_configuration_support">4. Distributed/Remote 
Configuration Support</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_configuration_distribution_policies">4.1. Configuration Distribution 
Policies</h3>
-<div class="paragraph">
-<p>Different configuration distribution policies should be defined any 
implemented, e.g. distributed cache, restful services,
-web services, EJB/RMI calls, asynchronous queues, publish/subsribe models, 
&#8230;&#8203;</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_preferences_support">4.2. Preferences Support</h3>
-<div class="paragraph">
-<p>Write a PreferencesFactory for java.util.preferences.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_third_party_integration">5. Third Party Integration</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_integration_with_deltaspike_config">5.1. Integration with Deltaspike 
Config</h3>
-<div class="paragraph">
-<p>Integration with Deltaspike Config should be implemented and discussed with 
Deltaspike guys.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_integration_with_spring">5.2. Integration with Spring</h3>
-<div class="paragraph">
-<p>A {name} module should be created that allows Spring to be used either as 
client or configuration provider.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_integration_with_jetty">5.3. Integration with Jetty</h3>
-<div class="paragraph">
-<p>A {name} module should be created that allows a Jetty instance to be 
deployed and started that is (completely)
-configured based on configuration server.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_integration_with_tomcat">5.4. Integration with Tomcat</h3>
-<div class="paragraph">
-<p>A {name} module should be created that allows a Tomcat instance to be 
deployed and started that is (completely)
-configured based on configuration server.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_configuration_of_java_ee">5.5. Configuration of Java EE</h3>
-<div class="paragraph">
-<p>In the Java EE area there would be several options:</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_configuration_of_application_servers_administrative_resources">5.6. 
Configuration of Application Servers (administrative resources)</h3>
-<div class="paragraph">
-<p>It should be possible to start a application server instance remotely and 
configure all administrative resources and the
-deployments based on the configuration service, server to be considered 
maybe</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Wildfly</p>
-</li>
-<li>
-<p>IBM</p>
-</li>
-<li>
-<p>Weblogic</p>
-</li>
-<li>
-<p>Glassfish</p>
-</li>
-<li>
-<p>Apache Geronimo</p>
-</li>
-</ul>
-</div>
-<div class="sect3">
-<h4 id="_configuration_of_bean_validation">5.6.1. Configuration of Bean 
Validation</h4>
-<div class="ulist">
-<ul>
-<li>
-<p>Add configurable validators.</p>
-</li>
-<li>
-<p>Configure bean validation based on configuration</p>
-</li>
-<li>
-<p>&#8230;&#8203;</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_jndi_support">5.7. JNDI Support</h3>
-<div class="paragraph">
-<p>Write a JCA adapter to provide configuration data through JNDI.</p>
-</div>
-<div class="sect3">
-<h4 id="_configure_jsf">5.7.1. Configure JSF</h4>
-<div class="paragraph">
-<p>Use the JSF XML Document event to completely configure JSF.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configure_web_services">5.7.2. Configure Web Services</h4>
-<div class="paragraph">
-<p>Provide a WebServiceProviderFactory that may be configured.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configure_jpa">5.7.3. Configure JPA</h4>
-<div class="paragraph">
-<p>Provide an implementation that allows configuration of persistence units. 
Talk with JPA EG people to see if we can
-get an SPI to hook in a stadardized way.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configure_ejbs">5.7.4. Configure EJBs</h4>
-<div class="paragraph">
-<p>Provide an implementation that allows configuration of EJBs and MDBs:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Register beans</p>
-</li>
-<li>
-<p>Unregister/disable beans</p>
-</li>
-<li>
-<p>Intercept beans</p>
-</li>
-<li>
-<p>Support Configuration Injection (in the worst case using a standard 
Interceptor, provide supporting artifacts to
-help developers to achive this easily).</p>
-</li>
-<li>
-<p>Talk with EE8 Umbrella EG (Bill Shanon, Linda DeMichels) on a feasible SPI 
for EE8, if possible join the EG.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configure">5.7.5. Configure &#8230;&#8203;</h4>
-<div class="paragraph">
-<p>Just think of any Java EE aspects that might be worth to be configured. If 
it can be done, e.g. by managing CDI managed
-resources, it might be easy. For others it is a good idea to discuss things 
with our matter of experts&#8230;&#8203;</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_special_goodies">6. Special Goodies</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_maintenance_mode_servlet_filter">6.1. Maintenance Mode Servlet 
Filter</h3>
-<div class="paragraph">
-<p>Provide a servlet filter that is capable of switching to maintenance mode, 
based on configuration. Similarly also a forwarding
-servlet could be useful, wehere only request based on configuration are 
forwarded, other might be rejected or dropped
-as configured.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_dynamic_camel_routes">6.2. Dynamic Camel Routes</h3>
-<div class="paragraph">
-<p>Provides dynamic (configurable) Camel routes, e.g. usable within ServiceMix 
or standalone.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_dynamic_cxf">6.3. Dynamic CXF</h3>
-<div class="paragraph">
-<p>Provides dynamic (configurable) CXF adapters, e.g. usable within ServiceMix 
or standalone.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_configurable_apache_mq">6.4. Configurable Apache MQ</h3>
-<div class="paragraph">
-<p>Provides an implementation for configuring Apache MQ.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_dynamic">6.5. Dynamic &#8230;&#8203;</h3>
-<div class="paragraph">
-<p>Interested to see what other ideas are around. Let us know!</p>
-</div>
-</div>
-</div>
+Something=none</code></pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>The current MetaInfo class could be adapted, so it is reading data from 
the underlying configuration/provider, instead of its own datastructure. This 
would make a later mapping of configuration and its metadata into DB table, 
JSON etc, much more easier. The providers on the other side may suppress any 
metadata from ordinary output, such as toString(), Similarly accessing metadata 
using the official config API (get, getOrDefault, getAreas etc) should be 
disabled. The MetaInfoBuilder must probably as well adapted or redesigned.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_management_client">3.2. Management Client</h3> 
+   <div class="paragraph"> 
+    <p>A nice web-based client to manage configuration data would be nice as 
well. This also includes a UI for creating new configurations.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_mapping_configuration_to_a_database">3.3. Mapping Configuration to 
a Database</h3> 
+   <div class="paragraph"> 
+    <p>A flexible mechanism should be implemented that allows the use of 
databases (SQL/JPA as well as non-SQL) for storing/retreiving/managing 
configuration:</p> 
+   </div> 
+   <div class="ulist"> 
+    <ul> 
+     <li> <p>JPA, Hibernate</p> </li> 
+     <li> <p>MongoDB</p> </li> 
+     <li> <p>…​</p> </li> 
+    </ul> 
+   </div> 
+  </div> 
+  <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 the basic runtime platform, 
e.g. Apache Felix, but as well others.</p> 
+   </div> 
+  </div> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_distributed_remote_configuration_support">4. Distributed/Remote 
Configuration Support</h2> 
+ <div class="sectionbody"> 
+  <div class="sect2"> 
+   <h3 id="_configuration_distribution_policies">4.1. Configuration 
Distribution Policies</h3> 
+   <div class="paragraph"> 
+    <p>Different configuration distribution policies should be defined any 
implemented, e.g. distributed cache, restful services, web services, EJB/RMI 
calls, asynchronous queues, publish/subsribe models, …​</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_preferences_support">4.2. Preferences Support</h3> 
+   <div class="paragraph"> 
+    <p>Write a PreferencesFactory for java.util.preferences.</p> 
+   </div> 
+  </div> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_third_party_integration">5. Third Party Integration</h2> 
+ <div class="sectionbody"> 
+  <div class="sect2"> 
+   <h3 id="_integration_with_deltaspike_config">5.1. Integration with 
Deltaspike Config</h3> 
+   <div class="paragraph"> 
+    <p>Integration with Deltaspike Config should be implemented and discussed 
with Deltaspike guys.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_integration_with_spring">5.2. Integration with Spring</h3> 
+   <div class="paragraph"> 
+    <p>A {name} module should be created that allows Spring to be used either 
as client or configuration provider.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_integration_with_jetty">5.3. Integration with Jetty</h3> 
+   <div class="paragraph"> 
+    <p>A {name} module should be created that allows a Jetty instance to be 
deployed and started that is (completely) configured based on configuration 
server.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_integration_with_tomcat">5.4. Integration with Tomcat</h3> 
+   <div class="paragraph"> 
+    <p>A {name} module should be created that allows a Tomcat instance to be 
deployed and started that is (completely) configured based on configuration 
server.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_configuration_of_java_ee">5.5. Configuration of Java EE</h3> 
+   <div class="paragraph"> 
+    <p>In the Java EE area there would be several options:</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 
id="_configuration_of_application_servers_administrative_resources">5.6. 
Configuration of Application Servers (administrative resources)</h3> 
+   <div class="paragraph"> 
+    <p>It should be possible to start a application server instance remotely 
and configure all administrative resources and the deployments based on the 
configuration service, server to be considered maybe</p> 
+   </div> 
+   <div class="ulist"> 
+    <ul> 
+     <li> <p>Wildfly</p> </li> 
+     <li> <p>IBM</p> </li> 
+     <li> <p>Weblogic</p> </li> 
+     <li> <p>Glassfish</p> </li> 
+     <li> <p>Apache Geronimo</p> </li> 
+    </ul> 
+   </div> 
+   <div class="sect3"> 
+    <h4 id="_configuration_of_bean_validation">5.6.1. Configuration of Bean 
Validation</h4> 
+    <div class="ulist"> 
+     <ul> 
+      <li> <p>Add configurable validators.</p> </li> 
+      <li> <p>Configure bean validation based on configuration</p> </li> 
+      <li> <p>…​</p> </li> 
+     </ul> 
+    </div> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_jndi_support">5.7. JNDI Support</h3> 
+   <div class="paragraph"> 
+    <p>Write a JCA adapter to provide configuration data through JNDI.</p> 
+   </div> 
+   <div class="sect3"> 
+    <h4 id="_configure_jsf">5.7.1. Configure JSF</h4> 
+    <div class="paragraph"> 
+     <p>Use the JSF XML Document event to completely configure JSF.</p> 
+    </div> 
+   </div> 
+   <div class="sect3"> 
+    <h4 id="_configure_web_services">5.7.2. Configure Web Services</h4> 
+    <div class="paragraph"> 
+     <p>Provide a WebServiceProviderFactory that may be configured.</p> 
+    </div> 
+   </div> 
+   <div class="sect3"> 
+    <h4 id="_configure_jpa">5.7.3. Configure JPA</h4> 
+    <div class="paragraph"> 
+     <p>Provide an implementation that allows configuration of persistence 
units. Talk with JPA EG people to see if we can get an SPI to hook in a 
stadardized way.</p> 
+    </div> 
+   </div> 
+   <div class="sect3"> 
+    <h4 id="_configure_ejbs">5.7.4. Configure EJBs</h4> 
+    <div class="paragraph"> 
+     <p>Provide an implementation that allows configuration of EJBs and 
MDBs:</p> 
+    </div> 
+    <div class="ulist"> 
+     <ul> 
+      <li> <p>Register beans</p> </li> 
+      <li> <p>Unregister/disable beans</p> </li> 
+      <li> <p>Intercept beans</p> </li> 
+      <li> <p>Support Configuration Injection (in the worst case using a 
standard Interceptor, provide supporting artifacts to help developers to achive 
this easily).</p> </li> 
+      <li> <p>Talk with EE8 Umbrella EG (Bill Shanon, Linda DeMichels) on a 
feasible SPI for EE8, if possible join the EG.</p> </li> 
+     </ul> 
+    </div> 
+   </div> 
+   <div class="sect3"> 
+    <h4 id="_configure">5.7.5. Configure …​</h4> 
+    <div class="paragraph"> 
+     <p>Just think of any Java EE aspects that might be worth to be 
configured. If it can be done, e.g. by managing CDI managed resources, it might 
be easy. For others it is a good idea to discuss things with our matter of 
experts…​</p> 
+    </div> 
+   </div> 
+  </div> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_special_goodies">6. Special Goodies</h2> 
+ <div class="sectionbody"> 
+  <div class="sect2"> 
+   <h3 id="_maintenance_mode_servlet_filter">6.1. Maintenance Mode Servlet 
Filter</h3> 
+   <div class="paragraph"> 
+    <p>Provide a servlet filter that is capable of switching to maintenance 
mode, based on configuration. Similarly also a forwarding servlet could be 
useful, wehere only request based on configuration are forwarded, other might 
be rejected or dropped as configured.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_dynamic_camel_routes">6.2. Dynamic Camel Routes</h3> 
+   <div class="paragraph"> 
+    <p>Provides dynamic (configurable) Camel routes, e.g. usable within 
ServiceMix or standalone.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_dynamic_cxf">6.3. Dynamic CXF</h3> 
+   <div class="paragraph"> 
+    <p>Provides dynamic (configurable) CXF adapters, e.g. usable within 
ServiceMix or standalone.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_configurable_apache_mq">6.4. Configurable Apache MQ</h3> 
+   <div class="paragraph"> 
+    <p>Provides an implementation for configuring Apache MQ.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_dynamic">6.5. Dynamic …​</h3> 
+   <div class="paragraph"> 
+    <p>Interested to see what other ideas are around. Let us know!</p> 
+   </div> 
+  </div> 
+ </div> 
 </div></p>
 
                        <hr />
@@ -472,8 +410,8 @@ as configured.</p>
                    <div id="footer">
                      <div class="container">
                        <p class="muted credit">&copy; 2014-<span>2018</span> 
Apache Software Foundation | Mixed with <a 
href="http://getbootstrap.com/";>Bootstrap v3.1.1</a>
-                                                       | Baked with <a 
href="http://jbake.org";>JBake <span>v2.5.1</span></a>
-                                                       at 
<span>2018-05-03</span> |
+                                                       | Baked with <a 
href="http://jbake.org";>JBake <span>v2.6.1</span></a>
+                                                       at 
<span>2018-05-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>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cddd52a8/development/source.html
----------------------------------------------------------------------
diff --git a/development/source.html b/development/source.html
index c29351e..9b0533f 100644
--- a/development/source.html
+++ b/development/source.html
@@ -125,129 +125,95 @@
                                <h1>Apache Tamaya: Source code repositories</h1>
                        </div>
 
-                       <p><em>2018-04-26</em></p>
+                       <p><em>2018-05-17</em></p>
 
-                       <p><div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apart from the ASF source code repositories we do provide read-only mirrors 
at GitHub.
-In case you want to contribute file an issue in our <a 
href="https://issues.apache.org/jira/browse/TAMAYA";>bugtracker</a>. At the 
moment we cannot integrate any GitHub pull requests directly.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_contributions">1. Contributions</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If you would like to contribute to Apache Tamaya please also refer also to 
our
-<a href="../devguide.html#contributing-workflow">section on contributing to 
Apache Tamaya</a>.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_repository_locations">2. Repository locations</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_apache_tamaya">2.1. Apache Tamaya</h3>
-<div class="paragraph">
-<p>The repository locations are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git"; 
class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git</a> 
(read-only)</p>
-</li>
-<li>
-<p><a href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git"; 
class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git</a></p>
-</li>
-<li>
-<p><a href="https://github.com/apache/incubator-tamaya"; 
target="_blank">https://github.com/apache/incubator-tamaya</a> GitHub read-only 
mirror</p>
-</li>
-<li>
-<p>Current build status is <span class="image"><img 
src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Master-branch&amp;style=plastic";
 alt="icon?job=Tamaya Master branch&amp;style=plastic"></span> - <a 
href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Master-branch"; 
target="_blank">Jenkins</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The GitHub mirror also provides the project as a downloadable zip 
archive.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_apache_tamaya_extensions">2.2. Apache Tamaya Extensions</h3>
-<div class="paragraph">
-<p>The repository locations are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a 
href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git"; 
class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git</a>
 (read-only)</p>
-</li>
-<li>
-<p><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git"; 
class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git</a></p>
-</li>
-<li>
-<p><a href="https://github.com/apache/incubator-tamaya-extensions"; 
target="_blank">https://github.com/apache/incubator-tamaya-extensions</a> 
GitHub read-only mirror</p>
-</li>
-<li>
-<p>Current build status is <span class="image"><img 
src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Extensions-Master&amp;style=plastic";
 alt="icon?job=Tamaya Extensions Master&amp;style=plastic"></span> - <a 
href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Extensions-Master";
 target="_blank">Jenkins</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The GitHub mirror also provides the project as a downloadable zip 
archive.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_apache_tamaya_sandbox">2.3. Apache Tamaya Sandbox</h3>
-<div class="paragraph">
-<p>The repository locations are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a 
href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git"; 
class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git</a>
 (read-only)</p>
-</li>
-<li>
-<p><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git"; 
class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git</a></p>
-</li>
-<li>
-<p><a href="https://github.com/apache/incubator-tamaya-sandbox"; 
target="_blank">https://github.com/apache/incubator-tamaya-sandbox</a> GitHub 
read-only mirror</p>
-</li>
-<li>
-<p>Current build status is <span class="image"><img 
src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Sandbox-Master&amp;style=plastic";
 alt="icon?job=Tamaya Sandbox Master&amp;style=plastic"></span> - <a 
href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Sandbox-Master"; 
target="_blank">Jenkins</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The GitHub mirror also provides the project as a downloadable zip 
archive.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_apache_tamaya_website">2.4. Apache Tamaya Website</h3>
-<div class="paragraph">
-<p>The website is build with <a href="http://jbake.org/"; 
target="_blank">jBake</a>. Its contents is located in the master branch of:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git"; 
class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git</a>
 (read-only)</p>
-</li>
-<li>
-<p><a href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git"; 
class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git</a></p>
-</li>
-<li>
-<p><a href="https://github.com/apache/incubator-tamaya-site"; 
target="_blank">https://github.com/apache/incubator-tamaya-site</a> GitHub 
read-only mirror</p>
-</li>
-<li>
-<p>Current build status is <span class="image"><img 
src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Site-jBake-Master&amp;style=plastic";
 alt="icon?job=Tamaya Site jBake Master&amp;style=plastic"></span> - <a 
href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Site-jBake-Master";
 target="_blank">Jenkins</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The generated page is in the asf-site branch of above project.</p>
-</div>
-</div>
-</div>
+                       <p><div id="preamble"> 
+ <div class="sectionbody"> 
+  <div class="paragraph"> 
+   <p>Apart from the ASF source code repositories we do provide read-only 
mirrors at GitHub. In case you want to contribute file an issue in our <a 
href="https://issues.apache.org/jira/browse/TAMAYA";>bugtracker</a>. At the 
moment we cannot integrate any GitHub pull requests directly.</p> 
+  </div> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_contributions">1. Contributions</h2> 
+ <div class="sectionbody"> 
+  <div class="paragraph"> 
+   <p>If you would like to contribute to Apache Tamaya please also refer also 
to our <a href="../devguide.html#contributing-workflow">section on contributing 
to Apache Tamaya</a>.</p> 
+  </div> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_repository_locations">2. Repository locations</h2> 
+ <div class="sectionbody"> 
+  <div class="sect2"> 
+   <h3 id="_apache_tamaya">2.1. Apache Tamaya</h3> 
+   <div class="paragraph"> 
+    <p>The repository locations are:</p> 
+   </div> 
+   <div class="ulist"> 
+    <ul> 
+     <li> <p><a 
href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git"; 
class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git</a> 
(read-only)</p> </li> 
+     <li> <p><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git"; 
class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git</a></p>
 </li> 
+     <li> <p><a href="https://github.com/apache/incubator-tamaya"; 
target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya</a> 
GitHub read-only mirror</p> </li> 
+     <li> <p>Current build status is <span class="image"><img 
src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Master-branch&amp;style=plastic";
 alt="icon?job=Tamaya Master branch&amp;style=plastic"></span> - <a 
href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Master-branch"; 
target="_blank" rel="noopener">Jenkins</a></p> </li> 
+    </ul> 
+   </div> 
+   <div class="paragraph"> 
+    <p>The GitHub mirror also provides the project as a downloadable zip 
archive.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_apache_tamaya_extensions">2.2. Apache Tamaya Extensions</h3> 
+   <div class="paragraph"> 
+    <p>The repository locations are:</p> 
+   </div> 
+   <div class="ulist"> 
+    <ul> 
+     <li> <p><a 
href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git"; 
class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git</a>
 (read-only)</p> </li> 
+     <li> <p><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git"; 
class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git</a></p>
 </li> 
+     <li> <p><a href="https://github.com/apache/incubator-tamaya-extensions"; 
target="_blank" 
rel="noopener">https://github.com/apache/incubator-tamaya-extensions</a> GitHub 
read-only mirror</p> </li> 
+     <li> <p>Current build status is <span class="image"><img 
src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Extensions-Master&amp;style=plastic";
 alt="icon?job=Tamaya Extensions Master&amp;style=plastic"></span> - <a 
href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Extensions-Master";
 target="_blank" rel="noopener">Jenkins</a></p> </li> 
+    </ul> 
+   </div> 
+   <div class="paragraph"> 
+    <p>The GitHub mirror also provides the project as a downloadable zip 
archive.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_apache_tamaya_sandbox">2.3. Apache Tamaya Sandbox</h3> 
+   <div class="paragraph"> 
+    <p>The repository locations are:</p> 
+   </div> 
+   <div class="ulist"> 
+    <ul> 
+     <li> <p><a 
href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git"; 
class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git</a>
 (read-only)</p> </li> 
+     <li> <p><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git"; 
class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git</a></p>
 </li> 
+     <li> <p><a href="https://github.com/apache/incubator-tamaya-sandbox"; 
target="_blank" 
rel="noopener">https://github.com/apache/incubator-tamaya-sandbox</a> GitHub 
read-only mirror</p> </li> 
+     <li> <p>Current build status is <span class="image"><img 
src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Sandbox-Master&amp;style=plastic";
 alt="icon?job=Tamaya Sandbox Master&amp;style=plastic"></span> - <a 
href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Sandbox-Master"; 
target="_blank" rel="noopener">Jenkins</a></p> </li> 
+    </ul> 
+   </div> 
+   <div class="paragraph"> 
+    <p>The GitHub mirror also provides the project as a downloadable zip 
archive.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_apache_tamaya_website">2.4. Apache Tamaya Website</h3> 
+   <div class="paragraph"> 
+    <p>The website is build with <a href="http://jbake.org/"; target="_blank" 
rel="noopener">jBake</a>. Its contents is located in the master branch of:</p> 
+   </div> 
+   <div class="ulist"> 
+    <ul> 
+     <li> <p><a 
href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git"; 
class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git</a>
 (read-only)</p> </li> 
+     <li> <p><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git"; 
class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git</a></p>
 </li> 
+     <li> <p><a href="https://github.com/apache/incubator-tamaya-site"; 
target="_blank" 
rel="noopener">https://github.com/apache/incubator-tamaya-site</a> GitHub 
read-only mirror</p> </li> 
+     <li> <p>Current build status is <span class="image"><img 
src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Site-jBake-Master&amp;style=plastic";
 alt="icon?job=Tamaya Site jBake Master&amp;style=plastic"></span> - <a 
href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Site-jBake-Master";
 target="_blank" rel="noopener">Jenkins</a></p> </li> 
+    </ul> 
+   </div> 
+   <div class="paragraph"> 
+    <p>The generated page is in the asf-site branch of above project.</p> 
+   </div> 
+  </div> 
+ </div> 
 </div></p>
 
                        <hr />
@@ -259,8 +225,8 @@ In case you want to contribute file an issue in our <a 
href="https://issues.apac
                    <div id="footer">
                      <div class="container">
                        <p class="muted credit">&copy; 2014-<span>2018</span> 
Apache Software Foundation | Mixed with <a 
href="http://getbootstrap.com/";>Bootstrap v3.1.1</a>
-                                                       | Baked with <a 
href="http://jbake.org";>JBake <span>v2.5.1</span></a>
-                                                       at 
<span>2018-05-03</span> |
+                                                       | Baked with <a 
href="http://jbake.org";>JBake <span>v2.6.1</span></a>
+                                                       at 
<span>2018-05-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>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cddd52a8/development/team.html
----------------------------------------------------------------------
diff --git a/development/team.html b/development/team.html
index 6e20455..66f2c2f 100644
--- a/development/team.html
+++ b/development/team.html
@@ -125,170 +125,176 @@
                                <h1>Apache Tamaya: Project Team</h1>
                        </div>
 
-                       <p><em>2018-04-26</em></p>
+                       <p><em>2018-05-17</em></p>
 
-                       <p><div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p>A successful project requires many people to play many roles. Some members 
write code or documentation, while others are valuable as testers, submitting 
patches and suggestions.</p>
-</div>
-<div class="paragraph">
-<p>The project team is comprised of Members and Contributors. Members have 
direct access to the source of a project and actively evolve the code-base. 
Contributors improve the project through submission of patches and suggestions 
to the Members. The number of Contributors to the project is unbounded. Get 
involved today. All contributions to the project are greatly appreciated.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_members">Members</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The following is a list of developers with commit privileges that have 
directly contributed to the project in one way or another.</p>
-</div>
-<table class="tableblock frame-topbot grid-all" style="width: 60%;">
-<caption class="title">Table 1. Members</caption>
-<colgroup>
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Id</th>
-<th class="tableblock halign-left valign-top">Name</th>
-<th class="tableblock halign-left valign-top">E-Mail</th>
-<th class="tableblock halign-left valign-top">Role(s)</th>
-<th class="tableblock halign-left valign-top">Time Zone</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">anatole</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Anatole 
Tresch</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">anatole[at]apache.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">johndament</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">John D. 
Ament</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">johndament[at]apache.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">-5</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">plexus</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Oliver B. 
Fischer</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">plexus[at]apache.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">pottlinger</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Phil 
Ottlinger</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">pottlinger[at]apache.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">wkeil</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Werner 
Keil</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">wkeil[at]apache.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_contributors">Contributors</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The following people are active contributors:</p>
-</div>
-<table class="tableblock frame-topbot grid-all" style="width: 60%;">
-<caption class="title">Table 2. Contributors</caption>
-<colgroup>
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Id</th>
-<th class="tableblock halign-left valign-top">Name</th>
-<th class="tableblock halign-left valign-top">E-Mail</th>
-<th class="tableblock halign-left valign-top">Role(s)</th>
-<th class="tableblock halign-left valign-top">Time Zone</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">yourname</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">can be 
here :-)</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">you[at]example.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">Contributor</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_emeritus">Emeritus</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>These people used to help with the development of the project but are not 
active anymore:</p>
-</div>
-<table class="tableblock frame-topbot grid-all" style="width: 60%;">
-<caption class="title">Table 3. Members (alphabetically ordered)</caption>
-<colgroup>
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Id</th>
-<th class="tableblock halign-left valign-top">Name</th>
-<th class="tableblock halign-left valign-top">E-Mail</th>
-<th class="tableblock halign-left valign-top">Role(s)</th>
-<th class="tableblock halign-left valign-top">Time Zone</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">gpetracek</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Gerhard 
Petracek</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">gpetracek[at]apache.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">struberg</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Mark 
Struberg</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">struberg[at]apache.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">rmannibucau</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Romain 
Manni-Bucau</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">rmannibucau[at]apache.org</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>Thanks for all your help!</p>
-</div>
-</div>
+                       <p><div id="preamble"> 
+ <div class="sectionbody"> 
+  <div class="paragraph"> 
+   <p>A successful project requires many people to play many roles. Some 
members write code or documentation, while others are valuable as testers, 
submitting patches and suggestions.</p> 
+  </div> 
+  <div class="paragraph"> 
+   <p>The project team is comprised of Members and Contributors. Members have 
direct access to the source of a project and actively evolve the code-base. 
Contributors improve the project through submission of patches and suggestions 
to the Members. The number of Contributors to the project is unbounded. Get 
involved today. All contributions to the project are greatly appreciated.</p> 
+  </div> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_members">Members</h2> 
+ <div class="sectionbody"> 
+  <div class="paragraph"> 
+   <p>The following is a list of developers with commit privileges that have 
directly contributed to the project in one way or another.</p> 
+  </div> 
+  <table class="tableblock frame-topbot grid-all" style="width: 60%;"> 
+   <caption class="title">
+    Table 1. Members
+   </caption> 
+   <colgroup> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+   </colgroup> 
+   <thead> 
+    <tr> 
+     <th class="tableblock halign-left valign-top">Id</th> 
+     <th class="tableblock halign-left valign-top">Name</th> 
+     <th class="tableblock halign-left valign-top">E-Mail</th> 
+     <th class="tableblock halign-left valign-top">Role(s)</th> 
+     <th class="tableblock halign-left valign-top">Time Zone</th> 
+    </tr> 
+   </thead> 
+   <tbody> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">anatole</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">Anatole Tresch</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">anatole[at]apache.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">+1</p></td> 
+    </tr> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">johndament</p></td> 
+     <td class="tableblock halign-left valign-top"><p class="tableblock">John 
D. Ament</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">johndament[at]apache.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">-5</p></td> 
+    </tr> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">plexus</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">Oliver B. Fischer</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">plexus[at]apache.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">+1</p></td> 
+    </tr> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">pottlinger</p></td> 
+     <td class="tableblock halign-left valign-top"><p class="tableblock">Phil 
Ottlinger</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">pottlinger[at]apache.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">+1</p></td> 
+    </tr> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">wkeil</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">Werner Keil</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">wkeil[at]apache.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">+1</p></td> 
+    </tr> 
+   </tbody> 
+  </table> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_contributors">Contributors</h2> 
+ <div class="sectionbody"> 
+  <div class="paragraph"> 
+   <p>The following people are active contributors:</p> 
+  </div> 
+  <table class="tableblock frame-topbot grid-all" style="width: 60%;"> 
+   <caption class="title">
+    Table 2. Contributors
+   </caption> 
+   <colgroup> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+   </colgroup> 
+   <thead> 
+    <tr> 
+     <th class="tableblock halign-left valign-top">Id</th> 
+     <th class="tableblock halign-left valign-top">Name</th> 
+     <th class="tableblock halign-left valign-top">E-Mail</th> 
+     <th class="tableblock halign-left valign-top">Role(s)</th> 
+     <th class="tableblock halign-left valign-top">Time Zone</th> 
+    </tr> 
+   </thead> 
+   <tbody> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">yourname</p></td> 
+     <td class="tableblock halign-left valign-top"><p class="tableblock">can 
be here :-)</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">you[at]example.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">Contributor</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">+1</p></td> 
+    </tr> 
+   </tbody> 
+  </table> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="_emeritus">Emeritus</h2> 
+ <div class="sectionbody"> 
+  <div class="paragraph"> 
+   <p>These people used to help with the development of the project but are 
not active anymore:</p> 
+  </div> 
+  <table class="tableblock frame-topbot grid-all" style="width: 60%;"> 
+   <caption class="title">
+    Table 3. Members (alphabetically ordered)
+   </caption> 
+   <colgroup> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+    <col style="width: 20%;"> 
+   </colgroup> 
+   <thead> 
+    <tr> 
+     <th class="tableblock halign-left valign-top">Id</th> 
+     <th class="tableblock halign-left valign-top">Name</th> 
+     <th class="tableblock halign-left valign-top">E-Mail</th> 
+     <th class="tableblock halign-left valign-top">Role(s)</th> 
+     <th class="tableblock halign-left valign-top">Time Zone</th> 
+    </tr> 
+   </thead> 
+   <tbody> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">gpetracek</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">Gerhard Petracek</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">gpetracek[at]apache.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">+1</p></td> 
+    </tr> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">struberg</p></td> 
+     <td class="tableblock halign-left valign-top"><p class="tableblock">Mark 
Struberg</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">struberg[at]apache.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">+1</p></td> 
+    </tr> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">rmannibucau</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">Romain Manni-Bucau</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">rmannibucau[at]apache.org</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">PMC</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">+1</p></td> 
+    </tr> 
+   </tbody> 
+  </table> 
+  <div class="paragraph"> 
+   <p>Thanks for all your help!</p> 
+  </div> 
+ </div> 
 </div></p>
 
                        <hr />
@@ -300,8 +306,8 @@
                    <div id="footer">
                      <div class="container">
                        <p class="muted credit">&copy; 2014-<span>2018</span> 
Apache Software Foundation | Mixed with <a 
href="http://getbootstrap.com/";>Bootstrap v3.1.1</a>
-                                                       | Baked with <a 
href="http://jbake.org";>JBake <span>v2.5.1</span></a>
-                                                       at 
<span>2018-05-03</span> |
+                                                       | Baked with <a 
href="http://jbake.org";>JBake <span>v2.6.1</span></a>
+                                                       at 
<span>2018-05-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>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/cddd52a8/devguide.html
----------------------------------------------------------------------
diff --git a/devguide.html b/devguide.html
index c5ffb9d..519ee10 100644
--- a/devguide.html
+++ b/devguide.html
@@ -125,250 +125,219 @@
                                <h1>Apache Tamaya: Development Guide</h1>
                        </div>
 
-                       <p><em>2018-04-26</em></p>
+                       <p><em>2018-05-17</em></p>
 
-                       <p><div class="sect1">
-<h2 id="_suggested_git_workflows">1. Suggested Git Workflows</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_avoid_git_pull">1.1. Avoid git pull!</h3>
-<div class="paragraph">
-<p><code>git pull</code> should never get invoked if you have dirty files 
lying around
-or if your branch is ahead of master. This will always lead to
-some dirty artifacts in the commit history:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>Merge branch 'master' of http://git-wip-us.apache.org/tamaya into 
master</pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_use_git_pull_rebase">1.2. Use git pull --rebase</h3>
-<div class="paragraph">
-<p>An easy version for getting rid of the auto-merges is using</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git pull --rebase</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Please note that this sometimes trashes your working tree if there
-are unmergeable files around. Cleaning this up with a forced manual
-rebase is not something we would recommend for a git beginner.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_working_in_an_own_branch">1.3. Working in an own branch</h3>
-<div class="paragraph">
-<p>This is actually the suggested way to prevent auto-merges. Create an own
-branch where you do your feature work. Either do all your work in one
-branch or create one branch per feature you are working on.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git branch mybranch</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>After you finished your feature, first add (<code>git add</code>) and 
commit (<code>git commit</code>) your work.
-Check with <code>git status</code> that you don&#8217;t have any dirty files 
and uncommitted
-changes around. You can use <code>git stash</code> to 'backup' unfinished 
work.</p>
-</div>
-<div class="paragraph">
-<p>Then switch back to the master branch and pull changes
-done by other committers in the meantime.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout master
-$ git pull --rebase</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You should now get all the changes done by other committers and
-the will get applied to your local master branch. Now go back to
-your private branch and rebase your locally performed work to the HEAD of 
master.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout mybranch
-$ git rebase master</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If you got conflicts, you will get lines with "&gt;&gt;&gt;&gt;" added to 
those
-files. Resolve those conflicts manually, add them and finish the rebase.</p>
-</div>
-<div class="paragraph">
-<p>Check with <code>git-status</code> and <code>gitk</code> if the merge went 
well and the history now contains your changes.
-If all is well, go back to the master branch and merge your changes in.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git pull --rebase     // (just for safety, you should see no changes)
+                       <p><div class="sect1"> 
+ <h2 id="_suggested_git_workflows">1. Suggested Git Workflows</h2> 
+ <div class="sectionbody"> 
+  <div class="sect2"> 
+   <h3 id="_avoid_git_pull">1.1. Avoid git pull!</h3> 
+   <div class="paragraph"> 
+    <p><code>git pull</code> should never get invoked if you have dirty files 
lying around or if your branch is ahead of master. This will always lead to 
some dirty artifacts in the commit history:</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>Merge branch 'master' of http://git-wip-us.apache.org/tamaya into 
master</pre> 
+    </div> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_use_git_pull_rebase">1.2. Use git pull --rebase</h3> 
+   <div class="paragraph"> 
+    <p>An easy version for getting rid of the auto-merges is using</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git pull --rebase</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Please note that this sometimes trashes your working tree if there are 
unmergeable files around. Cleaning this up with a forced manual rebase is not 
something we would recommend for a git beginner.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_working_in_an_own_branch">1.3. Working in an own branch</h3> 
+   <div class="paragraph"> 
+    <p>This is actually the suggested way to prevent auto-merges. Create an 
own branch where you do your feature work. Either do all your work in one 
branch or create one branch per feature you are working on.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git branch mybranch</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>After you finished your feature, first add (<code>git add</code>) and 
commit (<code>git commit</code>) your work. Check with <code>git status</code> 
that you don’t have any dirty files and uncommitted changes around. You can 
use <code>git stash</code> to 'backup' unfinished work.</p> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Then switch back to the master branch and pull changes done by other 
committers in the meantime.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout master
+$ git pull --rebase</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>You should now get all the changes done by other committers and the 
will get applied to your local master branch. Now go back to your private 
branch and rebase your locally performed work to the HEAD of master.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout mybranch
+$ git rebase master</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>If you got conflicts, you will get lines with "&gt;&gt;&gt;&gt;" added 
to those files. Resolve those conflicts manually, add them and finish the 
rebase.</p> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Check with <code>git-status</code> and <code>gitk</code> if the merge 
went well and the history now contains your changes. If all is well, go back to 
the master branch and merge your changes in.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git pull --rebase     // (just for safety, you should see no 
changes)
 $ git checkout master
-$ git merge mybranch</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Finally you can push your changes to the ASF git repo</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git push</pre>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="contributing-workflow">2. Contribution workflow</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_creating_patches">2.1. Creating patches</h3>
-<div class="paragraph">
-<p>You should use the following workflow, if you plan to contribute
-patches or new features to Tamaya.</p>
-</div>
-<div class="paragraph">
-<p>First update you local copy of the repository:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout master
-$ git pull --rebase</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Then create a new local branch for your work. It&#8217;s good practice to 
name
-it after the corresponding JIRA issue.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout -b TAMAYA-XXX</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Now you can start to work on your patch. When you are finished, commit your 
changes. But don&#8217;t forget to <strong>add the name
-of the JIRA issue to the commit message</strong>.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git add -am "TAMAYA-XXX: Fixed some issue"</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>For small patches we recommend to do a single commit containing your 
changes. For larger contributions you should try
-to group your work into separate sub-tasks that you can commit one by one.</p>
-</div>
-<div class="paragraph">
-<p>Before you create your patch you should make sure that your local 
repository is up to date with the master repository.
-This is very important especially if you work on your branch for a long time. 
Use the following commands to pull the
-latest changes from the upstream repository and rebase your branch against the 
current master.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout master
+$ git merge mybranch</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Finally you can push your changes to the ASF git repo</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git push</pre> 
+    </div> 
+   </div> 
+  </div> 
+ </div> 
+</div> 
+<div class="sect1"> 
+ <h2 id="contributing-workflow">2. Contribution workflow</h2> 
+ <div class="sectionbody"> 
+  <div class="sect2"> 
+   <h3 id="_creating_patches">2.1. Creating patches</h3> 
+   <div class="paragraph"> 
+    <p>You should use the following workflow, if you plan to contribute 
patches or new features to Tamaya.</p> 
+   </div> 
+   <div class="paragraph"> 
+    <p>First update you local copy of the repository:</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout master
+$ git pull --rebase</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Then create a new local branch for your work. It’s good practice to 
name it after the corresponding JIRA issue.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout -b TAMAYA-XXX</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Now you can start to work on your patch. When you are finished, commit 
your changes. But don’t forget to <strong>add the name of the JIRA issue to 
the commit message</strong>.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git add -am "TAMAYA-XXX: Fixed some issue"</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>For small patches we recommend to do a single commit containing your 
changes. For larger contributions you should try to group your work into 
separate sub-tasks that you can commit one by one.</p> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Before you create your patch you should make sure that your local 
repository is up to date with the master repository. This is very important 
especially if you work on your branch for a long time. Use the following 
commands to pull the latest changes from the upstream repository and rebase 
your branch against the current master.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout master
 $ git pull --rebase
 $ git checkout TAMAYA-XXX
-$ git rebase master</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Now you are ready to create your patch:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout TAMAYA-XXX
-$ git format-patch --stdout master &gt; ../TAMAYA-XXX.patch</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Please attach the resulting patch file to the correspoding JIRA issue.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_applying_patches">2.2. Applying patches</h3>
-<div class="paragraph">
-<p>If you are a committer and want to apply a patch you should do so in a 
separate branch.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout -b TAMAYA-XXX</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Then apply the patch using <code>git am</code> and rebase it against the 
master branch.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git am &lt; ../TAMAYA-XXX.patch
-$ git rebase master</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>After reviewing the changes and testing the code, the changes are ready to
-be merged into the master branch:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout master
+$ git rebase master</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Now you are ready to create your patch:</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout TAMAYA-XXX
+$ git format-patch --stdout master &gt; ../TAMAYA-XXX.patch</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Please attach the resulting patch file to the correspoding JIRA 
issue.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_applying_patches">2.2. Applying patches</h3> 
+   <div class="paragraph"> 
+    <p>If you are a committer and want to apply a patch you should do so in a 
separate branch.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout -b TAMAYA-XXX</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>Then apply the patch using <code>git am</code> and rebase it against 
the master branch.</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git am &lt; ../TAMAYA-XXX.patch
+$ git rebase master</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p>After reviewing the changes and testing the code, the changes are ready 
to be merged into the master branch:</p> 
+   </div> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout master
 $ git merge TAMAYA-XXX
-$ git branch -d TAMAYA-XXX</pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_discussion_workflow_optional">2.3. Discussion workflow (optional)</h3>
-<div class="paragraph">
-<p>All discussions which lead to a decision take place on the mailing list.
-Sometimes it&#8217;s required to show-case an idea esp. if the solution is
-more than few lines. As shown above it makes sense to use local branches
-for developing new parts. Git allows to push such local branches to a
-public repository. So it&#8217;s easier to share it with the community
-for discussing it. The following listings show an example in combination
-with GitHub - for sure it works with any hosting platform like BitBucket,
-Google-Code,&#8230;&#8203; The only important part here is that such branches
-<strong>NEVER</strong> get pushed to the main Apache repository to keep the 
commit history
-as clean as possible.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_initial_setup">2.4. Initial setup</h3>
-<div class="listingblock">
-<div class="content">
-<pre>$ git clone https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git
+$ git branch -d TAMAYA-XXX</pre> 
+    </div> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_discussion_workflow_optional">2.3. Discussion workflow 
(optional)</h3> 
+   <div class="paragraph"> 
+    <p>All discussions which lead to a decision take place on the mailing 
list. Sometimes it’s required to show-case an idea esp. if the solution is 
more than few lines. As shown above it makes sense to use local branches for 
developing new parts. Git allows to push such local branches to a public 
repository. So it’s easier to share it with the community for discussing it. 
The following listings show an example in combination with GitHub - for sure it 
works with any hosting platform like BitBucket, Google-Code,…​ The only 
important part here is that such branches <strong>NEVER</strong> get pushed to 
the main Apache repository to keep the commit history as clean as possible.</p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_initial_setup">2.4. Initial setup</h3> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git clone 
https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git
 $ git remote add discuss 
https://[username]@github.com/[username]/[repo-name].git
-$ git push -u discuss master</pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_branches_for_discussions">2.5. Branches for discussions</h3>
-<div class="listingblock">
-<div class="content">
-<pre>$ git checkout -b TAMAYA-XXX # 1-n commits
-$ git push discuss TAMAYA-XXX # share the link to the branch for the 
discussions</pre>
-</div>
-</div>
-<div class="paragraph">
-<p><strong>If the community agrees on the suggested change, the implementation 
will be applied to the origin master. A committer
-has to follow the steps described above for the basic workflow to keep the 
commit history simple, clean and straight.
-A contributor has to follow the steps described above for creating a 
patch.</strong></p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_delete_the_branch_again">2.6. Delete the branch again</h3>
-<div class="listingblock">
-<div class="content">
-<pre>$ git push discuss :TAMAYA-XXX
-$ git branch -d TAMAYA-XXX</pre>
-</div>
-</div>
-</div>
-</div>
+$ git push -u discuss master</pre> 
+    </div> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_branches_for_discussions">2.5. Branches for discussions</h3> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git checkout -b TAMAYA-XXX # 1-n commits
+$ git push discuss TAMAYA-XXX # share the link to the branch for the 
discussions</pre> 
+    </div> 
+   </div> 
+   <div class="paragraph"> 
+    <p><strong>If the community agrees on the suggested change, the 
implementation will be applied to the origin master. A committer has to follow 
the steps described above for the basic workflow to keep the commit history 
simple, clean and straight. A contributor has to follow the steps described 
above for creating a patch.</strong></p> 
+   </div> 
+  </div> 
+  <div class="sect2"> 
+   <h3 id="_delete_the_branch_again">2.6. Delete the branch again</h3> 
+   <div class="listingblock"> 
+    <div class="content"> 
+     <pre>$ git push discuss :TAMAYA-XXX
+$ git branch -d TAMAYA-XXX</pre> 
+    </div> 
+   </div> 
+  </div> 
+ </div> 
 </div></p>
 
                        <hr />
@@ -380,8 +349,8 @@ $ git branch -d TAMAYA-XXX</pre>
                    <div id="footer">
                      <div class="container">
                        <p class="muted credit">&copy; 2014-<span>2018</span> 
Apache Software Foundation | Mixed with <a 
href="http://getbootstrap.com/";>Bootstrap v3.1.1</a>
-                                                       | Baked with <a 
href="http://jbake.org";>JBake <span>v2.5.1</span></a>
-                                                       at 
<span>2018-05-03</span> |
+                                                       | Baked with <a 
href="http://jbake.org";>JBake <span>v2.6.1</span></a>
+                                                       at 
<span>2018-05-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>

Reply via email to