You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by bu...@apache.org on 2014/12/25 15:01:02 UTC

svn commit: r933969 - in /websites/staging/deltaspike/trunk/content: ./ staging/

Author: buildbot
Date: Thu Dec 25 14:01:01 2014
New Revision: 933969

Log:
Staging update by buildbot for deltaspike

Added:
    websites/staging/deltaspike/trunk/content/staging/addons.html
    websites/staging/deltaspike/trunk/content/staging/articles.html
    websites/staging/deltaspike/trunk/content/staging/external.html
Modified:
    websites/staging/deltaspike/trunk/content/   (props changed)
    websites/staging/deltaspike/trunk/content/staging/community.html
    websites/staging/deltaspike/trunk/content/staging/documentation.html
    websites/staging/deltaspike/trunk/content/staging/download.html
    websites/staging/deltaspike/trunk/content/staging/examples.html
    websites/staging/deltaspike/trunk/content/staging/javadoc.html
    websites/staging/deltaspike/trunk/content/staging/migration-guide.html
    websites/staging/deltaspike/trunk/content/staging/news.html
    websites/staging/deltaspike/trunk/content/staging/release-preparation.html
    websites/staging/deltaspike/trunk/content/staging/steps_for_a_release.html
    websites/staging/deltaspike/trunk/content/staging/suggested-git-workflows.html

Propchange: websites/staging/deltaspike/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Dec 25 14:01:01 2014
@@ -1 +1 @@
-1646676
+1647895

Added: websites/staging/deltaspike/trunk/content/staging/addons.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/addons.html (added)
+++ websites/staging/deltaspike/trunk/content/staging/addons.html Thu Dec 25 14:01:01 2014
@@ -0,0 +1,233 @@
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="deltaspike-generate-pages">
+<meta name="author" content="chm">
+
+<title>Add-ons</title>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
+
+<style type="text/css">
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
+
+body {
+	padding-top: 60px;
+	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>
+</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 DeltaSpike</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="./index.html">Home</a></li>
+						<li><a href="./documentation">Documentation</a></li>
+						<li><a href="./javadoc.html">Javadoc</a></li>
+						<li><a href="./documentation/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>
+						<li><a href="./migration-guide.html">Migration</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="deltaspike.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">
+			    <h1>Add-ons</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		<ul class="sectlevel1">
+<li><a href="#_monitoring">Monitoring</a></li>
+<li><a href="#_spring_bridge">Spring Bridge</a></li>
+<li><a href="#_disruptor">Disruptor</a></li>
+</ul>
+       	 		<hr>	
+       	 		
+				<div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>Add-ons extend the functionality of DeltaSpike and several have been developed external to the DeltaSpike project. Brief information is given here about each of the add-ons, with details of where they can be obtained from.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_monitoring">Monitoring</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p><code>ds-monitoring-addon</code> provides simple monitoring for several common use-cases (exceptions, performance, audits), collecting information about the monitored method-invocations during a request and enabling you to process the entries based on your requirements. For more information about its use and implementation, see <a href="http://os890.blogspot.com.au/2014/04/add-on-monitoring-lite-with-deltaspike.html">os890: [add-on] monitoring lite with deltaspike</a>.</p>
+</div>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/ds-monitoring-addon" class="bare">https://github.com/os890/ds-monitoring-addon</a></p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_spring_bridge">Spring Bridge</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p><code>ds-spring-bridge-addon</code> is a two-way cdi-spring bridge that allows spring-beans to be injected into cdi-beans and vice versa provided the concepts, for example qualifiers, are compatible. For more information about its use and implementation, see <a href="http://os890.blogspot.com.au/2013/12/add-on-spring-bridge-with-deltaspike.html">os890: [add-on] spring-bridge with deltaspike</a>.</p>
+</div>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/ds-spring-bridge-addon" class="bare">https://github.com/os890/ds-spring-bridge-addon</a>.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_disruptor">Disruptor</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p><code>ds-disruptor-addon</code> improves CDI synchronous event-processing performance by creating a disruptor process for every observer method, enabling CDI synchronous events in conjunction with asynchronous observers. This add-on currently works with Apache TomEE and JBoss AS 7. For more information about its use and implementation, see <a href="http://os890.blogspot.com.au/2014/05/faster-cdi-like-events.html">os890: [add-on] fast event processing with disruptor + deltaspike</a>.</p>
+</div>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/ds-disruptor-addon" class="bare">https://github.com/os890/ds-disruptor-addon</a></p>
+</div>
+</div>
+</div>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 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>
+
+		</div>
+		<!-- /.container -->
+
+</body>
+</html>
\ No newline at end of file

Added: websites/staging/deltaspike/trunk/content/staging/articles.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/articles.html (added)
+++ websites/staging/deltaspike/trunk/content/staging/articles.html Thu Dec 25 14:01:01 2014
@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="deltaspike-generate-pages">
+<meta name="author" content="chm">
+
+<title>Articles and Blogs</title>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
+
+<style type="text/css">
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
+
+body {
+	padding-top: 60px;
+	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>
+</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 DeltaSpike</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="./index.html">Home</a></li>
+						<li><a href="./documentation">Documentation</a></li>
+						<li><a href="./javadoc.html">Javadoc</a></li>
+						<li><a href="./documentation/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>
+						<li><a href="./migration-guide.html">Migration</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="deltaspike.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">
+			    <h1>Articles and Blogs</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		<ul class="sectlevel1">
+<li><a href="#_ongoing">Ongoing</a></li>
+<li><a href="#_one_offs">One-offs</a></li>
+</ul>
+       	 		<hr>	
+       	 		
+				<div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>You can find lots of content related to DeltaSpike with a quick internet search. But here is a list of some useful articles and blogs to get you started.</p>
+</div>
+<div class="paragraph">
+<p>If you know of useful DeltaSpike articles or blogs that are not listed, <a href="https://deltaspike.apache.org/community.html">let us know</a>.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_ongoing">Ongoing</h2>
+<div class="sectionbody">
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://twitter.com/DeltaSpikeTeam">@DeltaSpikeTeam on Twitter</a></p>
+</li>
+<li>
+<p><a href="https://twitter.com/hashtag/deltaspike">#deltaspike on Twitter</a></p>
+</li>
+<li>
+<p><a href="http://os890.blogspot.com.au/search/label/deltaspike">os890 DeltaSpike posts</a></p>
+</li>
+<li>
+<p><a href="http://rafabene.com/?s=deltaspike&amp;submit=Search">Rafael Benevides DeltaSpike posts</a></p>
+</li>
+<li>
+<p><a href="http://rmannibucau.wordpress.com/?s=deltaspike">RManiiBucau DeltaSpike posts</a></p>
+</li>
+<li>
+<p><a href="https://struberg.wordpress.com/?s=deltaspike">Struberg DeltaSpike posts</a></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_one_offs">One-offs</h2>
+<div class="sectionbody">
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://blogs.oracle.com/theaquarium/entry/introducing_deltaspike_1_0">The Aquarium: Introducing DeltaSpike 1.0</a></p>
+</li>
+<li>
+<p><a href="http://blog.arungupta.me/2014/06/deltaspike-1-0-extend-javaee-techtip32/">DeltaSpike 1.0 – Extend #JavaEE beyond #JavaEE</a></p>
+</li>
+<li>
+<p><a href="http://www.tearsofaunicorn.com/articles/2014/06/10/configuring-deltaspike-through-environment-variables.html">Configuring Apache Deltaspike through environment variables</a></p>
+</li>
+<li>
+<p><a href="http://blog.ctp.com/2013/11/27/bye-bye-cdi-query-hello-deltaspike-data/">Bye Bye CDI Query, Hello DeltaSpike Data</a></p>
+</li>
+<li>
+<p><a href="http://rmannibucau.wordpress.com/2013/11/20/deltaspike-data-repositories-with-dtos/">DeltaSpike Data: repositories with DTOs!</a></p>
+</li>
+<li>
+<p><a href="http://jaxenter.com/introducing-apache-deltaspike-42925.html">Closing the Gaps: Introducing Apache Deltaspike</a></p>
+</li>
+<li>
+<p><a href="http://jsfcorner.blogspot.com.au/2013/01/deltaspike-jsf-message-system.html">DeltaSpike JSF message system</a></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 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>
+
+		</div>
+		<!-- /.container -->
+
+</body>
+</html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/community.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/community.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/community.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>

Modified: websites/staging/deltaspike/trunk/content/staging/documentation.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>
@@ -247,7 +249,7 @@ have a look at the <a href="suggested-gi
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>$ mvn site-deploy -P staging</pre>
+<pre>$ mvn clean site-deploy -P staging</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -255,7 +257,7 @@ have a look at the <a href="suggested-gi
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>$ mvn site-deploy</pre>
+<pre>$ mvn clean site-deploy</pre>
 </div>
 </div>
 <div class="paragraph">

Modified: websites/staging/deltaspike/trunk/content/staging/download.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/download.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/download.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>
@@ -182,7 +184,7 @@ body {
 <h2 id="_latest_release">Latest Release</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>v1.2.0</p>
+<p>v1.2.1</p>
 </div>
 </div>
 </div>
@@ -192,28 +194,28 @@ body {
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.0/distribution-full-1.2.0.zip">distribution-full-1.2.0.zip</a></p>
+<p><a href="http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.1/distribution-full-1.2.1.zip">distribution-full-1.2.1.zip</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.zip.asc">distribution-full-1.2.0.zip.asc</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.zip.asc">distribution-full-1.2.1.zip.asc</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.zip.md5">distribution-full-1.2.0.zip.md5</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.zip.md5">distribution-full-1.2.1.zip.md5</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.zip.sha1">distribution-full-1.2.0.zip.sha1</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.zip.sha1">distribution-full-1.2.1.zip.sha1</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.0/distribution-full-1.2.0.tar.gz">distribution-full-1.2.0.tar.gz</a></p>
+<p><a href="http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.1/distribution-full-1.2.1.tar.gz">distribution-full-1.2.1.tar.gz</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.tar.gz.asc">distribution-full-1.2.0.tar.gz.asc</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.tar.gz.asc">distribution-full-1.2.1.tar.gz.asc</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.tar.gz.md5">distribution-full-1.2.0.tar.gz.md5</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.tar.gz.md5">distribution-full-1.2.1.tar.gz.md5</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.tar.gz.sha1">distribution-full-1.2.0.tar.gz.sha1</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.tar.gz.sha1">distribution-full-1.2.1.tar.gz.sha1</a></p>
 </li>
 </ul>
 </div>
@@ -225,16 +227,16 @@ body {
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.0/deltaspike-project-1.2.0-source-release.zip">deltaspike-project-1.2.0-source-release.zip</a></p>
+<p><a href="http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.1/deltaspike-project-1.2.1-source-release.zip">deltaspike-project-1.2.1-source-release.zip</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/deltaspike-project-1.2.0-source-release.zip.asc">deltaspike-project-1.2.0-source-release.zip.asc</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/deltaspike-project-1.2.1-source-release.zip.asc">deltaspike-project-1.2.1-source-release.zip.asc</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/deltaspike-project-1.2.0-source-release.zip.md5">deltaspike-project-1.2.0-source-release.zip.md5</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/deltaspike-project-1.2.1-source-release.zip.md5">deltaspike-project-1.2.1-source-release.zip.md5</a></p>
 </li>
 <li>
-<p><a href="http://www.apache.org/dist/deltaspike/1.2.0/deltaspike-project-1.2.0-source-release.zip.sha1">deltaspike-project-1.2.0-source-release.zip.sha1</a></p>
+<p><a href="http://www.apache.org/dist/deltaspike/1.2.1/deltaspike-project-1.2.1-source-release.zip.sha1">deltaspike-project-1.2.1-source-release.zip.sha1</a></p>
 </li>
 </ul>
 </div>
@@ -277,7 +279,7 @@ the signatures using e.g.:</p>
 <div class="listingblock">
 <div class="content">
 <pre>$ pgpk -a KEYS
-$ pgpv deltaspike-project-1.2.0-source-release.zip.asc</pre>
+$ pgpv deltaspike-project-1.2.1-source-release.zip.asc</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -286,7 +288,7 @@ $ pgpv deltaspike-project-1.2.0-source-r
 <div class="listingblock">
 <div class="content">
 <pre>$ pgp -ka KEYS
-$ pgp deltaspike-project-1.2.0-source-release.zip.asc</pre>
+$ pgp deltaspike-project-1.2.1-source-release.zip.asc</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -295,7 +297,7 @@ $ pgp deltaspike-project-1.2.0-source-re
 <div class="listingblock">
 <div class="content">
 <pre>$ gpg --import KEYS
-$ gpg --verify deltaspike-project-1.2.0-source-release.zip.asc</pre>
+$ gpg --verify deltaspike-project-1.2.1-source-release.zip.asc</pre>
 </div>
 </div>
 </div>

Modified: websites/staging/deltaspike/trunk/content/staging/examples.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/examples.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/examples.html Thu Dec 25 14:01:01 2014
@@ -6,7 +6,7 @@
 <meta name="description" content="deltaspike-generate-pages">
 <meta name="author" content="chm">
 
-<title>Examples</title>
+<title>See DeltaSpike in Action</title>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
 
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>
@@ -164,50 +166,59 @@ body {
 		<div class="row">
 			<div class="span12">
 				<div class="page-title">
-			    <h1>Examples</h1>
+			    <h1>See DeltaSpike in Action</h1>
                 </div>
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
-<li><a href="#_introduction">Introduction</a>
-<ul class="sectlevel2">
-<li><a href="#__1">#1</a></li>
-</ul>
-</li>
-<li><a href="#_external">External</a></li>
+<li><a href="#_next">Next</a></li>
 </ul>
        	 		<hr>	
        	 		
-				<div class="sect1">
-<h2 id="_introduction">Introduction</h2>
+				<div id="preamble">
 <div class="sectionbody">
-<div class="sect2">
-<h3 id="__1">#1</h3>
 <div class="paragraph">
-<p>artifact-id: deltaspike-jse-owb-example (the shown use-cases also work
-with <em>Weld</em> - only the bootstrapping of the container is different,
-because this example is based on Java-SE and therefore outside of an
-Java-EE(6+) application server.</p>
+<p>A collection of ready-to-build Maven-based projects are provided to demonstrate the inclusion of DeltaSpike in applications. Each example showcases a different DeltaSpike feature and explores the mechanics of DeltaSpike implementation. You can use these examples to see DeltaSpike in action and learn how to add these capabilities to your own projects. The Maven-based project examples are available in <code>deltaspike-project-&lt;version&gt;-source-release.zip</code>.</p>
+</div>
+<div class="paragraph">
+<p>To begin using the projects, complete the following steps:</p>
 </div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p><a href="https://deltaspike.apache.org/download.html">Download <code>deltaspike-project-&lt;version&gt;-source-release.zip</code></a></p>
+</li>
+<li>
+<p>Extract the archive contents</p>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="shell">$ unzip deltaspike-project-&lt;version&gt;-source-release.zip</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p>Build the projects</p>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="shell">$ cd /path/to/deltaspike-project-&lt;version&gt;/examples
+$ mvn clean package</code></pre>
+</div>
+</div>
+</li>
+</ol>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_external">External</h2>
+<h2 id="_next">Next</h2>
 <div class="sectionbody">
 <div class="ulist">
 <ul>
 <li>
-<p><a href="https://github.com/os890/ee6-ds-demo">Fullstack EE6+ with DeltaSpike @os890 (tested with EE6 and EE7)</a></p>
-</li>
-<li>
-<p><a href="http://s.apache.org/xA">Fullstack CODI to DeltaSpike @ os890</a></p>
-</li>
-<li>
-<p><a href="https://github.com/jboss-developer/jboss-wfk-quickstarts">jboss-wfk-quickstarts(search for <em>deltaspike</em>)</a></p>
+<p>To see more ready-to-deploy DeltaSpike examples and templates, see <a href="external.html">External Examples</a>.</p>
 </li>
 <li>
-<p><a href="https://github.com/confess/confess2012_deltaspike">confess2012_deltaspike</a></p>
+<p>To read how DeltaSpike is being used by developers, see <a href="articles.html">Articles and Blogs</a>.</p>
 </li>
 </ul>
 </div>

Added: websites/staging/deltaspike/trunk/content/staging/external.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/external.html (added)
+++ websites/staging/deltaspike/trunk/content/staging/external.html Thu Dec 25 14:01:01 2014
@@ -0,0 +1,293 @@
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="deltaspike-generate-pages">
+<meta name="author" content="chm">
+
+<title>External Examples and Templates</title>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
+
+<style type="text/css">
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
+
+body {
+	padding-top: 60px;
+	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>
+</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 DeltaSpike</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="./index.html">Home</a></li>
+						<li><a href="./documentation">Documentation</a></li>
+						<li><a href="./javadoc.html">Javadoc</a></li>
+						<li><a href="./documentation/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>
+						<li><a href="./migration-guide.html">Migration</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="deltaspike.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">
+			    <h1>External Examples and Templates</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		<ul class="sectlevel1">
+<li><a href="#_examples">Examples</a>
+<ul class="sectlevel2">
+<li><a href="#_confess_2012_workshop_demo">Confess 2012 Workshop Demo</a></li>
+<li><a href="#_fullstack_ee6_with_deltaspike">Fullstack EE6+ with DeltaSpike</a></li>
+<li><a href="#_fullstack_codi_to_deltaspike">Fullstack CODI to DeltaSpike</a></li>
+<li><a href="#_jboss_quickstarts">JBoss Quickstarts</a></li>
+</ul>
+</li>
+<li><a href="#_templates">Templates</a>
+<ul class="sectlevel2">
+<li><a href="#_java_se_cdi_ds">Java SE + CDI + DS</a></li>
+<li><a href="#_jsf_cdi_ds_servlet_container">JSF + CDI + DS (Servlet-Container)</a></li>
+<li><a href="#_ejb_cdi_ds_module">EJB + CDI + DS (Module)</a></li>
+<li><a href="#_jsf_ejb_cdi_ds_ee_server">JSF + EJB + CDI + DS (EE-Server)</a></li>
+</ul>
+</li>
+</ul>
+       	 		<hr>	
+       	 		
+				<div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>A number of DeltaSpike examples and templates have been developed external to the DeltaSpike project. These extend the DeltaSpike resources from which you can see DeltaSpike in action. Brief information is given here about the examples and templates, with details of where they can be obtained from.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_examples">Examples</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_confess_2012_workshop_demo">Confess 2012 Workshop Demo</h3>
+<div class="paragraph">
+<p>This example was prepared for the Confess workshop and demonstrates how to use DeltaSpike instead of and side-by-side with MyFaces CODI. The secured web application demonstrates presenting users with differentiating content based on their account status.</p>
+</div>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/confess/confess2012_deltaspike" class="bare">https://github.com/confess/confess2012_deltaspike</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_fullstack_ee6_with_deltaspike">Fullstack EE6+ with DeltaSpike</h3>
+<div class="paragraph">
+<p>Simple example based on Java EE6+ and DeltaSpike (tested with EE6 and EE7).</p>
+</div>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/ee6-ds-demo" class="bare">https://github.com/os890/ee6-ds-demo</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_fullstack_codi_to_deltaspike">Fullstack CODI to DeltaSpike</h3>
+<div class="paragraph">
+<p>This pair of examples show how to achieve the most important MyFaces CODI features with DeltaSpike and also how to migrate a CODI project to DeltaSpike. The examples are basic, compacting core CODI features into just a few JSF pages, and are intended for deployment with TomEE.</p>
+</div>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/tomee_mf_stack_001" class="bare">https://github.com/os890/tomee_mf_stack_001</a></p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>CODI version in master branch</p>
+</li>
+<li>
+<p>Migrated DeltaSpike version in codi2ds branch</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_jboss_quickstarts">JBoss Quickstarts</h3>
+<div class="paragraph">
+<p>The JBoss quickstarts are small working examples that demonstrate recommended practices for specific Java EE technology use cases. A subset of these quickstarts are dedicated to demonstrating DeltaSpike, including custom authorization restrictions using annotations, constructing and modifying beans, extending the influence of CDI using BeanManager, and deactivating DeltaSpike features.</p>
+</div>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/jboss-developer/jboss-wfk-quickstarts" class="bare">https://github.com/jboss-developer/jboss-wfk-quickstarts</a></p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_templates">Templates</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_java_se_cdi_ds">Java SE + CDI + DS</h3>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/javase-cdi-ds-project-template" class="bare">https://github.com/os890/javase-cdi-ds-project-template</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_jsf_cdi_ds_servlet_container">JSF + CDI + DS (Servlet-Container)</h3>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/javaweb-cdi-ds-project-template" class="bare">https://github.com/os890/javaweb-cdi-ds-project-template</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_ejb_cdi_ds_module">EJB + CDI + DS (Module)</h3>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/javaee_cdi_ejb_ds_project_template" class="bare">https://github.com/os890/javaee_cdi_ejb_ds_project_template</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_jsf_ejb_cdi_ds_ee_server">JSF + EJB + CDI + DS (EE-Server)</h3>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/javaee_jsf_cdi_ejb_ds_project_template" class="bare">https://github.com/os890/javaee_jsf_cdi_ejb_ds_project_template</a></p>
+</div>
+</div>
+</div>
+</div>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 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>
+
+		</div>
+		<!-- /.container -->
+
+</body>
+</html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/javadoc.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/javadoc.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/javadoc.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>

Modified: websites/staging/deltaspike/trunk/content/staging/migration-guide.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/migration-guide.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/migration-guide.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>

Modified: websites/staging/deltaspike/trunk/content/staging/news.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/news.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/news.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>
@@ -171,6 +173,7 @@ body {
        	 		<ul class="sectlevel1">
 <li><a href="#_overview">Overview</a>
 <ul class="sectlevel2">
+<li><a href="#_14th_release_1_2_1_20_12_2014">14th Release (1.2.1) (20.12.2014)</a></li>
 <li><a href="#_13th_release_1_2_0_30_11_2014">13th Release (1.2.0) (30.11.2014)</a></li>
 <li><a href="#_new_pmc_member_20_11_2014">New PMC Member (20.11.2014)</a></li>
 <li><a href="#_12th_release_1_1_0_01_11_2014">12th Release (1.1.0) (01.11.2014)</a></li>
@@ -219,6 +222,16 @@ body {
 <h2 id="_overview">Overview</h2>
 <div class="sectionbody">
 <div class="sect2">
+<h3 id="_14th_release_1_2_1_20_12_2014">14th Release (1.2.1) (20.12.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 14th release
+(v1.2.1).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_1.2.1">release notes</a> contains 19 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
 <h3 id="_13th_release_1_2_0_30_11_2014">13th Release (1.2.0) (30.11.2014)</h3>
 <div class="paragraph">
 <p>The Apache DeltaSpike team is pleased to announce the 13th release

Modified: websites/staging/deltaspike/trunk/content/staging/release-preparation.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/release-preparation.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/release-preparation.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>

Modified: websites/staging/deltaspike/trunk/content/staging/steps_for_a_release.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/steps_for_a_release.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/steps_for_a_release.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>
@@ -173,19 +175,19 @@ body {
 <li><a href="#_first_steps">First steps</a></li>
 <li><a href="#_vote">Vote</a>
 <ul class="sectlevel2">
-<li><a href="#_start_the_vote">Start the vote</a></li>
+<li><a href="#_start_the_vote">Start the Vote</a></li>
 </ul>
 </li>
-<li><a href="#_announce_the_vote">Announce the vote</a></li>
+<li><a href="#_announce_the_vote">Announce the Vote</a></li>
 <li><a href="#_perform_the_final_release">Perform the final release</a>
 <ul class="sectlevel2">
-<li><a href="#_close_the_vote">Close the vote</a></li>
-<li><a href="#_upload_artifacts">Upload artifacts</a></li>
-<li><a href="#_check_downloads">Check downloads</a></li>
+<li><a href="#_close_the_vote">Close the Vote</a></li>
+<li><a href="#_upload_artifacts">Upload Artifacts</a></li>
+<li><a href="#_check_downloads">Check Downloads</a></li>
 <li><a href="#_update_site_content">Update site content</a></li>
 <li><a href="#_announce_the_release">Announce the Release</a>
 <ul class="sectlevel3">
-<li><a href="#_e_mails">E-Mails</a></li>
+<li><a href="#_e_mails">E-mails</a></li>
 <li><a href="#_twitter">Twitter</a></li>
 </ul>
 </li>
@@ -237,6 +239,9 @@ regards,
 <li>
 <p>Create release notes and commit them to deltaspike/readme/ (format [ReleaseNotes][version].txt)</p>
 </li>
+<li>
+<p>Update version number in documentation/src/main/asciidoc/configure.adoc</p>
+</li>
 </ul>
 </div>
 <div class="paragraph">
@@ -254,7 +259,7 @@ mvn clean install -Pglassfish-build-mana
 </div>
 </div>
 <div class="paragraph">
-<p>deploy a demo app esp. with jsf-impl-ee6 to an ee6 server and check the logs (if there are no optional ee7+ classes)
+<p>deploy a demo app especially with jsf-impl-ee6 to an ee6 server and check the logs (if there are no optional ee7+ classes)
 (<a href="https://github.com/os890/ee6-ds-demo" class="bare">https://github.com/os890/ee6-ds-demo</a> can be used for it e.g.)</p>
 </div>
 </div>
@@ -269,7 +274,7 @@ git checkout -b deltaspike-[release vers
 
 mvn release:prepare -Pdistribution -DreleaseProfiles=distribution
 
-//hint: don't use -DdryRun=true -- since it can break the next step
+//hint: dois not use -DdryRun=true -- since it can break the next step
 mvn release:perform -Pdistribution -DreleaseProfiles=distribution
 
 //!!!check the created commits including user-name and email
@@ -278,7 +283,7 @@ mvn release:perform -Pdistribution -Drel
 //check esp. .../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
 //close the repository
 
-//push the release-branch and tag to a 3rd party git repo
+//push the release-branch and tag to a third-party git repo
 git remote add vote https://github.com/[user]/deltaspike-vote
 git push -u vote master
 git push vote deltaspike-[release version]
@@ -291,7 +296,7 @@ git push vote --tags</pre>
 <h2 id="_vote">Vote</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_start_the_vote">Start the vote</h3>
+<h3 id="_start_the_vote">Start the Vote</h3>
 <div class="paragraph">
 <p>e.g.:</p>
 </div>
@@ -331,7 +336,7 @@ Thanks,
 </div>
 </div>
 <div class="sect1">
-<h2 id="_announce_the_vote">Announce the vote</h2>
+<h2 id="_announce_the_vote">Announce the Vote</h2>
 <div class="sectionbody">
 <div class="ulist">
 <ul>
@@ -349,7 +354,7 @@ Thanks,
 <h2 id="_perform_the_final_release">Perform the final release</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_close_the_vote">Close the vote</h3>
+<h3 id="_close_the_vote">Close the Vote</h3>
 <div class="paragraph">
 <p>After 72 hours close the vote.</p>
 </div>
@@ -412,7 +417,7 @@ git push origin master</pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_upload_artifacts">Upload artifacts</h3>
+<h3 id="_upload_artifacts">Upload Artifacts</h3>
 <div class="listingblock">
 <div class="content">
 <pre>svn co https://dist.apache.org/repos/dist/release/deltaspike
@@ -422,7 +427,7 @@ mkdir [version]
 </div>
 </div>
 <div class="sect2">
-<h3 id="_check_downloads">Check downloads</h3>
+<h3 id="_check_downloads">Check Downloads</h3>
 <div class="ulist">
 <ul>
 <li>
@@ -456,7 +461,7 @@ mkdir [version]
 <div class="sect2">
 <h3 id="_announce_the_release">Announce the Release</h3>
 <div class="sect3">
-<h4 id="_e_mails">E-Mails</h4>
+<h4 id="_e_mails">E-mails</h4>
 <div class="listingblock">
 <div class="content">
 <pre>[ANNOUNCE] Release of Apache DeltaSpike [version]

Modified: websites/staging/deltaspike/trunk/content/staging/suggested-git-workflows.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/suggested-git-workflows.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/suggested-git-workflows.html Thu Dec 25 14:01:01 2014
@@ -14,6 +14,7 @@
 
 <link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
 <link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
 
 <style type="text/css">
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -105,6 +106,7 @@ table.CodeRay td.code>pre{padding:0}
 .CodeRay .delete .delete{color:#800}
 .CodeRay .change .change{color:#66f}
 .CodeRay .head .head{color:#f4f}
+
 body {
 	padding-top: 60px;
 	padding-bottom: 40px;
@@ -134,11 +136,11 @@ body {
 					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="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+					href="./index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="index.html">Home</a></li>
+							href="./index.html">Home</a></li>
 						<li><a href="./documentation">Documentation</a></li>
 						<li><a href="./javadoc.html">Javadoc</a></li>
 						<li><a href="./documentation/source.html">Source</a></li>