You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by bu...@apache.org on 2015/08/22 23:59:16 UTC

svn commit: r962738 [2/2] - in /websites/staging/tamaya/trunk/content: ./ documentation/releaseguide/

Modified: websites/staging/tamaya/trunk/content/news.html
==============================================================================
--- websites/staging/tamaya/trunk/content/news.html (original)
+++ websites/staging/tamaya/trunk/content/news.html Sat Aug 22 21:59:16 2015
@@ -16,9 +16,9 @@
 
     <!-- Styles -->
     
-    <link href="./resources/css/bootstrap.css" rel="stylesheet">    
+    <link href="./resources/css/bootstrap.css" rel="stylesheet">
     <!--<link href="./resources/css/prettify.css" rel="stylesheet" /> -->
-    <link href="./resources/css/codehilite.css" rel="stylesheet" />
+    <link href="./resources/css/codehilite.css" rel="stylesheet"/>
     <link href="./resources/css/bootstrap-responsive.css" rel="stylesheet">
 
     <style type="text/css">
@@ -27,60 +27,66 @@
             padding-bottom: 40px;
         }
     </style>
- 
-	<script type="text/javascript">
 
-	  var _gaq = _gaq || [];
-	  _gaq.push(['_setAccount', 'UA-36103647-1']);
-	  _gaq.push(['_trackPageview']);
-	
-	  (function() {
-		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	  })();
-	
-	</script>
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-36103647-1']);
+        _gaq.push(['_trackPageview']);
+
+        (function () {
+            var ga = document.createElement('script');
+            ga.type = 'text/javascript';
+            ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(ga, s);
+        })();
+
+    </script>
 </head>
 
 <body>
-    <div class="navbar navbar-fixed-top">
-        <div class="navbar-inner">
-            <div class="container">
-                <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </a>
-                <a class="brand logocolor" href="/index.html">Apache Tamaya</a>
-                <div class="nav-collapse">
-                    <ul class="nav">
-                        <li class="active"><a href="./index.html">Home</a></li>
-                        <li><a href="./documentation.html">Documentation</a></li>
-                        <li><a href="./javadoc.html">Javadoc</a></li>
-                        <li><a href="./source.html">Source</a></li>
-                        <li><a href="./download.html">Download</a></li>
-                        <li><a href="./community.html">Community</a></li>
-                        <!-- <li><a href="./support.html">Support</a></li>  -->
-                        <li><a href="./news.html">News</a></li>
-                    </ul>
-                </div><!--/.nav-collapse -->
-                <form id="search-form" action="http://www.google.com/search" method="get"  class="navbar-search pull-right" >
-                    <input value="tamaya.incubator.apache.org" name="sitesearch" type="hidden"/>
-                    <input class="search-query" name="q" id="query" type="text" />
-                </form>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand logocolor" href="/index.html">Apache Tamaya</a>
+
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="./index.html">Home</a></li>
+                    <li><a href="./documentation.html">Documentation</a></li>
+                    <li><a href="./javadoc.html">Javadoc</a></li>
+                    <li><a href="./source.html">Source</a></li>
+                    <li><a href="./download.html">Download</a></li>
+                    <li><a href="./community.html">Community</a></li>
+                    <!-- <li><a href="./support.html">Support</a></li>  -->
+                    <li><a href="./news.html">News</a></li>
+                </ul>
             </div>
+            <!--/.nav-collapse -->
+            <form id="search-form" action="http://www.google.com/search" method="get" class="navbar-search pull-right">
+                <input value="tamaya.incubator.apache.org" name="sitesearch" type="hidden"/>
+                <input class="search-query" name="q" id="query" type="text"/>
+            </form>
         </div>
     </div>
+</div>
 
-    <div class="container">
-      <div class="row">
-          <div class="span12">
-              <div class="page-title">
+<div class="container">
+    <div class="row">
+        <div class="span12">
+            <div class="page-title">
                 <h1>Apache Tamaya News
</h1>
-				  <img src="http://incubator.apache.org/images/egg-logo.png" alt="The Apache Software Foundation - Incubator" align="right"/>
-              </div>
-              <style type="text/css">
+                <img src="http://incubator.apache.org/images/egg-logo.png"
+                     alt="The Apache Software Foundation - Incubator" align="right"/>
+            </div>
+            <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
 /*
@@ -101,7 +107,7 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="#api-entered-stabilization-132015">API entered stabilization (1.3.2015)</a></li>
 <li><a href="#initial-code-contribution-by-anatole-tresch-november-2014">Initial Code Contribution by Anatole Tresch (November 2014)</a></li>
 <li><a href="#twitter-account-november-2014">Twitter Account (November 2014)</a></li>
-<li><a href="#vote-closed-tbd">Vote closed (tbd)</a></li>
+<li><a href="#starting-incubation">Starting Incubation</a></li>
 <li><a href="#vote-to-join-the-incubator-4122011">Vote to join the Incubator (4.12.2011)</a></li>
 <li><a href="#proposal-30112011">Proposal (30.11.2011)</a></li>
 </ul>
@@ -111,8 +117,8 @@ h2:hover > .headerlink, h3:hover > .head
 <hr />
 <h1 id="overview">Overview<a class="headerlink" href="#overview" title="Permanent link">&para;</a></h1>
 <h2 id="release-01-incubating-published-2282015">Release 0.1-incubating published (22.8.2015)<a class="headerlink" href="#release-01-incubating-published-2282015" title="Permanent link">&para;</a></h2>
-<p>We are proud having published our first release containing a complete API and core implementations for Java 7 and 8,
-and already several extension modules.</p>
+<p>We are proud having published our <a href="http://www.apache.org/dist/incubator/tamaya/0.1-incubating">first release</a> containing a complete API and core implementations for Java 7 and 8,
+and already several extension modules. See also the <a href="http://www.apache.org/dist/incubator/tamaya/0.1-incubating/ReleaseNotes-0.1-incubating.html">release notes</a>.</p>
 <h2 id="project-page-updated-452015">Project Page Updated (4.5.2015)<a class="headerlink" href="#project-page-updated-452015" title="Permanent link">&para;</a></h2>
 <p>Updated project page, also adding information on the available modules and examples created during Javaland conference.</p>
 <h2 id="api-streamlined-142015">API streamlined (1.4.2015)<a class="headerlink" href="#api-streamlined-142015" title="Permanent link">&para;</a></h2>
@@ -125,9 +131,9 @@ and already several extension modules.</
 <p>Anatole Tresch submitted its GitHub project into the Apache git repository.</p>
 <h2 id="twitter-account-november-2014">Twitter Account (November 2014)<a class="headerlink" href="#twitter-account-november-2014" title="Permanent link">&para;</a></h2>
 <p>We created our Twitter account @TamayaConf</p>
-<h2 id="vote-closed-tbd">Vote closed (tbd)<a class="headerlink" href="#vote-closed-tbd" title="Permanent link">&para;</a></h2>
-<p>The vote to join the incubator was closed. There were xxx binding +1 votes, xxx non-binding +1 votes and no -1 votes. In parallel several other folks showed up and told us that they are interested to join the effort.</p>
-<p>We start with the following initial committers (and therefore PPMC members):</p>
+<h2 id="starting-incubation">Starting Incubation<a class="headerlink" href="#starting-incubation" title="Permanent link">&para;</a></h2>
+<p>The vote to join the incubator was closed, so we can start the incubation process.
+We start with the following initial committers (and therefore PPMC members):</p>
 <ul>
 <li>Andres Almiray</li>
 <li>Anatole Tresch</li>
@@ -135,7 +141,7 @@ and already several extension modules.</
 <li>Gerhard Petracek</li>
 <li>John Ament</li>
 <li>Mark Struberg</li>
-<li>more tbd</li>
+<li>Oliver B. Fischer</li>
 </ul>
 <p>Our mentors are:</p>
 <ul>
@@ -144,38 +150,40 @@ and already several extension modules.</
 <li>Mark Struberg</li>
 </ul>
 <h2 id="vote-to-join-the-incubator-4122011">Vote to join the Incubator (4.12.2011)<a class="headerlink" href="#vote-to-join-the-incubator-4122011" title="Permanent link">&para;</a></h2>
-<p>Anatole Tresch started the official <a href="http://s.apache.org/h8">vote</a>.</p>
+<p>Anatole Tresch started the official <a href="http://www.apache.org/dist/incubator/tamaya/0.1-incubating">vote</a>.</p>
 <h2 id="proposal-30112011">Proposal (30.11.2011)<a class="headerlink" href="#proposal-30112011" title="Permanent link">&para;</a></h2>
 <p>After some discussions on the general mailing list Anatole Tresch submitted the <a href="http://wiki.apache.org/incubator/TamayaProposal">proposal</a>.</p>
-          </div>
-      </div>
+        </div>
+    </div>
 
-      <hr>
+    <hr>
 
-      <footer>
+    <footer>
         <p>Copyright © 2014-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+
         <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-      </footer>
+    </footer>
 
-    </div> <!-- /.container -->
+</div>
+<!-- /.container -->
 
-    <!-- Javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <!--<script src="./resources/js/prettyfy.js"></script> -->
-    <script src="./resources/js/prettyprint.js"></script>
-    <script src="./resources/js/jquery.js"></script>
-    <script src="./resources/js/bootstrap-transition.js"></script>
-    <script src="./resources/js/bootstrap-alert.js"></script>
-    <script src="./resources/js/bootstrap-modal.js"></script>
-    <script src="./resources/js/bootstrap-dropdown.js"></script>
-    <script src="./resources/js/bootstrap-scrollspy.js"></script>
-    <script src="./resources/js/bootstrap-tab.js"></script>
-    <script src="./resources/js/bootstrap-tooltip.js"></script>
-    <script src="./resources/js/bootstrap-popover.js"></script>
-    <script src="./resources/js/bootstrap-button.js"></script>
-    <script src="./resources/js/bootstrap-collapse.js"></script>
-    <script src="./resources/js/bootstrap-carousel.js"></script>
-    <script src="./resources/js/bootstrap-typeahead.js"></script>
+<!-- Javascript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<!--<script src="./resources/js/prettyfy.js"></script> -->
+<script src="./resources/js/prettyprint.js"></script>
+<script src="./resources/js/jquery.js"></script>
+<script src="./resources/js/bootstrap-transition.js"></script>
+<script src="./resources/js/bootstrap-alert.js"></script>
+<script src="./resources/js/bootstrap-modal.js"></script>
+<script src="./resources/js/bootstrap-dropdown.js"></script>
+<script src="./resources/js/bootstrap-scrollspy.js"></script>
+<script src="./resources/js/bootstrap-tab.js"></script>
+<script src="./resources/js/bootstrap-tooltip.js"></script>
+<script src="./resources/js/bootstrap-popover.js"></script>
+<script src="./resources/js/bootstrap-button.js"></script>
+<script src="./resources/js/bootstrap-collapse.js"></script>
+<script src="./resources/js/bootstrap-carousel.js"></script>
+<script src="./resources/js/bootstrap-typeahead.js"></script>
 </body>
 </html>

Modified: websites/staging/tamaya/trunk/content/source.html
==============================================================================
--- websites/staging/tamaya/trunk/content/source.html (original)
+++ websites/staging/tamaya/trunk/content/source.html Sat Aug 22 21:59:16 2015
@@ -16,9 +16,9 @@
 
     <!-- Styles -->
     
-    <link href="./resources/css/bootstrap.css" rel="stylesheet">    
+    <link href="./resources/css/bootstrap.css" rel="stylesheet">
     <!--<link href="./resources/css/prettify.css" rel="stylesheet" /> -->
-    <link href="./resources/css/codehilite.css" rel="stylesheet" />
+    <link href="./resources/css/codehilite.css" rel="stylesheet"/>
     <link href="./resources/css/bootstrap-responsive.css" rel="stylesheet">
 
     <style type="text/css">
@@ -27,60 +27,66 @@
             padding-bottom: 40px;
         }
     </style>
- 
-	<script type="text/javascript">
 
-	  var _gaq = _gaq || [];
-	  _gaq.push(['_setAccount', 'UA-36103647-1']);
-	  _gaq.push(['_trackPageview']);
-	
-	  (function() {
-		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	  })();
-	
-	</script>
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-36103647-1']);
+        _gaq.push(['_trackPageview']);
+
+        (function () {
+            var ga = document.createElement('script');
+            ga.type = 'text/javascript';
+            ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(ga, s);
+        })();
+
+    </script>
 </head>
 
 <body>
-    <div class="navbar navbar-fixed-top">
-        <div class="navbar-inner">
-            <div class="container">
-                <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </a>
-                <a class="brand logocolor" href="/index.html">Apache Tamaya</a>
-                <div class="nav-collapse">
-                    <ul class="nav">
-                        <li class="active"><a href="./index.html">Home</a></li>
-                        <li><a href="./documentation.html">Documentation</a></li>
-                        <li><a href="./javadoc.html">Javadoc</a></li>
-                        <li><a href="./source.html">Source</a></li>
-                        <li><a href="./download.html">Download</a></li>
-                        <li><a href="./community.html">Community</a></li>
-                        <!-- <li><a href="./support.html">Support</a></li>  -->
-                        <li><a href="./news.html">News</a></li>
-                    </ul>
-                </div><!--/.nav-collapse -->
-                <form id="search-form" action="http://www.google.com/search" method="get"  class="navbar-search pull-right" >
-                    <input value="tamaya.incubator.apache.org" name="sitesearch" type="hidden"/>
-                    <input class="search-query" name="q" id="query" type="text" />
-                </form>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand logocolor" href="/index.html">Apache Tamaya</a>
+
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="./index.html">Home</a></li>
+                    <li><a href="./documentation.html">Documentation</a></li>
+                    <li><a href="./javadoc.html">Javadoc</a></li>
+                    <li><a href="./source.html">Source</a></li>
+                    <li><a href="./download.html">Download</a></li>
+                    <li><a href="./community.html">Community</a></li>
+                    <!-- <li><a href="./support.html">Support</a></li>  -->
+                    <li><a href="./news.html">News</a></li>
+                </ul>
             </div>
+            <!--/.nav-collapse -->
+            <form id="search-form" action="http://www.google.com/search" method="get" class="navbar-search pull-right">
+                <input value="tamaya.incubator.apache.org" name="sitesearch" type="hidden"/>
+                <input class="search-query" name="q" id="query" type="text"/>
+            </form>
         </div>
     </div>
+</div>
 
-    <div class="container">
-      <div class="row">
-          <div class="span12">
-              <div class="page-title">
+<div class="container">
+    <div class="row">
+        <div class="span12">
+            <div class="page-title">
                 <h1>Source</h1>
-				  <img src="http://incubator.apache.org/images/egg-logo.png" alt="The Apache Software Foundation - Incubator" align="right"/>
-              </div>
-              <style type="text/css">
+                <img src="http://incubator.apache.org/images/egg-logo.png"
+                     alt="The Apache Software Foundation - Incubator" align="right"/>
+            </div>
+            <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
 /*
@@ -115,35 +121,37 @@ Given that all is in place and maven and
 
 <h1 id="contributions">Contributions<a class="headerlink" href="#contributions" title="Permanent link">&para;</a></h1>
 <p>If you like to contribute to this project please also refer also to our <a href="./contributors.html">Contributors section</a>.</p>
-          </div>
-      </div>
+        </div>
+    </div>
 
-      <hr>
+    <hr>
 
-      <footer>
+    <footer>
         <p>Copyright © 2014-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+
         <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-      </footer>
+    </footer>
 
-    </div> <!-- /.container -->
+</div>
+<!-- /.container -->
 
-    <!-- Javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <!--<script src="./resources/js/prettyfy.js"></script> -->
-    <script src="./resources/js/prettyprint.js"></script>
-    <script src="./resources/js/jquery.js"></script>
-    <script src="./resources/js/bootstrap-transition.js"></script>
-    <script src="./resources/js/bootstrap-alert.js"></script>
-    <script src="./resources/js/bootstrap-modal.js"></script>
-    <script src="./resources/js/bootstrap-dropdown.js"></script>
-    <script src="./resources/js/bootstrap-scrollspy.js"></script>
-    <script src="./resources/js/bootstrap-tab.js"></script>
-    <script src="./resources/js/bootstrap-tooltip.js"></script>
-    <script src="./resources/js/bootstrap-popover.js"></script>
-    <script src="./resources/js/bootstrap-button.js"></script>
-    <script src="./resources/js/bootstrap-collapse.js"></script>
-    <script src="./resources/js/bootstrap-carousel.js"></script>
-    <script src="./resources/js/bootstrap-typeahead.js"></script>
+<!-- Javascript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<!--<script src="./resources/js/prettyfy.js"></script> -->
+<script src="./resources/js/prettyprint.js"></script>
+<script src="./resources/js/jquery.js"></script>
+<script src="./resources/js/bootstrap-transition.js"></script>
+<script src="./resources/js/bootstrap-alert.js"></script>
+<script src="./resources/js/bootstrap-modal.js"></script>
+<script src="./resources/js/bootstrap-dropdown.js"></script>
+<script src="./resources/js/bootstrap-scrollspy.js"></script>
+<script src="./resources/js/bootstrap-tab.js"></script>
+<script src="./resources/js/bootstrap-tooltip.js"></script>
+<script src="./resources/js/bootstrap-popover.js"></script>
+<script src="./resources/js/bootstrap-button.js"></script>
+<script src="./resources/js/bootstrap-collapse.js"></script>
+<script src="./resources/js/bootstrap-carousel.js"></script>
+<script src="./resources/js/bootstrap-typeahead.js"></script>
 </body>
 </html>

Modified: websites/staging/tamaya/trunk/content/suggested-git-workflows.html
==============================================================================
--- websites/staging/tamaya/trunk/content/suggested-git-workflows.html (original)
+++ websites/staging/tamaya/trunk/content/suggested-git-workflows.html Sat Aug 22 21:59:16 2015
@@ -16,9 +16,9 @@
 
     <!-- Styles -->
     
-    <link href="./resources/css/bootstrap.css" rel="stylesheet">    
+    <link href="./resources/css/bootstrap.css" rel="stylesheet">
     <!--<link href="./resources/css/prettify.css" rel="stylesheet" /> -->
-    <link href="./resources/css/codehilite.css" rel="stylesheet" />
+    <link href="./resources/css/codehilite.css" rel="stylesheet"/>
     <link href="./resources/css/bootstrap-responsive.css" rel="stylesheet">
 
     <style type="text/css">
@@ -27,60 +27,66 @@
             padding-bottom: 40px;
         }
     </style>
- 
-	<script type="text/javascript">
 
-	  var _gaq = _gaq || [];
-	  _gaq.push(['_setAccount', 'UA-36103647-1']);
-	  _gaq.push(['_trackPageview']);
-	
-	  (function() {
-		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	  })();
-	
-	</script>
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-36103647-1']);
+        _gaq.push(['_trackPageview']);
+
+        (function () {
+            var ga = document.createElement('script');
+            ga.type = 'text/javascript';
+            ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(ga, s);
+        })();
+
+    </script>
 </head>
 
 <body>
-    <div class="navbar navbar-fixed-top">
-        <div class="navbar-inner">
-            <div class="container">
-                <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </a>
-                <a class="brand logocolor" href="/index.html">Apache Tamaya</a>
-                <div class="nav-collapse">
-                    <ul class="nav">
-                        <li class="active"><a href="./index.html">Home</a></li>
-                        <li><a href="./documentation.html">Documentation</a></li>
-                        <li><a href="./javadoc.html">Javadoc</a></li>
-                        <li><a href="./source.html">Source</a></li>
-                        <li><a href="./download.html">Download</a></li>
-                        <li><a href="./community.html">Community</a></li>
-                        <!-- <li><a href="./support.html">Support</a></li>  -->
-                        <li><a href="./news.html">News</a></li>
-                    </ul>
-                </div><!--/.nav-collapse -->
-                <form id="search-form" action="http://www.google.com/search" method="get"  class="navbar-search pull-right" >
-                    <input value="tamaya.incubator.apache.org" name="sitesearch" type="hidden"/>
-                    <input class="search-query" name="q" id="query" type="text" />
-                </form>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand logocolor" href="/index.html">Apache Tamaya</a>
+
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="./index.html">Home</a></li>
+                    <li><a href="./documentation.html">Documentation</a></li>
+                    <li><a href="./javadoc.html">Javadoc</a></li>
+                    <li><a href="./source.html">Source</a></li>
+                    <li><a href="./download.html">Download</a></li>
+                    <li><a href="./community.html">Community</a></li>
+                    <!-- <li><a href="./support.html">Support</a></li>  -->
+                    <li><a href="./news.html">News</a></li>
+                </ul>
             </div>
+            <!--/.nav-collapse -->
+            <form id="search-form" action="http://www.google.com/search" method="get" class="navbar-search pull-right">
+                <input value="tamaya.incubator.apache.org" name="sitesearch" type="hidden"/>
+                <input class="search-query" name="q" id="query" type="text"/>
+            </form>
         </div>
     </div>
+</div>
 
-    <div class="container">
-      <div class="row">
-          <div class="span12">
-              <div class="page-title">
+<div class="container">
+    <div class="row">
+        <div class="span12">
+            <div class="page-title">
                 <h1></h1>
-				  <img src="http://incubator.apache.org/images/egg-logo.png" alt="The Apache Software Foundation - Incubator" align="right"/>
-              </div>
-              <style type="text/css">
+                <img src="http://incubator.apache.org/images/egg-logo.png"
+                     alt="The Apache Software Foundation - Incubator" align="right"/>
+            </div>
+            <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
 /*
@@ -251,35 +257,37 @@ A contributor has to follow the steps de
 <div class="codehilite"><pre><span class="c">%&gt;git push discuss :TAMAYA-XXX</span>
 <span class="c">%&gt;git branch -d TAMAYA-XXX</span>
 </pre></div>
-          </div>
-      </div>
+        </div>
+    </div>
 
-      <hr>
+    <hr>
 
-      <footer>
+    <footer>
         <p>Copyright © 2014-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+
         <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-      </footer>
+    </footer>
 
-    </div> <!-- /.container -->
+</div>
+<!-- /.container -->
 
-    <!-- Javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <!--<script src="./resources/js/prettyfy.js"></script> -->
-    <script src="./resources/js/prettyprint.js"></script>
-    <script src="./resources/js/jquery.js"></script>
-    <script src="./resources/js/bootstrap-transition.js"></script>
-    <script src="./resources/js/bootstrap-alert.js"></script>
-    <script src="./resources/js/bootstrap-modal.js"></script>
-    <script src="./resources/js/bootstrap-dropdown.js"></script>
-    <script src="./resources/js/bootstrap-scrollspy.js"></script>
-    <script src="./resources/js/bootstrap-tab.js"></script>
-    <script src="./resources/js/bootstrap-tooltip.js"></script>
-    <script src="./resources/js/bootstrap-popover.js"></script>
-    <script src="./resources/js/bootstrap-button.js"></script>
-    <script src="./resources/js/bootstrap-collapse.js"></script>
-    <script src="./resources/js/bootstrap-carousel.js"></script>
-    <script src="./resources/js/bootstrap-typeahead.js"></script>
+<!-- Javascript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<!--<script src="./resources/js/prettyfy.js"></script> -->
+<script src="./resources/js/prettyprint.js"></script>
+<script src="./resources/js/jquery.js"></script>
+<script src="./resources/js/bootstrap-transition.js"></script>
+<script src="./resources/js/bootstrap-alert.js"></script>
+<script src="./resources/js/bootstrap-modal.js"></script>
+<script src="./resources/js/bootstrap-dropdown.js"></script>
+<script src="./resources/js/bootstrap-scrollspy.js"></script>
+<script src="./resources/js/bootstrap-tab.js"></script>
+<script src="./resources/js/bootstrap-tooltip.js"></script>
+<script src="./resources/js/bootstrap-popover.js"></script>
+<script src="./resources/js/bootstrap-button.js"></script>
+<script src="./resources/js/bootstrap-collapse.js"></script>
+<script src="./resources/js/bootstrap-carousel.js"></script>
+<script src="./resources/js/bootstrap-typeahead.js"></script>
 </body>
 </html>