[Checkins] SVN: zopetoolkit/doc/source/ Updated for BlueBream

Sat Apr 10 18:56:01 EDT 2010

Log message for revision 110720:
  Updated for BlueBream
  

Changed:
  U   zopetoolkit/doc/source/about/concepts.rst
  U   zopetoolkit/doc/source/about/coreextra.rst
  U   zopetoolkit/doc/source/about/history.rst
  U   zopetoolkit/doc/source/index.rst
  U   zopetoolkit/doc/source/process/buildbots.rst

-=-
Modified: zopetoolkit/doc/source/about/concepts.rst
===================================================================

--- zopetoolkit/doc/source/about/concepts.rst	2010-04-10 22:54:38 UTC (rev 110719)
+++ zopetoolkit/doc/source/about/concepts.rst	2010-04-10 22:56:00 UTC (rev 110720)
@@ -9,11 +9,17 @@
 
 Zope 3 (preferred: Zope 3 application server)
   Zope 3 as an application server, includes a way to create projects.
-  Currently also contains the ZMI.
+  Currently also contains the ZMI. Since 2010, Zope 3 as an application server
+  has been renamed to BlueBream.
 
+BlueBream
+    BlueBream is the new name of Zope 3 as an application server. It consists in
+    a project template and it uses the Zope Toolkit. It also provides a
+    migration path from Zope 3.4.
+
 Grok web framework
-    Grok, very similar to the Zope 3 application server, but with extra Grok
-    libraries and policy, and Grok community.
+    Grok, very similar to BlueBream, but with extra Grok libraries and policy,
+    and Grok community.
 
 Repoze
     a set of libraries that builds on Zope technology, reuse Zope concepts and
@@ -22,6 +28,10 @@
 Plone
     a CMS based on Zope 2 and the CMF.
 
+CMF
+    The Content Management Framework for Zope 2, on which are based applications
+    such as Plone or CPS.
+
 Zope Toolkit
     the collection of Zope Toolkit core libraries. Shouldn't include the ZMI
     and doesn't include a particular way to create a project.

Modified: zopetoolkit/doc/source/about/coreextra.rst
===================================================================
--- zopetoolkit/doc/source/about/coreextra.rst	2010-04-10 22:54:38 UTC (rev 110719)
+++ zopetoolkit/doc/source/about/coreextra.rst	2010-04-10 22:56:00 UTC (rev 110720)
@@ -14,7 +14,7 @@
 A library that at some point in time is considered to be part of the
 Zope Toolkit is called a "core library". The Zope Toolkit contains
 those libraries that are reused by a large number of projects, or that
-the Zope Toolkit developers want to promote to be being more widely
+the Zope Toolkit developers want to promote to being more widely
 adopted. The Zope Toolkit developers especially favor inclusions of
 libraries that are used by other Zope projects.
 

Modified: zopetoolkit/doc/source/about/history.rst
===================================================================
--- zopetoolkit/doc/source/about/history.rst	2010-04-10 22:54:38 UTC (rev 110719)
+++ zopetoolkit/doc/source/about/history.rst	2010-04-10 22:56:00 UTC (rev 110720)
@@ -1,16 +1,23 @@
 History of the Zope Toolkit
 ===========================
 
-The Zope Toolkit started as "Zope 3". Zope 3 was the intended
-successor to the Zope 2 platform. It didn't work out that way. Zope 3
-can be used, but Zope 2 is still alive and well, and in fact started
-to use some parts of the Zope 3 codebase. We also have the Grok
-project came along that reused Zope 3 to build a related but separate
-web framework.
+The Zope Toolkit started as "Zope 3". Zope 3 was the intended successor to the
+Zope 2 platform. It didn't work out that way. Zope 3 can be used alone, but Zope
+2 is still alive and well, and in fact started to use some parts of the Zope 3
+codebase. We also have the Grok project came along that reused Zope 3 to build a
+related but separate web framework.
 
-We realized that the term "Zope 3" was overloaded, meaning both the
-set of libraries shared by Zope 2 and Grok, and the actual web
-application server with a user interface that you can install. We
-therefore introduced the term Zope Toolkit so we could think about
-this set of shared libraries independently and manage them that way.
+We realized that the term "Zope 3" was overloaded, meaning both the set of
+libraries shared by Zope 2 and Grok, and the actual web application server with
+a user interface that you can install. We therefore introduced the term Zope
+Toolkit so we could think about this set of shared libraries independently and
+manage them that way.
 
+Then, Zope 3 as an application server was renamed to BlueBream during the same
+period. What was previously called "Zope 3" now consists in three parts :
+
+- the Zope Component Architecture (ZCA)
+- the set of libraries called the Zope Toolkit (ZTK)
+- the application server called BlueBream
+
+

Modified: zopetoolkit/doc/source/index.rst
===================================================================
--- zopetoolkit/doc/source/index.rst	2010-04-10 22:54:38 UTC (rev 110719)
+++ zopetoolkit/doc/source/index.rst	2010-04-10 22:56:00 UTC (rev 110720)
@@ -11,7 +11,7 @@
 
 The whole collection of ZTK libraries are used in various web
 frameworks and web application servers. Two of these are managed by
-the Zope project: Zope 3 and Grok. If you install one of these
+the Zope project: BlueBream and Grok. If you install one of these
 systems, you will get the ZTK along with it automatically.
 
 The :ref:`steering-group` is there to help guide the development

Modified: zopetoolkit/doc/source/process/buildbots.rst
===================================================================
--- zopetoolkit/doc/source/process/buildbots.rst	2010-04-10 22:54:38 UTC (rev 110719)
+++ zopetoolkit/doc/source/process/buildbots.rst	2010-04-10 22:56:00 UTC (rev 110720)
@@ -83,7 +83,7 @@
                     `grok <http://grok.buildbot.securactive.org/>`_
                     `bfg <http://bfg.buildbot.securactive.org/>`_
                     `misc <http://misc.buildbot.securactive.org/>`_
-      - Sebastian Douche
+      - Sebastien Douche
       - Linux 32/64
       - 2.4, 2.5, 2.6
       - KGS (3.4/3.5), ZTK, grok, BFG (trunk), zc.buildout

