Merge changes from release branch into trunk.

doc/ZEO/ClientStorage.txt

@@ -23,7 +23,9 @@ ClientStorage
       - a sequence of the previous two
 
     If a sequence of addresses is specified, the client will use the
-    first server from the list that it can connect to.
+    first server from the list that it can connect to, subject to the
+    constraints imposed by the optional read_only and
+    read_only_fallback keyword arguments.
 
     The ClientStorage constructor provides a number of additional
     options (arguments). The full list of arguments is:
@@ -36,7 +38,7 @@ ClientStorage
       default name for both the server and client is '1'.
 
     cache_size -- The number of bytes to allow for the client cache.
-      The default is 20,000,000.  A large cache can significantly
+      The default is 20MB.  A large cache can significantly
       increase the performance of a ZEO system.  For applications that
       have a large database, the default size may be too small.
 
@@ -93,3 +95,8 @@ ClientStorage
 
       Each storage served by a ZEO server can be configured as either
       read-write or read-only.
+
+    read_only_fallback -- A flag indicating whether a read-only
+      remote storage should be acceptable as a fallback when no
+      writable storages are available.  Defaults to false.  At most
+      one of read_only and read_only_fallback should be true.

doc/ZEO/NonZopeREADME.txt

@@ -20,7 +20,7 @@ Zope Enterprize Objects
       python test.py -v
 
     Run the script with the -h option for a full list of options.  The
-    ZEO 2.0a1 release contains 87 unit tests on Unix.
+    ZEO 2.0b2 release contains 122 unit tests on Unix.
 
   Starting (and configuring) the ZEO Server
 
@@ -75,6 +75,6 @@ Zope Enterprize Objects
 
   Dependencies on other modules
 
-    ZEO depends on other modules that are distributed with
-    StandaloneZODB and with Zope.  You can download StandaloneZODB
-    from http://www.zope.org/Products/StandaloneZODB.
+    ZEO depends on other modules that are distributed with ZODB3 and
+    with Zope.  You can download ZODB3 from
+    http://www.zope.org/Products/StandaloneZODB.

doc/ZEO/ZopeREADME.txt

-Zope Enterprise Objects
+Zope Enterprise Objects (ZEO)
 
   Installation
 
@@ -19,7 +19,7 @@ Zope Enterprise Objects
       python test.py -v
 
     Run the script with the -h option for a full list of options.  The
-    ZEO 2.0a1 release contains 87 unit tests on Unix.
+    ZEO 2.0b2 release contains 122 unit tests on Unix.
 
   Starting (and configuring) the ZEO Server
 
@@ -93,4 +93,4 @@ Zope Enterprise Objects
     once with the environment variable FORCE_PRODUCT_LOAD set.
 
     The interaction between ZEO and Zope product installation is
-    unfortunate.  In the future, this interaction will be removed by 
+    unfortunate.

lib/python/BDBStorage/tests/testall.py

@@ -27,6 +27,10 @@ def suite():
         alltests.addTest(mod.test_suite())
     return alltests
 
+def test_suite():
+    # Just to silence the top-level test.py
+    return None
+
 
 
 if __name__ == '__main__':