[Zope3-checkins] SVN: Zope3/trunk/src/ Switched to ZODB 3.6 branch until we make the Zope 3.2 branch. Also,

[Stephan Richter]

Log message for revision 39915:
  Switched to ZODB 3.6 branch until we make the Zope 3.2 branch. Also, 
  updated the APIDOC book to include some of the new documentation files.
  
  

Changed:
  _U  Zope3/trunk/src/
  U   Zope3/trunk/src/zope/app/apidoc/bookmodule/book.zcml

-=-

Property changes on: Zope3/trunk/src
___________________________________________________________________
Name: svn:externals
   - ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b2/src/BTrees
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b2/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b2/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b2/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b2/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b2/src/ZODB
twisted        svn://svn.twistedmatrix.com/svn/Twisted/branches/releases/2.1.x/twisted
zdaemon        -r 39732 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon

   + ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees         svn+ssh://svn.zope.org/repos/main/ZODB/branches/3.6/src/BTrees
persistent     svn+ssh://svn.zope.org/repos/main/ZODB/branches/3.6/src/persistent
ThreadedAsync  svn+ssh://svn.zope.org/repos/main/ZODB/branches/3.6/src/ThreadedAsync
transaction    svn+ssh://svn.zope.org/repos/main/ZODB/branches/3.6/src/transaction
ZEO            svn+ssh://svn.zope.org/repos/main/ZODB/branches/3.6/src/ZEO
ZODB           svn+ssh://svn.zope.org/repos/main/ZODB/branches/3.6/src/ZODB
twisted        svn://svn.twistedmatrix.com/svn/Twisted/branches/releases/2.1.x/twisted
zdaemon        -r 39732 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon


Modified: Zope3/trunk/src/zope/app/apidoc/bookmodule/book.zcml
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/bookmodule/book.zcml	2005-11-05 13:55:26 UTC (rev 39914)
+++ Zope3/trunk/src/zope/app/apidoc/bookmodule/book.zcml	2005-11-05 14:00:50 UTC (rev 39915)
@@ -3,30 +3,30 @@
     xmlns:zcml="http://namespaces.zope.org/zcml">
 
   <!-- Interfaces -->
-  <bookchapter 
+  <bookchapter
       id="ifaceschema"
       title="Interfaces and Schemas"
       />
   <configure package="zope.interface">
-    <bookchapter 
+    <bookchapter
         id="interface"
         title="Interfaces"
         doc_path="README.txt"
         parent="ifaceschema"
         />
-    <bookchapter 
+    <bookchapter
         id="adapter"
         title="Adapter Registry"
         doc_path="adapter.txt"
         parent="ifaceschema"
         />
-    <bookchapter 
+    <bookchapter
         id="human"
         title="Adapters (light version)"
         doc_path="human.txt"
         parent="ifaceschema"
         />
-    <bookchapter 
+    <bookchapter
         id="foodforthought"
         title="Food For Thought"
         doc_path="tests/foodforthought.txt"
@@ -34,13 +34,13 @@
         />
   </configure>
   <configure package="zope.schema">
-    <bookchapter 
+    <bookchapter
         id="schemas"
         title="Schemas"
         doc_path="README.txt"
         parent="ifaceschema"
         />
-    <bookchapter 
+    <bookchapter
         id="fields"
         title="Schema Fields"
         doc_path="fields.txt"
@@ -53,28 +53,28 @@
       id="ca"
       title="Component Architecture"
       />
-  
+
   <configure package="zope.component">
-    <bookchapter 
+    <bookchapter
         id="global"
         title="Global Component Architecture"
         parent="ca"
         doc_path="README.txt"
         />
-    <bookchapter 
+    <bookchapter
         id="socket"
         title="Global CA (Socket Example)"
         parent="ca"
         doc_path="socketexample.txt"
         />
-    <bookchapter 
+    <bookchapter
         id="factory"
         title="Factories"
         parent="ca"
         doc_path="factory.txt"
         />
   </configure>
-  
+
   <configure package="zope.app.component">
     <bookchapter
         id="local"
@@ -233,6 +233,21 @@
         />
   </configure>
 
+  <!-- Transactions -->
+  <configure package="transaction">
+    <bookchapter
+        id="transaction"
+        title="Transactions"
+        doc_path="README.txt"
+        />
+    <bookchapter
+        id="savepoints"
+        title="Savepoints"
+        parent="transaction"
+        doc_path="savepoint.txt"
+        />
+  </configure>
+
   <!-- ZODB -->
   <configure package="ZODB">
     <bookchapter
@@ -240,17 +255,62 @@
         title="Zope Object Database (ZODB)"
         />
     <bookchapter
+        id="multidb"
+        title="Multiple Databases"
+        parent="zodb"
+        doc_path="tests/multidb.txt"
+        />
+    <bookchapter
+        id="crossref"
+        title="Cross-Database References"
+        parent="zodb"
+        doc_path="cross-database-references.txt"
+        />
+    <bookchapter
+        id="collaboration"
+        title="Collaboration Diagrams"
+        parent="zodb"
+        doc_path="collaborations.txt"
+        />
+    <bookchapter
         id="dbopen"
         title="Connection Management"
         parent="zodb"
         doc_path="tests/dbopen.txt"
         />
     <bookchapter
+        id="persistentclass"
+        title="Persistent Classes"
+        parent="zodb"
+        doc_path="persistentclass.txt"
+        />
+    <bookchapter
+        id="savepoints"
+        title="Savepoints"
+        parent="zodb"
+        doc_path="tests/testConnectionSavepoint.txt"
+        />
+    <bookchapter
         id="subtransactions"
         title="Sub-Transactions"
         parent="zodb"
         doc_path="subtransactions.txt"
         />
+    <bookchapter
+        id="synchronizers"
+        title="Synchronizers"
+        parent="zodb"
+        doc_path="tests/synchronizers.txt"
+        />
   </configure>
 
+  <!-- BTrees -->
+  <configure package="BTrees">
+    <bookchapter
+        id="btrees"
+        title="BTree Developer Information"
+        doc_path="Development.txt"
+        />
+  </configure>
+
 </configure>