[cvs] [Wiki] changed: ResourceLocking

[Wiki Guest]

guest [212.202.174.167]  Tue, 07 Jun 2005 03:21:08 -0700

Modified page: http://wiki.horde.org/ResourceLocking
New Revision:  1.2

@@ -12,11 +12,11 @@
 ++++ Locking
 The easy one is to lock an item for a certain time when someone starts to edit it. If someone else tryes to edit it, horde will deny this and tell him / her to wait. The contra of this is that only one person can edit one item at one time.
 
 ++++ Try to merge
-The better way would that horde tryes to merge the changes, similar to cvs. If changes cannot be merged, horde will tell the user. Maybe I can use the form calidation for this.
+The better way would that horde tryes to merge the changes, similar to cvs. If changes cannot be merged, horde will tell the user. Maybe I can use the form validation for this.
 
 +++ Roadmap and timeline
 Ther is timeline for this project yet. Since I haven't done any development for horde yet, I need to read a lot of code first. 
 
 +++ Contact
 Martin Lohmeier <martin AT mein-horde.de>