[Zodb-checkins] SVN: ZODB/trunk/src/ZODB/ConflictResolution.txt clarification to doc

[Gary Poster]

Log message for revision 76977:
  clarification to doc

Changed:
  U   ZODB/trunk/src/ZODB/ConflictResolution.txt

-=-
Modified: ZODB/trunk/src/ZODB/ConflictResolution.txt
===================================================================
--- ZODB/trunk/src/ZODB/ConflictResolution.txt	2007-06-23 10:47:34 UTC (rev 76976)
+++ ZODB/trunk/src/ZODB/ConflictResolution.txt	2007-06-23 10:57:51 UTC (rev 76977)
@@ -9,9 +9,10 @@
 otherwise abort a transaction.  As such, it risks data integrity in order to
 try to avoid throwing away potentially computationally expensive transactions.
 
-The risk of data integrity should not be underestimated.  Writing conflict
-resolution code takes responsibility away from the ZODB for transactional
-integrity, and puts it in the hands of the developer writing the code.
+The risk of harming data integrity should not be underestimated. Writing
+conflict resolution code takes some responsibility away from the ZODB
+for transactional integrity, and puts it in the hands of the developer
+writing the conflict resolution code.
 
 The current conflict resolution code is implemented with a storage mix-in
 found in ZODB/ConflictResolution.py.  The idea's proposal, and an explanation