You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2017/07/11 18:40:53 UTC

svn commit: r1801644 [5/9] - /tomee/site/trunk/content/examples/

Modified: tomee/site/trunk/content/examples/jsf-managedBean-and-ejb.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/jsf-managedBean-and-ejb.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/jsf-managedBean-and-ejb.html (original)
+++ tomee/site/trunk/content/examples/jsf-managedBean-and-ejb.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -400,28 +398,21 @@ version="2.0"&gt;
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -432,6 +423,14 @@ version="2.0"&gt;
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/lookup-of-ejbs-with-descriptor.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/lookup-of-ejbs-with-descriptor.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/lookup-of-ejbs-with-descriptor.html (original)
+++ tomee/site/trunk/content/examples/lookup-of-ejbs-with-descriptor.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -346,28 +344,21 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -378,6 +369,14 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/lookup-of-ejbs.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/lookup-of-ejbs.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/lookup-of-ejbs.html (original)
+++ tomee/site/trunk/content/examples/lookup-of-ejbs.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -313,28 +311,21 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -345,6 +336,14 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/mbean-auto-registration.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/mbean-auto-registration.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/mbean-auto-registration.html (original)
+++ tomee/site/trunk/content/examples/mbean-auto-registration.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -286,28 +284,21 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -318,6 +309,14 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/moviefun-rest.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/moviefun-rest.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/moviefun-rest.html (original)
+++ tomee/site/trunk/content/examples/moviefun-rest.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -124,28 +122,21 @@
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -156,6 +147,14 @@
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/moviefun.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/moviefun.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/moviefun.html (original)
+++ tomee/site/trunk/content/examples/moviefun.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -505,28 +503,21 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -537,6 +528,14 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/movies-complete-meta.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/movies-complete-meta.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/movies-complete-meta.html (original)
+++ tomee/site/trunk/content/examples/movies-complete-meta.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -626,28 +624,21 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -658,6 +649,14 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/movies-complete.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/movies-complete.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/movies-complete.html (original)
+++ tomee/site/trunk/content/examples/movies-complete.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -505,28 +503,21 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -537,6 +528,14 @@ Tests run: 2, Failures: 0, Errors: 0, Sk
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/mtom.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/mtom.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/mtom.html (original)
+++ tomee/site/trunk/content/examples/mtom.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -121,28 +119,21 @@
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -153,6 +144,14 @@
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/multi-jpa-provider-testing.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/multi-jpa-provider-testing.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/multi-jpa-provider-testing.html (original)
+++ tomee/site/trunk/content/examples/multi-jpa-provider-testing.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -124,28 +122,21 @@
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -156,6 +147,14 @@
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/multiple-arquillian-adapters.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/multiple-arquillian-adapters.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/multiple-arquillian-adapters.html (original)
+++ tomee/site/trunk/content/examples/multiple-arquillian-adapters.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -124,28 +122,21 @@
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -156,6 +147,14 @@
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/multiple-tomee-arquillian.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/multiple-tomee-arquillian.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/multiple-tomee-arquillian.html (original)
+++ tomee/site/trunk/content/examples/multiple-tomee-arquillian.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -124,28 +122,21 @@
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -156,6 +147,14 @@
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/myfaces-codi-demo.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/myfaces-codi-demo.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/myfaces-codi-demo.html (original)
+++ tomee/site/trunk/content/examples/myfaces-codi-demo.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -206,28 +204,21 @@ This example shows how it improves the d
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -238,6 +229,14 @@ This example shows how it improves the d
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/persistence-fragment.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/persistence-fragment.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/persistence-fragment.html (original)
+++ tomee/site/trunk/content/examples/persistence-fragment.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -269,28 +267,21 @@ public class MoviesTest {
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -301,6 +292,14 @@ public class MoviesTest {
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>

Modified: tomee/site/trunk/content/examples/pojo-webservice.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/examples/pojo-webservice.html?rev=1801644&r1=1801643&r2=1801644&view=diff
==============================================================================
--- tomee/site/trunk/content/examples/pojo-webservice.html (original)
+++ tomee/site/trunk/content/examples/pojo-webservice.html Tue Jul 11 18:40:51 2017
@@ -6,7 +6,8 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Apache TomEE</title>
-	<meta name="description" content="Apache TomEE is a light JavaEE server with a lot tooling" />
+	<meta name="description"
+		  content="Apache TomEE is a lightweight, yet powerful, JavaEE Application server with feature rich tooling." />
 	<meta name="keywords" content="tomee,asf,apache,javaee,jee,shade,embedded,test,junit,applicationcomposer,maven,arquillian" />
 	<meta name="author" content="Luka Cvetinovic for Codrops" />
 	<link rel="icon" href="../favicon.ico">
@@ -53,7 +54,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="..//#">
+				<a class="navbar-brand" href="/">
 				    <span>
 
 				    
@@ -67,14 +68,11 @@
 			<!-- Collect the nav links, forms, and other content for toggling -->
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav navbar-right main-nav">
-					<li><a href="../developer/index.html">Developer</a></li>
-					<li><a href="../admin/index.html">Admin</a></li>
-					<li><a href="../advanced/index.html">Advanced</a></li>
-					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../docs.html">Documentation</a></li>
 					<li><a href="../examples/index-ng.html">Examples</a></li>
-					<li><a href="../blog/index.html">Blog</a></li>
 					<li><a href="../community/index.html">Community</a></li>
-                    <li><a href="../download-ng.html">Downloads</a></li>
+					<li><a href="../security/index.html">Security</a></li>
+					<li><a href="../download-ng.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->
@@ -124,28 +122,21 @@
 				<div class="col-sm-6 text-center-mobile">
 					<div class="row opening-hours">
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../admin/index.html" class="white">Administration</a></h5>
-							<ul class="list-unstyled">
-								<li><a href="../admin/cluster/index.html" class="regular light-white">Cluster</a></li>
-								<li><a href="../admin/configuration/index.html" class="regular light-white">Configuration</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../developer/index.html" class="white">Developer</a></h5>
+							<h5><a href="../documentation.html" class="white">Documentation</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../developer/classloading/index.html" class="regular light-white">Classloading</a></li>
-								<li><a href="../developer/ide/index.html" class="regular light-white">IDE</a></li>
+								<li><a href="../admin/configuration/index.html" class="regular light-white">How to configure</a></li>
+								<li><a href="../admin/directory-structure.html" class="regular light-white">Dir. Structure</a></li>
 								<li><a href="../developer/testing/index.html" class="regular light-white">Testing</a></li>
-								<li><a href="../developer/tools/index.html" class="regular light-white">Tools</a></li>
+								<li><a href="../admin/cluster/index.html" class="regular light-white">Clustering</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
-							<h5><a href="../advanced/index.html" class="white">Advanced</a></h5>
+							<h5><a href="../examples.html" class="white">Examples</a></h5>
 							<ul class="list-unstyled">
-								<li><a href="../advanced/applicationcomposer/index.html" class="regular light-white">Application Composer</a></li>
-								<li><a href="../advanced/setup/index.html" class="regular light-white">Setup</a></li>
-								<li><a href="../advanced/shading/index.html" class="regular light-white">Shading</a></li>
-								<li><a href="../advanced/tomee-embedded/index.html" class="regular light-white">TomEE Embedded</a></li>
+								<li><a href="../examples/simple-cdi-interceptor.html" class="regular light-white">CDI Interceptor</a></li>
+								<li><a href="../examples/rest-cdi.html" class="regular light-white">REST with CDI</a></li>
+								<li><a href="../examples/ejb-examples.html" class="regular light-white">EJB</a></li>
+								<li><a href="../examples/jsf-managedBean-and-ejb.html" class="regular light-white">JSF</a></li>
 							</ul>
 						</div>
 						<div class="col-sm-3 text-center-mobile">
@@ -156,6 +147,14 @@
 								<li><a href="../community/sources.html" class="regular light-white">Sources</a></li>
 							</ul>
 						</div>
+						<div class="col-sm-3 text-center-mobile">
+							<h5><a href="../security/index.html" class="white">Security</a></h5>
+							<ul class="list-unstyled">
+								<li><a href="http://apache.org/security" target="_blank" class="regular light-white">Apache Security</a></li>
+								<li><a href="http://apache.org/security/projects.html" target="_blank" class="regular light-white">Security Projects</a></li>
+								<li><a href="http://cve.mitre.org" target="_blank" class="regular light-white">CVE</a></li>
+							</ul>
+						</div>
 					</div>
 				</div>
 			</div>