Mailing-List: contact commits-help@zest.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@zest.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: paulmerlin@apache.org
To: commits@zest.apache.org
Message-Id: <880eebde370840ca92fc8fa1d6862d1f@git.apache.org>
Subject: zest-qi4j git commit: ZEST-40 Fix remaining mojibakes for non-UTF-8
 trademarks
Date: Wed,  8 Jul 2015 10:06:56 +0000 (UTC)

Repository: zest-qi4j
Updated Branches:
  refs/heads/develop 5618cbd52 -> d2924507f


ZEST-40 Fix remaining mojibakes for non-UTF-8 trademarks


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/d2924507
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/d2924507
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/d2924507

Branch: refs/heads/develop
Commit: d2924507f9ba81e890330bd488c6a7da7a1f1ead
Parents: 5618cbd
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Wed Jul 8 12:06:46 2015 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Wed Jul 8 12:06:46 2015 +0200

----------------------------------------------------------------------
 core/api/src/docs/api.txt         |  2 +-
 core/api/src/docs/application.txt | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d2924507/core/api/src/docs/api.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/api.txt b/core/api/src/docs/api.txt
index 6384db3..e3825b8 100644
--- a/core/api/src/docs/api.txt
+++ b/core/api/src/docs/api.txt
@@ -21,7 +21,7 @@
 source=core/api/dev-status.xml
 --------------
 
-The Zest� Core API is the primary interface for client application code during the main execution phase, i.e. after the
+The Zest™ Core API is the primary interface for client application code during the main execution phase, i.e. after the
 application has been activated.
 
 include::../../build/docs/buildinfo/artifact.txt[]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d2924507/core/api/src/docs/application.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/application.txt b/core/api/src/docs/application.txt
index e38ffcb..bf97b53 100644
--- a/core/api/src/docs/application.txt
+++ b/core/api/src/docs/application.txt
@@ -15,13 +15,13 @@
 
 [[core-api-application,Application]]
 = Application =
-There is one and only one Application instance per Zest� runtime instance. But there is nothing preventing code to
-create additional Zest� Runtime instances inside the same JVM. However, these runtimes are isolated from each other.
+There is one and only one Application instance per Zest™ runtime instance. But there is nothing preventing code to
+create additional Zest™ Runtime instances inside the same JVM. However, these runtimes are isolated from each other.
 
 The main purpose of the Application structure artifact is to keep everything in the same box, and allowing us to
 navigate the Structure. So, from a client code perspective, the Application is of no use, other than being part of
-bring Zest� to life. Zest� doesn't start automatically and can be run in most environments, by requiring that the
-bootstrapping of Zest� is done by client code. We call this the Bootstrap Phase. The code in the custom bootstrapper
+bring Zest™ to life. Zest™ doesn't start automatically and can be run in most environments, by requiring that the
+bootstrapping of Zest™ is done by client code. We call this the Bootstrap Phase. The code in the custom bootstrapper
 will need to access additional Jars from the regular domain code, and we strongly recommend that you make this
 separation in your project as well.
 
@@ -49,7 +49,7 @@ Recap of sequence;
 
     * Create, obtain or lookup Assemblers.
     * Establish the application structures.
-    * Create a Zest� Runtime instance.
+    * Create a Zest™ Runtime instance.
     * Create an ApplicationAssemblyFactory.
     * Create an ApplicationFactory.
     * Call ApplicationFactory.newApplication() to create an ApplicationContext.
@@ -83,7 +83,7 @@ tag=actual
 In the above example we are only creating an Application with a single Layer and a single Module in that Layer. This is
 derived from the fact that the factory.newApplicationAssembly() method takes a single Assembler argument.
 
-The Assembler.assemble( ModuleAssembly assembly ) method is called when the Zest� Runtime needs to populate the
+The Assembler.assemble( ModuleAssembly assembly ) method is called when the Zest™ Runtime needs to populate the
 ModuleAssembly with its Composites, Objects, Services and other information.
 
 == "Pancake" Layering ==