[Checkins] SVN: zopeframework/trunk/source/ Framework -> Toolkit.
Chris McDonough
chrism at plope.com
Thu Apr 9 18:30:37 EDT 2009
Log message for revision 99064:
Framework -> Toolkit.
Changed:
U zopeframework/trunk/source/about/concepts.rst
U zopeframework/trunk/source/about/coreextra.rst
U zopeframework/trunk/source/about/history.rst
U zopeframework/trunk/source/about/index.rst
U zopeframework/trunk/source/codingstyle/glossary.rst
U zopeframework/trunk/source/conf.py
U zopeframework/trunk/source/index.rst
U zopeframework/trunk/source/migration/34to35.rst
U zopeframework/trunk/source/migration/index.rst
U zopeframework/trunk/source/process/communication.rst
U zopeframework/trunk/source/process/index.rst
U zopeframework/trunk/source/process/maintaining-software.rst
U zopeframework/trunk/source/process/old-references.rst
U zopeframework/trunk/source/steeringgroup/decisionmaking.rst
U zopeframework/trunk/source/steeringgroup/decisions.rst
U zopeframework/trunk/source/steeringgroup/index.rst
U zopeframework/trunk/source/steeringgroup/members.rst
U zopeframework/trunk/source/steeringgroup/openissues.rst
-=-
Modified: zopeframework/trunk/source/about/concepts.rst
===================================================================
--- zopeframework/trunk/source/about/concepts.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/about/concepts.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -18,25 +18,25 @@
Zope concepts and expand on Zope technology.
* Plone: a CMS based on Zope 2 and the CMF that is a major consumer of
- Zope Framework technology.
+ Zope Toolkit technology.
-* Zope Framework: the collection of Zope Framework core
+* 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.
-* Zope Framework release: a set of Zope Framework library versions
+* Zope Toolkit release: a set of Zope Toolkit library versions
that have been tested to work together. This set receives a
- collective version number ("Zope Framework 3.5"). A release could
+ collective version number ("Zope Toolkit 3.5"). A release could
simply consist of a list of version numbers.
-* Zope Framework Steering Group: the group responsible for the leading
- Zope Framework development, ensuring its continued evolution driven
- by the concerns of the various consumers of the framework (or
- particular libraries in the framework).
+* Zope Toolkit Steering Group: the group responsible for the leading
+ Zope Toolkit development, ensuring its continued evolution driven
+ by the concerns of the various consumers of the toolkit (or
+ particular libraries in the toolkit).
-* Zope core library: a library within the Zope Framework.
+* Zope core library: a library within the Zope Toolkit.
-* Zope extra library: a library not within the Zope Framework. Could
- be "just not" within the Zope Framework, or "not yet", or "not
+* Zope extra library: a library not within the Zope Toolkit. Could
+ be "just not" within the Zope Toolkit, or "not yet", or "not
anymore". These libraries are intended to work with the Zope
- Framework and are maintained by the wider Zope community.
+ Toolkit and are maintained by the wider Zope community.
Modified: zopeframework/trunk/source/about/coreextra.rst
===================================================================
--- zopeframework/trunk/source/about/coreextra.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/about/coreextra.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -4,21 +4,21 @@
Introduction
------------
-The Zope Framework covers only some libraries in the wider Zope
+The Zope Toolkit covers only some libraries in the wider Zope
community and software repository. We introduce the concepts of *core*
and *extra* to be able to distinguish between the two.
Core libraries
--------------
-The Zope Framework is a set of libraries. These libraries are released
+The Zope Toolkit is a set of libraries. These libraries are released
independently, but typically build on each other.
A library that at some point in time is considered to be part of the
-Zope Framework is called a "core library". The Zope Framework contains
+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 Framework developers want to promote to be being more widely
-adopted. The Zope Framework developers especially favor inclusions of
+the Zope Toolkit developers want to promote to be being more widely
+adopted. The Zope Toolkit developers especially favor inclusions of
libraries that are used by other Zope projects.
The set of libraries that is "core" can change over time depending on
@@ -29,13 +29,13 @@
considerable thought. A library being in the core signals a level of
commitment to this library.
-How do we determine which libraries are part of the Zope Framework,
-and which libraries are not? The set of Zope Framework libraries is
+How do we determine which libraries are part of the Zope Toolkit,
+and which libraries are not? The set of Zope Toolkit libraries is
not static; what is included continuously evolves. The project
maintains a list of which libraries are considered core.
-The Zope Framework Steering Group is the final arbiter of which
-libraries are in Zope Framework or not. It will generally make decisions
+The Zope Toolkit Steering Group is the final arbiter of which
+libraries are in Zope Toolkit or not. It will generally make decisions
according to these loose guidelines:
* if it's used widely in our community by the different consumer
@@ -62,11 +62,11 @@
Extra libraries
---------------
-Surrounding the Zope Framework core libraries a large number of other
+Surrounding the Zope Toolkit core libraries a large number of other
libraries exist that are developed in association with the Zope
-Framework. These libraries integrate with the Zope Framework and make
-use of the Zope Framework. They are often maintained by developers
-that are also Zope Framework developers, and similar development
+Toolkit. These libraries integrate with the Zope Toolkit and make
+use of the Zope Toolkit. They are often maintained by developers
+that are also Zope Toolkit developers, and similar development
practices are used.
We will call these libraries "extra". Libraries in the extra group are
@@ -75,9 +75,9 @@
development philosophies and practices will be shared between the core
and extra group of libraries.
-The Zope Framework steering group *does* not control the development
+The Zope Toolkit steering group *does* not control the development
of the extra libraries in the repository, except where such a library
-is considered for adoption within the Zope Framework itself as a core
+is considered for adoption within the Zope Toolkit itself as a core
library.
Examples of "extra" libraries are the "hurry.query" library for
@@ -85,7 +85,7 @@
form generation, and the "grokcore.component" library which contains a
different way to configure components.
-Any library that is developed for integration with the Zope Framework
+Any library that is developed for integration with the Zope Toolkit
in the Zope repository can be considered "extra"; "extra" is the set
-of libraries that is not in the Zope Framework but can work with it. By
+of libraries that is not in the Zope Toolkit but can work with it. By
having an "extra" designation we can more easily discuss such libraries.
Modified: zopeframework/trunk/source/about/history.rst
===================================================================
--- zopeframework/trunk/source/about/history.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/about/history.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,7 +1,7 @@
-History of the Zope Framework
-=============================
+History of the Zope Toolkit
+===========================
-The Zope Framework started as "Zope 3". Zope 3 was the intended
+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 large parts of the Zope 3 codebase. We also have the Grok
@@ -11,6 +11,6 @@
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 Framework so we could think about
+therefore introduced the term Zope Toolkit so we could think about
this set of shared libraries independently and manage them that way.
Modified: zopeframework/trunk/source/about/index.rst
===================================================================
--- zopeframework/trunk/source/about/index.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/about/index.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,23 +1,23 @@
-The Zope Framework
-==================
+The Zope Toolkit
+================
-The Zope Framework is a collection of libraries managed by the Zope
-developers. The Zope Framework is not installable directly, but
+The Zope Toolkit is a collection of libraries managed by the Zope
+developers. The Zope Toolkit is not installable directly, but
libraries in it are.
-Zope Framework libraries are intended to be reusable by projects to
+Zope Toolkit libraries are intended to be reusable by projects to
develop web applications or web frameworks. Currently some of the Zope
-Framework libraries are more reusable in this way than others, but we
+Toolkit libraries are more reusable in this way than others, but we
are working on getting them all in shape.
-The whole collection of Zope Framework libraries in used in various
+The whole collection of Zope Toolkit libraries in used in various
other web frameworks and web application servers. Three of these are
managed by the Zope project: Zope 2, Zope 3 and Grok. If you install
-one of these systems, you will get the Zope Framework along with it
+one of these systems, you will get the Zope Toolkit along with it
automatically.
The :ref:`steering-group` is there to help guide the development
-of the Zope Framework.
+of the Zope Toolkit.
.. toctree::
:maxdepth: 1
Modified: zopeframework/trunk/source/codingstyle/glossary.rst
===================================================================
--- zopeframework/trunk/source/codingstyle/glossary.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/codingstyle/glossary.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -52,9 +52,10 @@
service managers.
Name
- Objects are given names to help us find them. An object may be found
- via more than one name. In the Zope Framework, we use names to guide the process
- of traversing from a container to a contained object.
+ Objects are given names to help us find them. An object may be
+ found via more than one name. In the Zope Toolkit, we use names to
+ guide the process of traversing from a container to a contained
+ object.
ZCML
Zope Configuration Markup Language. An XML-based language used to
Modified: zopeframework/trunk/source/conf.py
===================================================================
--- zopeframework/trunk/source/conf.py 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/conf.py 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Zope Framework Documentation documentation build configuration file, created by
+# Zope Toolkit Documentation documentation build configuration file, created by
# sphinx-quickstart on Mon Feb 2 16:17:40 2009.
#
# This file is execfile()d with the current directory set to its containing dir.
@@ -41,7 +41,7 @@
master_doc = 'index'
# General information about the project.
-project = u'Zope Framework'
+project = u'Zope Toolkit'
copyright = u'2009, Zope Foundation'
# The version info for the project you're documenting, acts as replacement for
@@ -153,7 +153,7 @@
#html_file_suffix = ''
# Output file base name for HTML help builder.
-htmlhelp_basename = 'ZopeFrameworkdoc'
+htmlhelp_basename = 'ZopeToolkitdoc'
# Options for LaTeX output
@@ -168,8 +168,8 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, document class [howto/manual]).
latex_documents = [
- ('index', 'ZopeFrameworkDocumentation.tex',
- ur'Zope Framework Documentation',
+ ('index', 'ZopeToolkitDocumentation.tex',
+ ur'Zope Toolkit Documentation',
ur'Zope Developers', 'manual'),
]
Modified: zopeframework/trunk/source/index.rst
===================================================================
--- zopeframework/trunk/source/index.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/index.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,9 +1,9 @@
-.. Zope Framework Documentation master file, created by sphinx-quickstart on Mon Feb 2 16:17:40 2009.
+.. Zope Toolkit Documentation master file, created by sphinx-quickstart on Mon Feb 2 16:17:40 2009.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-Welcome to the Zope Framework documentation
-===========================================
+Welcome to the Zope Toolkit documentation
+=========================================
Contents:
Modified: zopeframework/trunk/source/migration/34to35.rst
===================================================================
--- zopeframework/trunk/source/migration/34to35.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/migration/34to35.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,28 +1,27 @@
-Migrating from Zope 3.4 to Zope Framework 3.5
-=============================================
+Migrating from Zope 3.4 to Zope Toolkit 3.5
+===========================================
This document covers major changes from the Zope 3.4 release to the
-Zope Framework 3.5 release that can lead to
-backward-incompatibilities.
+Zope Toolkit 3.5 release that can lead to backward-incompatibilities.
.. contents::
Introduction
------------
-The Zope Framework 3.5 release is the first release of the Zope
-Framework. The Zope Framework really is just a collection of libraries
+The Zope Toolkit 3.5 release is the first release of the Zope
+Toolkit. The Zope Toolkit really is just a collection of libraries
managed together by the Zope developers. We typically treat each
library independently, so you would like to look at the CHANGES.txt in
each library for updates. Here we note larger changes, especially ones
that affect multiple libraries.
-The Zope Framework cannot be installed directly except as individual
+The Zope Toolkit cannot be installed directly except as individual
libraries (such as ``zope.component``). To install it you typically
-would install a framework or application that makes use of these
+would install a toolkit or application that makes use of these
libraries. The Zope project itself manages Zope 3, Zope 2, or Grok.
-The 3.5 release of the Zope Framework contains a number of
+The 3.5 release of the Zope Toolkit contains a number of
refactorings that are aimed to clean up dependencies between pieces of
code. Many packages in ``zope.app`` have had their code moved to
existing or newly created packages in the ``zope`` namespace. These
@@ -173,7 +172,7 @@
The `local permission` functionality was moved into a new ``zope.app.localpermission``
package. This functionality is a part of Through-The-Web development pattern that
-seems not to be used and supported much by Zope Framework and Application anymore,
+seems not to be used and supported much by Zope Toolkit and Application anymore,
so it can be considered deprecated. However, it can serve as a great example of
TTW-related component.
@@ -216,7 +215,7 @@
ZODB 3.9 FileStorage native blob support
----------------------------------------
-The FileStorage component of ZODB 3.9 used in Zope Framework 3.5 now
+The FileStorage component of ZODB 3.9 used in Zope Toolkit 3.5 now
supports blobs natively, so you don't need to use BlobStorage proxy
for it anymore.
@@ -248,4 +247,4 @@
.. code-block:: python
storage = BlobStorage('var/blobs', FileStorage('var/Data.fs'))
-
\ No newline at end of file
+
Modified: zopeframework/trunk/source/migration/index.rst
===================================================================
--- zopeframework/trunk/source/migration/index.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/migration/index.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,8 +1,8 @@
-Migration to newer Zope Framework versions
-==========================================
+Migration to newer Zope Toolkit versions
+========================================
This area collects information about the backward-incompatible changes and
-new techniques developed and proposed within new Zope Framework releases.
+new techniques developed and proposed within new Zope Toolkit releases.
.. toctree::
:maxdepth: 1
Modified: zopeframework/trunk/source/process/communication.rst
===================================================================
--- zopeframework/trunk/source/process/communication.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/process/communication.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,7 +1,7 @@
Communication
=============
-Communication for the Zope Framework development itself happens both
+Communication for the Zope Toolkit development itself happens both
on IRC and in a mailinglist.
IRC
@@ -16,7 +16,7 @@
Mailing list
------------
-The official Zope Framework development mailing list is
+The official Zope Toolkit development mailing list is
zope-dev at zope.org. You can subscribe to it by visiting
http://mail.zope.org/mailman/listinfo/zope-dev.
Modified: zopeframework/trunk/source/process/index.rst
===================================================================
--- zopeframework/trunk/source/process/index.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/process/index.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -2,7 +2,7 @@
===================
This area covers the procedures and guidelines we adhere to when
-developing Zope Framework components.
+developing Zope Toolkit components.
.. note::
This area currently is heavy work-in-progress. We are pulling in
Modified: zopeframework/trunk/source/process/maintaining-software.rst
===================================================================
--- zopeframework/trunk/source/process/maintaining-software.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/process/maintaining-software.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -390,7 +390,7 @@
* The list of `Trove classifiers`_ (``classifiers`` parameter)
should be adjusted according to the specific package, of course.
Much of the software in the Zope repository is intended to be
- used with the Zope 2 or Zope Framework (sometimes for both), we
+ used with the Zope 2 or Zope Toolkit (sometimes for both), we
aim to make more and more software available for independent use
(well-known examples are ``zope.interface`` or the ``ZODB``).
Modified: zopeframework/trunk/source/process/old-references.rst
===================================================================
--- zopeframework/trunk/source/process/old-references.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/process/old-references.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -2,7 +2,7 @@
======================
This is a collection of documents I found while putting together
-material for the Zope Framework process documentation. Most of those
+material for the Zope Toolkit process documentation. Most of those
are so outdated or never made it very far that I didn't want to
include them directly. They're here for giving an overview on what we
might want to think of.
Modified: zopeframework/trunk/source/steeringgroup/decisionmaking.rst
===================================================================
--- zopeframework/trunk/source/steeringgroup/decisionmaking.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/steeringgroup/decisionmaking.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,7 +1,7 @@
-How the Zope Framework Steering Group can help you
-==================================================
+How the Zope Toolkit Steering Group can help you
+================================================
-If you want to make some change to the Zope Framework, start a thread
+If you want to make some change to the Zope Toolkit, start a thread
on zope-dev about it. The Steering Group is watching.
The Steering Group is going to make decisions in the following way:
Modified: zopeframework/trunk/source/steeringgroup/decisions.rst
===================================================================
--- zopeframework/trunk/source/steeringgroup/decisions.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/steeringgroup/decisions.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,11 +1,11 @@
-Decisions of the Zope Framework Steering Group
-==============================================
+Decisions of the Zope Toolkit Steering Group
+============================================
This is a temporary place to note decisions. The idea is to later
-integrate them into the Zope Framework documentation, but we need a
+integrate them into the Zope Toolkit documentation, but we need a
quick way to note decisions first.
-* ZMI related code shall not be part of the Zope Framework, and we
+* ZMI related code shall not be part of the Zope Toolkit, and we
shall strive to remove it.
* If zope.deferredimport is used in a package merely to avoid the use
@@ -25,14 +25,14 @@
packages. Hopefully we can get a clear consensus on this one from
the people who object to the general policy.
-* if you think a new "extra" dependency is needed in a Zope Framework
+* if you think a new "extra" dependency is needed in a Zope Toolkit
package, and you're not just moving stuff between packages but
actually developing new code, bring it up on zope-dev so we can at
least consider alternatives. Perhaps a better home can be found for
this code.
* We can consider removing extra dependencies for particular Zope
- Framework packages in order to make the dependency graph easier to
+ Toolkit packages in order to make the dependency graph easier to
reason about. We will do this on a case by case basis though.
* In namespace package's ``__init__.py`` we have been using the following
@@ -93,4 +93,4 @@
hints to people who use our packages. We'll see how it goes.
* If a package starts to rely on new features or behaviors as done
- in a feature release of a dependency (i.e. x, or x.y)
\ No newline at end of file
+ in a feature release of a dependency (i.e. x, or x.y)
Modified: zopeframework/trunk/source/steeringgroup/index.rst
===================================================================
--- zopeframework/trunk/source/steeringgroup/index.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/steeringgroup/index.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -3,7 +3,7 @@
Steering Group
==============
-Development of the Zope Framework is managed by the Zope Framework
+Development of the Zope Toolkit is managed by the Zope Toolkit
Steering Group. The steering group is a body that operates in public
and participates in discussions, contacting it should therefore typically be
done through the zope-dev mailing list (:ref:`mailing-list`).
Modified: zopeframework/trunk/source/steeringgroup/members.rst
===================================================================
--- zopeframework/trunk/source/steeringgroup/members.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/steeringgroup/members.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -1,5 +1,5 @@
-Membership of the Zope Framework Steering Group
-===============================================
+Membership of the Zope Toolkit Steering Group
+=============================================
* Martijn Faassen
Modified: zopeframework/trunk/source/steeringgroup/openissues.rst
===================================================================
--- zopeframework/trunk/source/steeringgroup/openissues.rst 2009-04-09 22:03:10 UTC (rev 99063)
+++ zopeframework/trunk/source/steeringgroup/openissues.rst 2009-04-09 22:30:36 UTC (rev 99064)
@@ -7,18 +7,18 @@
* Do we want to deprecate the deprecation system? See
http://mail.zope.org/pipermail/zope-dev/2009-March/035130.html
-* Produce a list of `the framework packages`. See
+* Produce a list of `the toolkit packages`. See
http://mail.zope.org/pipermail/zope-dev/2009-March/035078.html.
* Document usage of compattest. `compattest` is being mentioned for
- test runs and should be documented as an (optional) part of the framework
+ test runs and should be documented as an (optional) part of the toolkit
development.
* Support using ``setup.py test``? See
http://mail.zope.org/pipermail/zope-dev/2009-March/035240.html
* We should investigate the possible role of WebOb in the Zope
- Framework. See http://mail.zope.org/pipermail/zope-dev/2009-March/034870.html
+ Toolkit. See http://mail.zope.org/pipermail/zope-dev/2009-March/034870.html
.. note::
We may want to move over the management of such issues to
More information about the Checkins
mailing list