Author: paulmerlin
Date: Tue Jul  7 08:18:02 2015
New Revision: 1689596

URL: http://svn.apache.org/r1689596
Log:
zest: ZEST-40 - unpublished

Modified:
    zest/site/src/_layouts/default.html
    zest/site/src/_layouts/posts.html
    zest/site/src/community/codebase.html
    zest/site/src/community/contributors.html
    zest/site/src/community/get_help.html
    zest/site/src/community/index.html
    zest/site/src/community/licensing_faq.html
    zest/site/src/community/maturity.html
    zest/site/src/community/participate.html
    zest/site/src/community/playing_field.html
    zest/site/src/download.html
    zest/site/src/index.html
    zest/site/src/news.html

Modified: zest/site/src/_layouts/default.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/_layouts/default.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/_layouts/default.html (original)
+++ zest/site/src/_layouts/default.html Tue Jul  7 08:18:02 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/src/_layouts/posts.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/_layouts/posts.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/_layouts/posts.html (original)
+++ zest/site/src/_layouts/posts.html Tue Jul  7 08:18:02 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 Zest</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>
@@ -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/src/community/codebase.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/community/codebase.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/community/codebase.html (original)
+++ zest/site/src/community/codebase.html Tue Jul  7 08:18:02 2015
@@ -1,10 +1,10 @@
 ---
-title: Apache Zest Codebase
+title: Apache Zest™ Codebase
 layout: default
 ---
 <div class="page-header">
     <h1>Codebase</h1>
-    <p class="lead">Apache Zest codebase is hosted at the Apache Software 
Foundation and follow the git-flow development model.</p>
+    <p class="lead">Apache Zest™ codebase is hosted at the Apache Software 
Foundation and follow the git-flow development model.</p>
 </div>
 <div class="row-fluid">
     <div class="span2"></div>
@@ -31,22 +31,22 @@ layout: default
         </p>
         <h2>Public Access Repository</h2>
         <p>
-            Qi4j differs slightly from the regular project, due to our 
specific needs and style of development. the main
+            Apache Zest™ differs slightly from the regular project, due to 
our specific needs and style of development. the main
             differences are;
         </p>
         <ul>
             <li>
-                Qi4j uses the <code>develop</code> branch for the day to day 
changes to the project. The
+                Apache Zest™ uses the <code>develop</code> branch for the 
day to day changes to the project. The
                 <code>master</code> branch is used for the latest releases. 
See below about the 'Git Development Model'.
             </li>
             <li>
-                Qi4j uses a social contract to limit access to different areas 
of the project, instead of ACLs. The
+                Apache Zest™ uses a social contract to limit access to 
different areas of the project, instead of ACLs. The
                 driving point is to relax the contribution criteria in less 
critical parts, to encourage a wider
                 participation that otherwise would not be possible.
             </li>
         </ul>
         <p>
-            Qi4j used to have many repositories to accommodate for the 
authorization issue above, but eventually
+            Apache Zest™ used to have many repositories to accommodate for 
the authorization issue above, but eventually
             settled with a single Git repository, and now only have 2 
repositories;
         </p>
         <ul>
@@ -60,7 +60,7 @@ layout: default
             to clone as; <code>git clone 
https://git-wip-us.apache.org/repos/asf/zest-sandbox.git</code>
         </p>
         <p>
-            The Qi4j SDK is the main development codebase, and to start 
working with it you simply clone it;
+            The Apache Zest™ (Java Edition) is the main development 
codebase, and to start working with it you simply clone it;
             <code>git clone 
https://git-wip-us.apache.org/repos/asf/zest-qi4j.git</code>
         </p>
 
@@ -75,42 +75,42 @@ layout: default
 
         <h2>Committer Access</h2>
         <p class="lead">
-            Qi4j has a 3 level committer access system. The groups are "Core", 
"Platform" and "Community" and the roles
+            Apache Zest™ has a 3 level committer access system. The groups 
are "Core", "Platform" and "Community" and the roles
             are very clear.
         </p>
 
         <h3>Core Developers</h3>
         <p>
             These are the guardians and stewards of the core technology and 
ultimate rulers of what is going on. The
-            hope is that a small group of benevolent dictators will manage to 
make Qi4j the best platform out there,
-            and not listen in on the voices of features and changes that 
derails the vision and principles of Qi4j.
+            hope is that a small group of benevolent dictators will manage to 
make Apache Zest™ the best platform out there,
+            and not listen in on the voices of features and changes that 
derails the vision and principles of Apache Zest™.
         </p>
         <div class="well">
             <p>
-                Over the course of Qi4j's history, there have been several 
occasions where brilliant developers got
-                caught up in 'feature improvements' which went against the 
fibers of Qi4j philosophy and technological
+                Over the course of Apache Zest™'s history, there have been 
several occasions where brilliant developers got
+                caught up in 'feature improvements' which went against the 
fibers of Apache Zest™ philosophy and technological
                 direction. IF we would have had an 'open door' policy to 
changes in Core, these 'improvements' would
-                have degraded the excellence of Qi4j, and we are not likely to 
invite anyone to the Core Developer
-                team, unless the individual shows remarkable understanding of 
the inner workings of Qi4j, the
-                philosophy that drives Qi4j and prudence in working on highly 
sensitive codebases. In return we will
-                strive for making the Qi4j Core as small as possible, having 
most features in libraries and extensions.
+                have degraded the excellence of Apache Zest™, and we are not 
likely to invite anyone to the Core Developer
+                team, unless the individual shows remarkable understanding of 
the inner workings of Apache Zest™, the
+                philosophy that drives Apache Zest™ and prudence in working 
on highly sensitive codebases. In return we will
+                strive for making the Apache Zest™ Core as small as 
possible, having most features in libraries and extensions.
                 We welcome any suggestions that breaks out pluggable 
functionality.
             </p>
             <p>
                 We apologize in advance if this comes across as elitist, but 
the purpose is to ensure a high quality
-                Qi4j Runtime, stable over time and not bloating with 
unnecessary features. Thanks for understanding.
+                Apache Zest™ Runtime, stable over time and not bloating with 
unnecessary features. Thanks for understanding.
             </p>
         </div>
 
         <h3>Platform Developers</h3>
         <p>
-            These form the work force of Qi4j. They will work on the 
Extensions and Libraries, which eventually will
-            make Qi4j the most efficient way of programming in Java.
+            These form the work force of Apache Zest™. They will work on the 
Extensions and Libraries, which eventually will
+            make Apache Zest™ the most efficient way of programming in Java.
         </p>
 
         <h3>Community Developers</h3>
         <p>
-            Any person who is interested in helping out with Qi4j will be 
granted access to Sandbox, Tests, IDE
+            Any person who is interested in helping out with Apache Zest™ 
will be granted access to Sandbox, Tests, IDE
             support, Tutorials, Samples, HowTos, documentation and other (i.e. 
not Core, Libraries and Extensions).
             This will gauge their abilities and commitment to the project, 
with an aim to make them Platform Developers.
         </p>
@@ -118,7 +118,7 @@ layout: default
         <h3>Independents</h3>
         <p>
             Of course, Git's distributed nature also allows anyone to fork our 
repositories, and have the patches find
-            their way back to Qi4j's official repository. And GitHub's 
pull-request system makes the management of this
+            their way back to Apache Zest™'s official repository. And 
GitHub's pull-request system makes the management of this
             a lot easier, and something that we encourage.
         </p>
 
@@ -130,14 +130,14 @@ layout: default
         </p>
         <p>
             Community Developers who are active and keep contributing 
feedback, patches and/or documentation are likely
-            to be invited as Platform Developers, who has access to everything 
except the delicate qi4j-core, which we
+            to be invited as Platform Developers, who has access to everything 
except the delicate Core, which we
             intend to keep a lot more clean and stable than a free-for-all 
repository has a tendency to become over
             time.
         </p>
 
         <h2>Commit Policy</h2>
         <p class="lead">
-            Qi4j generally uses a Commit-Then-Review policy on most changes. 
This allows a reasonable high velocity of
+            Apache Zest™ generally uses a Commit-Then-Review policy on most 
changes. This allows a reasonable high velocity of
             development.
         </p>
         <p>
@@ -154,7 +154,7 @@ layout: default
             tests, either to accommodate for code changes in Core or to 
tighten the constraints of them, MUST be
             discussed on the <code>dev@</code> mailing list, prior to 
committing them to the 'develop' branch. We
             recommend that a different branch is used for these changes, 
unless simply codesnippets are pasted to mail.
-            This exists to ensure that we have a stable evolution of Qi4j 
Runtime, and no surprises will occur in
+            This exists to ensure that we have a stable evolution of Apache 
Zest™ (Java Edition) Runtime, and no surprises will occur in
             existing applications with new versions.
         </p>
 
@@ -170,7 +170,7 @@ layout: default
             The most important part of that excellent article can be found 
below.
         </p>
 
-        <h3>Git Branching Model used at Qi4j</h3>
+        <h3>Git Branching Model used at Apache Zest™</h3>
         <p>
             It looks more complicated than it is. Here are the guidelines;
         </p>
@@ -185,7 +185,7 @@ layout: default
         </ul>
         <p>
             Day-to-day development revolves around the develop branch and it 
is this branch that you typically clone
-            from our repository if you intend to contribute to Qi4j itself. If 
you create a new feature, or make some
+            from our repository if you intend to contribute to Apache Zest™ 
itself. If you create a new feature, or make some
             larger piece of refactoring, then please create a 'feature branch' 
(see article for details).
         </p>
         <p>

Modified: zest/site/src/community/contributors.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/community/contributors.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/community/contributors.html (original)
+++ zest/site/src/community/contributors.html Tue Jul  7 08:18:02 2015
@@ -1,13 +1,13 @@
 ---
-title: People behind Apache Zest
+title: People behind Apache Zest™
 layout: default
 ---
 <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/src/community/get_help.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/community/get_help.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/community/get_help.html (original)
+++ zest/site/src/community/get_help.html Tue Jul  7 08:18:02 2015
@@ -1,5 +1,5 @@
 ---
-title: Zest - Get Help
+title: Apache Zest™ - Get Help
 layout: default
 ---
 <div class="page-header">
@@ -13,7 +13,7 @@ layout: default
             <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="http://mail-archives.apache.org/mod_mbox/zest-dev/"; 
target="_blank">[email protected]</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">[email protected]</a> mailing list.
         </p>
         <p>Subscribe: <a 
href="mailto:[email protected]";>mailto:[email protected]</a></p>
         <p>Also review general information about many <a 
href="https://www.apache.org/foundation/mailinglists.html";>other Apache mailing 
lists</a></p>
@@ -24,7 +24,7 @@ layout: default
             <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/src/community/index.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/community/index.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/community/index.html (original)
+++ zest/site/src/community/index.html Tue Jul  7 08:18:02 2015
@@ -1,11 +1,11 @@
 ---
-title: Apache Zest Community
+title: Apache Zest™ Community
 layout: default
 ---
 <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">
@@ -14,19 +14,19 @@ layout: default
 
         <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 [email protected] 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/src/community/licensing_faq.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/community/licensing_faq.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/community/licensing_faq.html (original)
+++ zest/site/src/community/licensing_faq.html Tue Jul  7 08:18:02 2015
@@ -1,5 +1,5 @@
 ---
-title: Apache Zest Licensing FAQ
+title: Apache Zest™ Licensing FAQ
 layout: default
 ---
 <div class="page-header">
@@ -14,7 +14,7 @@ layout: default
         <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,
@@ -27,12 +27,12 @@ layout: default
         <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/src/community/maturity.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/community/maturity.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/community/maturity.html (original)
+++ zest/site/src/community/maturity.html Tue Jul  7 08:18:02 2015
@@ -1,10 +1,10 @@
 ---
-title: Apache Zest Maturity Model
+title: Apache Zest™ Maturity Model
 layout: default
 ---
 <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/src/community/participate.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/community/participate.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/community/participate.html (original)
+++ zest/site/src/community/participate.html Tue Jul  7 08:18:02 2015
@@ -1,10 +1,10 @@
 ---
-title: Participate to Apache Zest
+title: Participate to Apache Zest™
 layout: default
 ---
 <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">
@@ -12,23 +12,23 @@ layout: default
     <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>[email protected] mailing list</h4>
             <p>
-                To discuss with the Apache Zest community, it is easiest to do 
so at the
+                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">[email protected]</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.
@@ -42,11 +42,11 @@ layout: default
             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
@@ -55,8 +55,8 @@ layout: default
 
         <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/src/community/playing_field.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/community/playing_field.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/community/playing_field.html (original)
+++ zest/site/src/community/playing_field.html Tue Jul  7 08:18:02 2015
@@ -18,7 +18,7 @@ layout: default
 
         <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
@@ -36,12 +36,12 @@ layout: default
 
         <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>
 
@@ -71,28 +71,18 @@ layout: default
 
         <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/src/download.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/download.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/download.html (original)
+++ zest/site/src/download.html Tue Jul  7 08:18:02 2015
@@ -1,5 +1,5 @@
 ---
-title: Download Apache Zest
+title: Download Apache Zest™
 layout: default
 ---
 <div class="page-header">
@@ -11,7 +11,7 @@ layout: default
     <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>
@@ -24,7 +24,7 @@ layout: default
         </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>
@@ -33,7 +33,7 @@ layout: default
             <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>
@@ -42,15 +42,15 @@ layout: default
     <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/src/index.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/index.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/index.html (original)
+++ zest/site/src/index.html Tue Jul  7 08:18:02 2015
@@ -12,15 +12,15 @@ title: Apache Zest
         <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>
@@ -33,22 +33,22 @@ title: Apache Zest
         <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/src/news.html
URL: 
http://svn.apache.org/viewvc/zest/site/src/news.html?rev=1689596&r1=1689595&r2=1689596&view=diff
==============================================================================
--- zest/site/src/news.html (original)
+++ zest/site/src/news.html Tue Jul  7 08:18:02 2015
@@ -1,9 +1,9 @@
 ---
-title: Apache Zest News
+title: Apache Zest™ News
 layout: default
 ---
 <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>
 


Reply via email to