Merge changes for 3.3 final.

b4cee27c · Tim Peters · 3f02b5fd · b4cee27c · b4cee27c · b4cee27c
Commit b4cee27c authored Oct 05, 2004 by Tim Peters
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

trunk/NEWS.txt trunk/NEWS.txt +1 -1

trunk/README.txt trunk/README.txt +3 -3

trunk/doc/zodb.pdf trunk/doc/zodb.pdf +0 -0

No files found.
--- a/trunk/NEWS.txt
+++ b/trunk/NEWS.txt
@@ -16,7 +16,7 @@ ZODB/test/testfsoids.py is a tutorial doctest.
 What's new in ZODB3 3.3?
 ========================
-Release date: 17-Sep-2004
+Release date: 06-Oct-2004
 ZEO
 ---

--- a/trunk/README.txt
+++ b/trunk/README.txt
@@ -30,9 +30,9 @@ Compatibility
 ZODB 3.3 is requires Python 2.3.4 or later.
-The Zope 2.8 release should be compatible with this version of ZODB.
+The Zope 2.8 and X3 releases should be compatible with this version of ZODB.
-Note that Zope 2.7 and higher includes ZEO, so this package should
+Note that Zope 2.7 and higher includes ZEO, so this package should only be
-only be needed to run a ZEO server.
+needed to run a ZEO server.
 The ZEO server in ZODB 3.3 is currently incompatible with earlier
 versions of ZODB.  If you want to test the software, you must be

--- a/trunk/doc/zodb.pdf
+++ b/trunk/doc/zodb.pdf