Commit 746f8be0 authored by Hanno Schlichting's avatar Hanno Schlichting

Updated documentation to new version number.

parent aa808867
This diff is collapsed.
This diff is collapsed.
...@@ -16,7 +16,7 @@ How to build and install Zope from source code on Windows. ...@@ -16,7 +16,7 @@ How to build and install Zope from source code on Windows.
% python.exe inst\configure.py % python.exe inst\configure.py
It should say something like: It should say something like:
> >
> - Zope top-level binary directory will be c:\Zope-2.12. > - Zope top-level binary directory will be c:\Zope-2.13.
> - Makefile written. > - Makefile written.
> >
> Next, run the Visual C++ batch file "VCVARS32.bat" and then "nmake". > Next, run the Visual C++ batch file "VCVARS32.bat" and then "nmake".
......
Using Zope Components in Zope 2 Applications
============================================
Background
----------
Zope 3 is a separate project from the Zope community aimed at web
development. It is designed to be more 'programmer-centric' and easier
to learn, use and extend for programmers. Zope 3 introduces an
interface-centric component architecture that makes it easier to develop
and deploy components without requiring developers to learn and
understand the entire Zope framework.
As of Zope 2.8, the "Five" project has been integrated into the
Zope 2 core. The "Five" project implements a compatibility layer
that allows many Zope 3 components and patterns to be used in
new and existing Zope 2 applications.
Features
--------
The Five integration layer provides support for Zope 3 interfaces,
Zope Configuration Markup Language (ZCML), adapters, views,
utilities and schema-driven content.
Note that the Five layer does *not* attempt to provide a ZMI user
interface for Zope 3 components.
Zope 2 includes the essential Zope 3 packages, so it is not
necessary to install Zope 3.
...@@ -49,9 +49,9 @@ copyright = u'2009, The Zope Developers Community' ...@@ -49,9 +49,9 @@ copyright = u'2009, The Zope Developers Community'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.12.0' version = '2.13'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2.12.0a4' release = '2.13.0dev'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
Zope 2.12 specific documentation Zope 2.13 specific documentation
================================ ================================
Contents: Contents:
......
ZOPEVERSION = 2.12.0b1 ZOPEVERSION = 2.13.0dev
ZOPEDIRNAME := Zope-$(ZOPEVERSION) ZOPEDIRNAME := Zope-$(ZOPEVERSION)
ZOPE_REQUIRED_FILES=tmp/$(ZOPEDIRNAME).tgz ZOPE_REQUIRED_FILES=tmp/$(ZOPEDIRNAME).tgz
......
...@@ -49,7 +49,7 @@ server = Server('http://pypi.python.org/pypi') ...@@ -49,7 +49,7 @@ server = Server('http://pypi.python.org/pypi')
links = list() links = list()
dirname = sys.argv[1] dirname = sys.argv[1]
write_index('Zope2', '2.12.0a3') write_index('Zope2', '2.13.0dev')
for package in CP.options('versions'): for package in CP.options('versions'):
......
ZOPE_MAJOR_VERSION = '2.12' ZOPE_MAJOR_VERSION = '2.13'
ZOPE_MINOR_VERSION = '0' ZOPE_MINOR_VERSION = '0'
ZOPE_BRANCH_NAME = '$Name$'[6:] or 'no-branch' ZOPE_BRANCH_NAME = '$Name$'[6:] or 'no-branch'
# always start prerelease branches with '0' to avoid upgrade # always start prerelease branches with '0' to avoid upgrade
# issues in RPMs # issues in RPMs
VERSION_RELEASE_TAG = 'b1' VERSION_RELEASE_TAG = '0.dev'
...@@ -19,7 +19,7 @@ from setuptools import setup, find_packages, Extension ...@@ -19,7 +19,7 @@ from setuptools import setup, find_packages, Extension
EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src'] EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src']
params = dict(name='Zope2', params = dict(name='Zope2',
version='2.13dev', version='2.13.0dev',
url='http://www.zope.org', url='http://www.zope.org',
license='ZPL 2.1', license='ZPL 2.1',
description='Zope2 application server / web framework', description='Zope2 application server / web framework',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment