[Zodb-checkins] CVS: ZODB3/Doc/guide - modules.tex:1.7.10.1

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	modules.tex 
Log Message:
Merge the head to the mvcc branch.

This merge should be the final preparation for merging the branch to
the trunk.


=== ZODB3/Doc/guide/modules.tex 1.7 => 1.7.10.1 ===
--- ZODB3/Doc/guide/modules.tex:1.7	Thu May  1 16:05:12 2003
+++ ZODB3/Doc/guide/modules.tex	Tue Dec 23 14:06:19 2003
@@ -142,12 +142,12 @@
 % XXX set functions have complicated behavior.
 Each of the modules also defines some functions that operate on
 BTrees -- \function{difference()}, \function{union()}, and
-\function{difference()}.  The \function{difference()} function returns
+\function{intersection()}.  The \function{difference()} function returns
 a bucket, while the other two methods return a set.
 If the keys are integers, then the module also defines
 \function{multiunion()}.  If the values are integers, then the module
 also defines \function{weightedIntersection()} and
-\function{weighterUnion()}.  The function doc strings describe each
+\function{weightedUnion()}.  The function doc strings describe each
 function briefly.
 
 \subsubsection{Total Ordering and Persistence}