fixes and release announcement

[roundup.git] / doc / user_guide.txt

diff --git a/doc/user_guide.txt b/doc/user_guide.txt
index 19f44141e43237f5e723e8881c5e5ceb8c9d7fae..474dcdc222e931fbeed880977d934f5c5213a53a 100644 (file)
--- a/doc/user_guide.txt
+++ b/doc/user_guide.txt
@@ -2,7 +2,7 @@
 User Guide
 ==========
 
-:Version: $Revision: 1.26 $
+:Version: $Revision: 1.27 $
 
 .. contents::
 
@@ -176,6 +176,14 @@ XXX explain...
 When searching on interval properties use the same syntax as for dates.
 
 
+Simple support for collision detection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Item edit pages remember when the item was last edited. When a form is
+submitted, the user will be informed if someone else has edited the item
+at the same time they tried to.
+
+
 Web Interface
 =============