web commit by joey

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 6f5b638f5bb5ebb8d7d3a67dd18363f4c9529fc5..ed62533d6d560887e6ae32d3c1a1fdaedff39b33 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -11,8 +11,7 @@ Currently implemented:
 
   Instead of editing pages in a stupid web form, you can use vim and commit
   changes via svn. Or work disconnected using svk and push your changes out
 
   Instead of editing pages in a stupid web form, you can use vim and commit
   changes via svn. Or work disconnected using svk and push your changes out

-  when you come online. Deal with edit conflicts with others in a sane
-  environment. Take advantage of subversion's smart merges.
+  when you come online.

 
   ikiwiki can be run from a [[post-commit]] hook to update your wiki
   immediately whenever you commit.
 
   ikiwiki can be run from a [[post-commit]] hook to update your wiki
   immediately whenever you commit.


@@ -74,6 +73,12 @@ Currently implemented:
   /Discussion subpage. By default, these links are included in the
   [[templates]] for each page.
 
   /Discussion subpage. By default, these links are included in the
   [[templates]] for each page.
 

+* Smart merging and conflict resolution in web browser
+
+  Since it uses subversion, ikiwiki takes advantage of its smart merging to avoid any conflicts when two people edit different parts of the same page    at the same time. No annoying warnings about other editors, or locking, etc, instead the other person's changes will be automaticaly merged with yours when you commit.
+
+  In the rare cases where automatic merging fails due to the same part of a page being concurrently edited, regular subversion commit markers are shown in the file to resolve the conflict, so if you're already familiar with that there's no new commit marker syntax to learn.
+

 ----
 
 It also has lots of [[TODO]] items and [[Bugs]]. This wiki is not ready for production!
 ----
 
 It also has lots of [[TODO]] items and [[Bugs]]. This wiki is not ready for production!