[Zope-Checkins] SVN: Zope/trunk/ We have a new version number!

[Hanno Schlichting]

Log message for revision 122125:
  We have a new version number!
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/doc/WHATSNEW.rst
  U   Zope/trunk/doc/conf.py
  U   Zope/trunk/doc/index.rst
  U   Zope/trunk/setup.py
  U   Zope/trunk/src/ZPublisher/TaintedString.py

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2011-07-06 16:26:09 UTC (rev 122124)
+++ Zope/trunk/doc/CHANGES.rst	2011-07-06 17:24:42 UTC (rev 122125)
@@ -5,8 +5,8 @@
 Change information for previous versions of Zope can be found at
 http://docs.zope.org/zope2/releases/.
 
-2.14.0a1 (unreleased)
----------------------
+4.0a1 (unreleased)
+------------------
 
 Bugs Fixed
 ++++++++++

Modified: Zope/trunk/doc/WHATSNEW.rst
===================================================================
--- Zope/trunk/doc/WHATSNEW.rst	2011-07-06 16:26:09 UTC (rev 122124)
+++ Zope/trunk/doc/WHATSNEW.rst	2011-07-06 17:24:42 UTC (rev 122125)
@@ -1,5 +1,5 @@
-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
 version of Zope 2.
@@ -7,7 +7,13 @@
 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.
 
+Version numbering increase
+--------------------------
 
+- Reflect departure from TTW-development model
+- Various backwards incompatible changes (removed code)
+- Zope 3 vs. 4
+
 Memory use
 ----------
 

Modified: Zope/trunk/doc/conf.py
===================================================================
--- Zope/trunk/doc/conf.py	2011-07-06 16:26:09 UTC (rev 122124)
+++ Zope/trunk/doc/conf.py	2011-07-06 17:24:42 UTC (rev 122125)
@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.14'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.14'
+release = '4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Modified: Zope/trunk/doc/index.rst
===================================================================
--- Zope/trunk/doc/index.rst	2011-07-06 16:26:09 UTC (rev 122124)
+++ Zope/trunk/doc/index.rst	2011-07-06 17:24:42 UTC (rev 122125)
@@ -1,6 +1,6 @@
 
-Zope 2.14 specific documentation
-================================
+Zope 4.0 specific documentation
+===============================
 
 Contents:
 

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2011-07-06 16:26:09 UTC (rev 122124)
+++ Zope/trunk/setup.py	2011-07-06 17:24:42 UTC (rev 122125)
@@ -23,7 +23,7 @@
 
 
 setup(name='Zope2',
-    version='2.14.0a1.dev',
+    version='4.0a1.dev',
     url='http://zope2.zope.org',
     license='ZPL 2.1',
     description='Zope2 application server / web framework',

Modified: Zope/trunk/src/ZPublisher/TaintedString.py
===================================================================
--- Zope/trunk/src/ZPublisher/TaintedString.py	2011-07-06 16:26:09 UTC (rev 122124)
+++ Zope/trunk/src/ZPublisher/TaintedString.py	2011-07-06 17:24:42 UTC (rev 122125)
@@ -14,7 +14,7 @@
 """
 
 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.',
            TaintedString = 'AccessControl.tainted:TaintedString',
           )