polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject svn commit: r1689616 [2/2] - in /zest/site/content: ./ 2007/11/13/ 2008/01/30/ 2008/04/14/ 2008/06/06/ 2008/08/08/ 2008/09/15/ 2008/09/19/ 2008/11/17/ 2009/01/09/ 2009/01/10/ 2009/02/19/ 2009/02/20/ 2009/04/20/ 2009/05/10/ 2009/09/03/ 2010/01/25/ 2010/...
Date Tue, 07 Jul 2015 09:20:20 GMT
Modified: zest/site/content/community/contributors.html
URL: http://svn.apache.org/viewvc/zest/site/content/community/contributors.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/community/contributors.html (original)
+++ zest/site/content/community/contributors.html Tue Jul  7 09:20:19 2015
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>People behind Apache Zest</title>
+        <title>People behind Apache Zest™</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -98,11 +98,11 @@
         <div id="content" class="container-fluid">
 
 <div class="page-header">
-    <h1>People behind Apache Zest</h1>
+    <h1>People behind Apache Zest™</h1>
     <p class="lead">
       Qi4j was started in 2007 by Niclas Hedhman and Rickard &Ouml;berg, a.k.a "The Founders".
       <br/>
-      In 2015, Qi4j came to the Apache Software Foundation, and is run as an Apache project.
+      In 2015, Qi4j came to the Apache Software Foundation, and is run as an Apache project named Apache Zest™.
     </p>
 </div>
 <div class="row-fluid">

Modified: zest/site/content/community/get_help.html
URL: http://svn.apache.org/viewvc/zest/site/content/community/get_help.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/community/get_help.html (original)
+++ zest/site/content/community/get_help.html Tue Jul  7 09:20:19 2015
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>Zest - Get Help</title>
+        <title>Apache Zest™ - Get Help</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -108,10 +108,10 @@
             <img src="../landing-resources/img/feather.png" class="pull-right" style="height: 2em" />
         </h2>
         <p>
-            To discuss with the Apache Zest community, it is easiest to do so at the <a href="https://www.apache.org/foundation/mailinglists.html" target="_blank">dev@zest.apache.org</a> mailing list.
+            To discuss with the Apache Zest™ community, it is easiest to do so at the <a href="http://mail-archives.apache.org/mod_mbox/zest-dev/" target="_blank">dev@zest.apache.org</a> mailing list.
         </p>
         <p>Subscribe: <a href="mailto:dev-subscribe@zest.apache.org">mailto:dev-subscribe@zest.apache.org</a></p>
-        <p>Also <a href="https://www.apache.org/foundation/mailinglists.html">review general information about Apache mailing lists</a></p>
+        <p>Also review general information about many <a href="https://www.apache.org/foundation/mailinglists.html">other Apache mailing lists</a></p>
     </div>
     <div class="span4">
         <h2>
@@ -119,7 +119,7 @@
             <img src="../landing-resources/img/logo-stackoverflow.png" class="pull-right" style="height: 2em" />
         </h2>
         <p>
-            To post question to and get answers from the Qi4j community, go to
+            To post question to and get answers from the Apache Zest™ community, go to
             <a href="http://stackoverflow.com/questions/tagged/qi4j">StackOverflow</a>.
         </p>
     </div>

Modified: zest/site/content/community/index.html
URL: http://svn.apache.org/viewvc/zest/site/content/community/index.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/community/index.html (original)
+++ zest/site/content/community/index.html Tue Jul  7 09:20:19 2015
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>Apache Zest Community</title>
+        <title>Apache Zest™ Community</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -98,9 +98,9 @@
         <div id="content" class="container-fluid">
 
 <div class="page-header">
-    <h1>Apache Zest Community</h1>
+    <h1>Apache Zest™ Community</h1>
     <p class="lead">
-        Apache Zest is an open development community effort with an Apache ver 2.0 open source license.
+        Apache Zest™ is an open development community effort with an Apache ver 2.0 open source license.
     </p>
 </div>
 <div class="row-fluid">
@@ -109,19 +109,19 @@
 
         <h2>What does this really mean?</h2>
         <p>
-            First of all, we work together to achieve the visions of Qi4j, based on technical merits alone in an open and
+            First of all, we work together to achieve the visions of Apache Zest™, based on technical merits alone in an open and
             friendly manner, mostly via the dev@zest.apache.org mailing list. It means that everyone in the community are stake
             holders in the resulting codebase, and noone can claim it is mine.
         </p>
         <p>
-            Secondly, all source code, artwork and documentation produced in Qi4j are licensed very liberally under the Apache
+            Secondly, all source code, artwork and documentation produced in Apache Zest™ are licensed very liberally under the Apache
             License ver 2.0. This allows you to use our efforts in your own projects, whether they are open sourced, commercial
             or any other arrangement you like, subject to a few terms like "Must re-distribute a Notice that your product
-            contains Qi4j" and such. See the License text for exact details, and please consult with IP rights lawyers about
+            contains Apache Zest™ and such. See the License text for exact details, and please consult with IP rights lawyers about
             this and other Open Source licenses.
         </p>
         <p>
-            Thirdly, Qi4j invites everyone to participate. There are many ways to participate, not only by writing code. See
+            Thirdly, Apache Zest™ invites everyone to participate. There are many ways to participate, not only by writing code. See
             list in the <a href="participate.html">Participation</a> section.
         </p>
 

Modified: zest/site/content/community/licensing_faq.html
URL: http://svn.apache.org/viewvc/zest/site/content/community/licensing_faq.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/community/licensing_faq.html (original)
+++ zest/site/content/community/licensing_faq.html Tue Jul  7 09:20:19 2015
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>Apache Zest Licensing FAQ</title>
+        <title>Apache Zest™ Licensing FAQ</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -109,7 +109,7 @@
         <dl>
 
             <dt class="lead">
-            <strong>Q</strong>: Can I use Qi4j Core in my commercial applications under a closed-source, proprietary license?
+            <strong>Q</strong>: Can I use Apache Zest™ Core in my commercial applications under a closed-source, proprietary license?
             </dt>
             <dd>
                 <strong>A</strong>: Yes. The Apache License is very business-friendly. Please observe the obligations on your part,
@@ -122,12 +122,12 @@
         <dl>
 
             <dt class="lead">
-            <strong>Q</strong>: My company has invested a lot of time to learn and understand the Qi4j platform, and we think we
-            are really good at writing Qi4j applications and would like to start training others. Can we advertise that we are
-            "Qi4j experts" or that we conduct "Advanced Qi4j training"?
+            <strong>Q</strong>: My company has invested a lot of time to learn and understand the Apache Zest™ platform, and we think we
+            are really good at writing Apache Zest™ applications and would like to start training others. Can we advertise that we are
+            "Apache Zest™ experts" or that we conduct "Advanced Apache Zest™ training"?
             </dt>
             <dd>
-                <strong>A</strong>: The Apache Software Foundation has a unified <a href="http://www.apache.org/foundation/marks/">trademarks and branding policy</a>, which covers this question. This is somewhat more strict than the pre-ASF policy in the Qi4j project, and if you have any doubts, please contact the Apache Zest project for clarification. The intent of the Project Management Committee is to lean towards "permissible" rather than "exclusionary", as long as credit is given where credit is due. <strong>Also</strong> be aware that all references to "Qi4j" MUST be together with "Apache Zest", such as "Apache Zest Qi4j" or "Qi4j subproject at Apache Zest". 
+                <strong>A</strong>: The Apache Software Foundation has a unified <a href="http://www.apache.org/foundation/marks/">trademarks and branding policy</a>, which covers this question. This is somewhat more strict than the pre-ASF policy in the Apache Zest™ project, and if you have any doubts, please contact the Apache Zest project for clarification. The intent of the Project Management Committee is to lean towards "permissible" rather than "exclusionary", as long as credit is given where credit is due. <strong>Also</strong> be aware that all references to "Zest" MUST be "Apache Zest™". 
             </dd>
         </dl>
 

Modified: zest/site/content/community/maturity.html
URL: http://svn.apache.org/viewvc/zest/site/content/community/maturity.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/community/maturity.html (original)
+++ zest/site/content/community/maturity.html Tue Jul  7 09:20:19 2015
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>Apache Zest Maturity Model</title>
+        <title>Apache Zest™ Maturity Model</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -99,7 +99,7 @@
 
 <div class="page-header">
     <h1>Maturity Model</h1>
-    <p class="lead">Apache Zest is hosted at the Apache Software Foundation and this is the 
+    <p class="lead">Apache Zest™ is hosted at the Apache Software Foundation and this is the 
                     <a href="https://community.apache.org/apache-way/apache-project-maturity-model.html">Apache
                     Maturity Model</a> self-declaration of its compliance..</p>
 </div>

Modified: zest/site/content/community/participate.html
URL: http://svn.apache.org/viewvc/zest/site/content/community/participate.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/community/participate.html (original)
+++ zest/site/content/community/participate.html Tue Jul  7 09:20:19 2015
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>Participate to Apache Zest</title>
+        <title>Participate to Apache Zest™</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -99,7 +99,7 @@
 
 <div class="page-header">
     <h1>Participate</h1>
-    <p class="lead">Apache Zest is a community based on open development principles</p>
+    <p class="lead">Apache Zest™ is a community based on open development principles</p>
 </div>
 
 <div class="row-fluid">
@@ -107,24 +107,24 @@
     <div class="span8">
 
         <p>
-            The Apache Zest community is an open source community centered around software and components for Composite Oriented
-            Programming on Java/Scala, and related design methodologies that are enhanced by using Qi4j, like Domain Driven
+            The Apache Zest™ community is an open source community centered around software and components for Composite Oriented
+            Programming on Java/Scala, and related design methodologies that are enhanced by using Apache Zest™, like Domain Driven
             Design, DCI (Data, Context, Interaction) and HATEOAS REST.
         </p>
         <p>
-            The Apache Zest community is an open community, in so far as it welcomes any member that accepts the basic criteria of
+            The Apache Zest™ community is an open community, in so far as it welcomes any member that accepts the basic criteria of
             contribution and adheres to the community's Code of Conduct.
         </p>
         <p>
-            Note that you can contribute to Apache Zest also by contributing documentation or giving feedback on the current documentation.
+            Note that you can contribute to Apache Zest™ also by contributing documentation or giving feedback on the current documentation.
             Basically, at all the places where you can get help, there's also room for contributions.
         </p>
 
         <div class="well">
             <h4>dev@zest.apache.org mailing list</h4>
             <p>
-                To discuss with the Apache Zest community, it is easiest to do so at the
-                <a href="https://www.apache.org/foundation/mailinglists.html" target="_blank">dev@zest.apache.org</a> mailing list. This list is open to everyone and regular open source forum etiquette applies. Failure to be respectful may cause the poster to be
+                To discuss with the Apache Zest™ community, it is easiest to do so at the
+                <a href="http://mail-archives.apache.org/mod_mbox/zest-dev/" target="_blank">dev@zest.apache.org</a> mailing list. This list is open to everyone and regular open source forum etiquette applies. Failure to be respectful may cause the poster to be
                 expelled. The forum is a light and friendly one, where we are all friends working on a marvelous way of writing Java
                 code.
             </p>
@@ -137,11 +137,11 @@
             We borrow a lot of our principles in community building from OPS4J, which also provides us with the infrastructure
             needs we have for the time being. OPS4J is unique that it allows everyone to participate and modify the codebase
             without being voted into the community, like Apache and other communities. We want the spirit of this, but we are a bit
-            nervous that Qi4j will be too successful and too many people want to modify the core pieces and some will spoil more
+            nervous that Apache Zest™ will be too successful and too many people want to modify the core pieces and some will spoil more
             than progress.
         </p>
         <p>
-            We have therefor concluded that we will, at least initially, confine the Qi4j Core to entrusted members of the
+            We have therefor concluded that we will, at least initially, confine the Apache Zest™ Core to entrusted members of the
             community only, whereas everyone is free to participate in the many other sub-projects, such as extensions, libraries
             and integration solutions. By the introduction of Git, it is now much easier for people to work on any part of the
             system, even if they have no official commit rights and allow people to review the work, then commit it and the right
@@ -150,8 +150,8 @@
 
         <h2>Core Dev Team</h2>
         <p>
-            The Core team are the Stewards and Guardians of the overall project. They ensure that all pieces of Qi4j are in good
-            standing and assist in all matters of the project. Only the Core Team will modify the official Qi4j Core repository.
+            The Core team are the Stewards and Guardians of the overall project. They ensure that all pieces of Apache Zest™ are in good
+            standing and assist in all matters of the project. Only the Core Team will modify the official Apache Zest™ Core repository.
         </p>
 
         <h2>Platform Team</h2>

Modified: zest/site/content/community/playing_field.html
URL: http://svn.apache.org/viewvc/zest/site/content/community/playing_field.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/community/playing_field.html (original)
+++ zest/site/content/community/playing_field.html Tue Jul  7 09:20:19 2015
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -100,7 +100,7 @@
 <div class="page-header">
     <h1>Playing field</h1>
     <p class="lead">
-        <a href="https://www.apache.org/foundation/mailinglists.html" target="_blank">dev@zest.apache.org</a> mailing list is a collaborative effort of open development, and we need to have some rules in place to make that work.
+        <a href="http://mail-archives.apache.org/mod_mbox/zest-dev/" target="_blank">dev@zest.apache.org</a> mailing list is a collaborative effort of open development, and we need to have some rules in place to make that work.
         <br/>
         Below is an evolving list of rules and guidelines that we try to follow.
     </p>
@@ -113,7 +113,7 @@
 
         <h2>Coding Standard</h2>
         <p>
-            The coding standard at Qi4j promotes whitespace to aid in reading the code. Opening braces are placed on new lines,
+            The coding standard at Apache Zest™ promotes whitespace to aid in reading the code. Opening braces are placed on new lines,
             spaces are between operators and so forth. We are following the OPS4J coding standards, as they have IDEA, Eclipse and
             Checkstyle templates prepared or in the works. These are slowly evolving, and it is likely we will evolve with them.
             The coding standards can be found in
@@ -131,12 +131,12 @@
 
         <h2>Committers</h2>
         <p>
-            The term "committer" is often used in open development efforts, and in Qi4j it refers to the individuals who has commit
-            rights to a particular part of the codebase. Some areas in Qi4j codebase are open to everyone, others are based on
+            The term "committer" is often used in open development efforts, and in Apache Zest™ it refers to the individuals who has commit
+            rights to a particular part of the codebase. Some areas in Apache Zest™ codebase are open to everyone, others are based on
             meritocracy where individuals who has been contributing to the subproject are invited by the existing committers.
             People who has not contributed to a subproject over the last 12 months are no longer considered committers, although
             the commit rights will not be revoked. Note that "rights" in this context is a social contract, as no ACL is in place
-            to stop a Community member to mess up the Qi4j Core. It is mostly a matter of loss of reputation at stake, since
+            to stop a Community member to mess up the Apache Zest™ Core. It is mostly a matter of loss of reputation at stake, since
             it is easy to revert these and if found to be malicious the member will have all commit rights revoked.
         </p>
 
@@ -166,28 +166,18 @@
 
         <h2>Trademarks, Patents and Licenses</h2>
         <p>
-            Qi4J is licensed under the Apache License version 2.0. All committers agree that all their contributions are licensed
-            under this license to Qi4j, other committers and the general public. The Copyright of each contribution is held by the
+            Apache Zest™ is licensed under the Apache License version 2.0. All committers agree that all their contributions are licensed
+            under this license to Apache Zest™, other committers and the general public. The Copyright of each contribution is held by the
             contributor, and no Copyright assigns are required.
         </p>
         <p>
             All committers assert that no patents are hidden within their contributions or that if such patent exists then such
-            patent is freely licensed to Qi4j, other committers and the general public.
+            patent is freely licensed to Apache Zest™, other committers and the general public.
         </p>
         <p>
-            All contributors agree that the Qi4j project may change to a later version of the Apache License, if/when such license
+            All contributors agree that the Apache Zest™ project may change to a later version of the Apache License, if/when such license
             becomes available and the Core Dev Team at that time finds it appropriate.
         </p>
-        <p>
-            "Qi4j" is a trademark of the Qi4j Community, Niclas Hedhman, Rickard &Ouml;berg, and all copyright owners of the Qi4j
-            codebase. If Qi4j is registered as a trademark, then that person/entity agrees that such registration is to the benefit
-            of the Qi4j Community and all copyright owners of the Qi4j codebase, and only acts as an agent on their behalf. Failure
-            to do so, the registrant looses the right to participate in the Qi4j effort, and potentially face legal actions.
-        </p>
-        <p>
-            Qi4j is a community effort and is currently no organization. This may change into a non-profit, membership organization
-            at some later point in time.
-        </p>
 
     </div>
     <div class="span2"></div>

Modified: zest/site/content/download-qi4j-legacy.html
URL: http://svn.apache.org/viewvc/zest/site/content/download-qi4j-legacy.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/download-qi4j-legacy.html (original)
+++ zest/site/content/download-qi4j-legacy.html Tue Jul  7 09:20:19 2015
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>

Modified: zest/site/content/download.html
URL: http://svn.apache.org/viewvc/zest/site/content/download.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/download.html (original)
+++ zest/site/content/download.html Tue Jul  7 09:20:19 2015
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>Download Apache Zest</title>
+        <title>Download Apache Zest™</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -106,7 +106,7 @@
     <div class="span6">
         <h3>Versioning</h2>
 
-        <p>Apache Zest versioning tries to stick to;</p>
+        <p>Apache Zest™ versioning tries to stick to;</p>
         <ul>
             <li>For changes in the 3rd version digit, for instance from 1.3.1 to 1.3.2, only bug fixes have occurred.</li>
             <li>For changes in the 2nd version digit, for instance from 1.3.1 to 1.4, more features have been added.</li>
@@ -119,7 +119,7 @@
         </p>
         <p>
             We reserve the right that these dependencies on other systems may change between releases.
-            For instance, a change between Qi4j 1.1 and Qi4j 1.2 was that CGLib was dropped and replaced by ASM
+            For instance, a change between 1.1 and 1.2 was that CGLib was dropped and replaced by ASM
             as a new dependency.
         </p>
     </div>
@@ -128,7 +128,7 @@
             <strong>Using Gradle, Maven, SBT, Ivy or any other build system that provide dependency management?</strong>
         </p>
         <p>
-            Learn how to <a href="qi4j/latest/howto-depend-on-qi4j.html">depend on Apache Zest Qi4j in your build</a>.
+            Learn how to <a href="qi4j/latest/howto-depend-on-qi4j.html">depend on Apache Zest™ (Java Edition) in your build</a>.
         </p>
     </div>
     <div class="span2"></div>
@@ -137,15 +137,15 @@
     <div class="span2"></div>
     <div class="span8">
 
-        <h2>Apache Zest Qi4j SDK Releases</h2>
+        <h2>Apache Zest™ (Java Edition) SDK Releases</h2>
 
         <p class="alert">
-            The Apache Zest project has not released any Qi4j version yet.
+            The Apache Zest™ project has not released any version yet.
             <br/>
             Until then, <a href="download-qi4j-legacy.html">download a legacy Qi4j version</a>.
         </p>
         <p>
-            Apache Zest Qi4j 2.1 and 3.0 are on their way and will be released under the umbrella of the Apache Software Foundation.
+            Apache Zest™ (Java Edition) 2.1 and 3.0 are on their way and will be released under the umbrella of the Apache Software Foundation.
         </p>
 
     </div>

Modified: zest/site/content/index.html
URL: http://svn.apache.org/viewvc/zest/site/content/index.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/index.html (original)
+++ zest/site/content/index.html Tue Jul  7 09:20:19 2015
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -107,15 +107,15 @@
         <div class="row-fluid">
             <div class="span9">
                 <div class="well">
-                    <h2>What is Apache Zest?</h2>
+                    <h2>What is Apache Zest™?</h2>
                     <p>
-                        The short answer is that <strong>Apache Zest</strong> is a community based effort exploring Composite Oriented Programming for domain centric application development. This includes evolved concepts from Aspect Oriented Programming, Dependency Injection and Domain Driven Design.
+                        The short answer is that <strong>Apache Zest™</strong> is a community based effort exploring Composite Oriented Programming for domain centric application development. This includes evolved concepts from Aspect Oriented Programming, Dependency Injection and Domain Driven Design.
                     </p>
                     <p>
-                        First Apache Zest sub-project is <strong>Qi4j</strong>, an implementation of Composite Oriented Programming, using the standard Java platform, without the use of any pre-processors or new language elements. Everything you know from Java still applies and you can leverage both your experience and toolkits to become more productive with Composite Oriented Programming today.
+                        <strong>Apache Zest™ (Java Edition)</strong>, first Apache Zest sub-project, is an implementation of Composite Oriented Programming, using the standard Java platform, without the use of any pre-processors or new language elements. Everything you know from Java still applies and you can leverage both your experience and toolkits to become more productive with Composite Oriented Programming today.
                     </p>
                     <p>
-                        The Apache Zest community welcomes any effort exploring Composite Oriented Programming for domain centric application development using any technology.
+                        The Apache Zest™ community welcomes any effort exploring Composite Oriented Programming for domain centric application development using any technology.
                     </p>
                 </div>
             </div>
@@ -128,22 +128,22 @@
         <div class="row-fluid">
             <div class="span6">
                 <h3><i class="icon-briefcase"></i> Learn more</h3>
-                <p><a href="qi4j/latest/intro.html">Learn more</a> about problems Apache Zest Qi4j tries to solve thanks to Composite Oriented Programming and how you can confidently develop domain centric applications with it.</p>
+                <p><a href="qi4j/latest/intro.html">Learn more</a> about problems Apache Zest™ (Java Edition) tries to solve thanks to Composite Oriented Programming and how you can confidently develop domain centric applications with it.</p>
             </div><!--/span-->
             <div class="span6">
                 <h3><i class="icon-download"></i> Download</h3>
-                <p><a href="download.html">Download</a> the Apache Zest Qi4j SDK binaries and sources, learn how to <a href="qi4j/latest/howto-depend-on-qi4j.html">depend on Apache Zest Qi4j in your build</a> or simply get the <a href="community/codebase.html">source</a>.</p>
+                <p><a href="download.html">Download</a> the Apache Zest™ (Java Edition) SDK binaries and sources, learn how to <a href="qi4j/latest/howto-depend-on-qi4j.html">depend on Apache Zest™ (Java Edition) in your build</a> or simply get the <a href="community/codebase.html">source</a>.</p>
             </div><!--/span-->
         </div><!--/row-->
         <div class="row-fluid">
             <div class="span6">
                 <h3><i class="icon-time"></i> Get started</h3>
-                <p>Get a grasp on Apache Zest Qi4j in 2:42 and then, get real through the first steps needed to get a complete application up and running. From there, work through the fundamentals of Apache Zest Qi4j development with in-depth tutorials.</p>
+                <p>Get a grasp on Apache Zest™ (Java Edition) in 2:42 and then, get real through the first steps needed to get a complete application up and running. From there, work through the fundamentals of Apache Zest™ (Java Edition) development with in-depth tutorials.</p>
                 <p><a href="qi4j/latest/tutorials.html"><i class="icon-time"></i> View details &raquo;</a></p>
             </div><!--/span-->
             <div class="span6">
                 <h3><i class="icon-book"></i> Read the docs</h3>
-                <p>Everything you need to know about internals and how to use Apache Zest Qi4j. Runable samples, comprehensive documentation of the Apache Zest Qi4j Core, Libraries, Extensions and Tools.</p>
+                <p>Everything you need to know about internals and how to use Apache Zest™ (Java Edition). Runable samples, comprehensive documentation of the Apache Zest™ (Java Edition) Core, Libraries, Extensions and Tools.</p>
                 <p><a class="" href="qi4j/latest/index.html"><i class="icon-book"></i> View details &raquo;</a></p>
             </div><!--/span-->
         </div><!--/row-->

Modified: zest/site/content/news.html
URL: http://svn.apache.org/viewvc/zest/site/content/news.html?rev=1689616&r1=1689615&r2=1689616&view=diff
==============================================================================
--- zest/site/content/news.html (original)
+++ zest/site/content/news.html Tue Jul  7 09:20:19 2015
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>Apache Zest News</title>
+        <title>Apache Zest™ News</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
@@ -48,7 +48,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest</strong></a>
+                    <a class="brand" href="/"><img src="/landing-resources/img/feather.png" width="64"/> Apache <strong>Zest™</strong></a>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="/news.html"><i class="icon-rss"></i> News</a></li>
@@ -58,11 +58,11 @@
                                     <i class="icon-book"></i> Documentation <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest Qi4j release</a></li>
-                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> Qi4j 2.0</a></li>
-                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> Qi4j &lt;=1.4.x</a></li>
+                                    <li role="menuitem"><a href="/qi4j/latest/index.html"><i class="icon-caret-right"></i> Latest release</a></li>
+                                    <li role="menuitem"><a href="/qi4j/2.0/index.html"><i class="icon-caret-right"></i> 2.0</a></li>
+                                    <li role="menuitem"><a href="/qi4j/1.4/index.html"><i class="icon-caret-right"></i> &lt;=1.4.x</a></li>
                                     <li class="divider"></li>
-                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> Qi4j develop branch</a></li>
+                                    <li role="menuitem"><a href="/qi4j/develop/index.html"><i class="icon-caret-right"></i> develop branch</a></li>
                                 </ul>
                             </li>
                             <li class="dropdown">
@@ -80,7 +80,7 @@
                                     <li role="menuitem"><a href="https://issues.apache.org/jira/browse/ZEST" target="_blank"><i class="icon-caret-right"></i> Issues</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="/community/maturity.html"><i class="icon-caret-right"></i> Maturity Model</a></li>
-                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest</a></li>
+                                    <li role="menuitem"><a href="/community/contributors.html"><i class="icon-caret-right"></i> People behind Apache Zest™</a></li>
                                     <li class="divider"></li>
                                     <li role="menuitem"><a href="http://www.apache.org/licenses/" target="_blank"><i class="icon-caret-right"></i> Licensing</a></li>
                                     <li role="menuitem"><a href="/community/licensing_faq.html"><i class="icon-caret-right"></i> Licensing FAQ</a></li>
@@ -98,7 +98,7 @@
         <div id="content" class="container-fluid">
 
 <div class="page-header">
-    <h1>Apache Zest News</h1>
+    <h1>Apache Zest™ News</h1>
     <p class="lead"><a href="atom.xml"><i class="icon-rss"></i> Atom Feed</a></p>
 </div>
 



Mime
View raw message