[Zodb-checkins] CVS: ZODB3/Doc - zodb.pdf:1.3 storage.pdf:1.3 README.txt:1.4 .cvsignore:1.3

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/Doc
In directory cvs.zope.org:/tmp/cvs-serv18770/Doc

Modified Files:
	zodb.pdf storage.pdf README.txt .cvsignore 
Log Message:
Merge changes from Zope-2_7-branch to the trunk.


=== ZODB3/Doc/zodb.pdf 1.2 => 1.3 ===


=== ZODB3/Doc/storage.pdf 1.2 => 1.3 ===
  <Binary-ish file>

=== ZODB3/Doc/README.txt 1.3 => 1.4 ===
--- ZODB3/Doc/README.txt:1.3	Fri Jan 17 16:34:35 2003
+++ ZODB3/Doc/README.txt	Thu Oct  2 14:17:30 2003
@@ -1,5 +1,32 @@
-These documents describe various parts of ZODB.  There are two
-documents to note:
+ZODB Documentation
+==================
+
+Simple text files
+-----------------
+
+This is a brief summary of the text documentation included with ZODB.
+Most of the text actually uses the restructured text format.  The
+summary lists the title and path of each document.
+
+BerkeleyDB Storages for ZODB
+Doc/BDBStorage.txt
+
+Using zdctl and zdrun to manage server processes
+Doc/zdctl.txt
+
+ZEO Client Cache
+Doc/ZEO/cache.txt
+
+Running a ZEO Server HOWTO
+Doc/ZEO/howto.txt
+
+ZEO Client Cache Tracing
+Doc/ZEO/trace.txt
+
+Formatted documents
+-------------------
+
+There are two documents written the Python documentation tools.
 
   ZODB/ZEO Programming Guide
     PDF:  zodb.pdf


=== ZODB3/Doc/.cvsignore 1.2 => 1.3 ===
--- ZODB3/Doc/.cvsignore:1.2	Thu Jan 23 15:11:47 2003
+++ ZODB3/Doc/.cvsignore	Thu Oct  2 14:17:30 2003
@@ -1,3 +1,4 @@
 storage
 storage.ps
 zodb.ps
+*.html