Commit 7ed020ec authored by Hanno Schlichting's avatar Hanno Schlichting

We have a new version number!

parent 23c2fb67
...@@ -5,8 +5,8 @@ This file contains change information for the current Zope release. ...@@ -5,8 +5,8 @@ This file contains change information for the current Zope release.
Change information for previous versions of Zope can be found at Change information for previous versions of Zope can be found at
http://docs.zope.org/zope2/releases/. http://docs.zope.org/zope2/releases/.
2.14.0a1 (unreleased) 4.0a1 (unreleased)
--------------------- ------------------
Bugs Fixed Bugs Fixed
++++++++++ ++++++++++
......
What's new in Zope 2.14 What's new in Zope 4.0
======================= ======================
The article explains the new high-level features and changes found in this The article explains the new high-level features and changes found in this
version of Zope 2. version of Zope 2.
...@@ -7,6 +7,12 @@ version of Zope 2. ...@@ -7,6 +7,12 @@ version of Zope 2.
You can have a look at the `detailed change log <CHANGES.html>`_ to learn You can have a look at the `detailed change log <CHANGES.html>`_ to learn
about all minor new features and bugs being solved in this release. about all minor new features and bugs being solved in this release.
Version numbering increase
--------------------------
- Reflect departure from TTW-development model
- Various backwards incompatible changes (removed code)
- Zope 3 vs. 4
Memory use Memory use
---------- ----------
......
...@@ -49,9 +49,9 @@ copyright = u'2009-2010, The Zope Developers Community' ...@@ -49,9 +49,9 @@ copyright = u'2009-2010, The Zope Developers Community'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.14' version = '4.0'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2.14' release = '4.0'
# 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.14 specific documentation Zope 4.0 specific documentation
================================ ===============================
Contents: Contents:
......
...@@ -23,7 +23,7 @@ if sys.platform[:3].lower() == "win": ...@@ -23,7 +23,7 @@ if sys.platform[:3].lower() == "win":
setup(name='Zope2', setup(name='Zope2',
version='2.14.0a1.dev', version='4.0a1.dev',
url='http://zope2.zope.org', url='http://zope2.zope.org',
license='ZPL 2.1', license='ZPL 2.1',
description='Zope2 application server / web framework', description='Zope2 application server / web framework',
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
""" """
from zope.deferredimport import deprecated from zope.deferredimport import deprecated
deprecated('ZPublisher.TaintedString will be removed in Zope 2.14. Please ' deprecated('ZPublisher.TaintedString will be removed in Zope 4.0 Please '
'import from AccessControl.tainted instead.', 'import from AccessControl.tainted instead.',
TaintedString = 'AccessControl.tainted:TaintedString', TaintedString = 'AccessControl.tainted:TaintedString',
) )
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