X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/644335eeedc21eee52eb3c1b08c344e9db480a25..cf0da19b5f09cc17539828d4c5857df22bcac4b3:/doc/features.mdwn?ds=sidebyside

diff --git a/doc/features.mdwn b/doc/features.mdwn
index a0d4e3347..8ba65fc55 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -4,7 +4,7 @@ Currently implemented:
 
   Rather than implement its own system for storing page histories etc, ikiwiki      simply uses subversion. (Supporting other revision control systems is also possible, ikiwiki only needs $FOO add, $FOO commit, and $FOO log).
 
-  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.
+  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.
 
  ikiwiki can be run from a [[post-commit]] hook to update your wiki immediatly whenever you commit.
 
@@ -33,4 +33,4 @@ Currently implemented:
 
 ----
 
-It also have lots of [[TODO]] items and [[Bugs]]. This wiki is not ready for production!
\ No newline at end of file
+It also has lots of [[TODO]] items and [[Bugs]]. This wiki is not ready for production!
\ No newline at end of file