+* Smart merging and conflict resolution in your 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 automatically 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.
+
+* page locking
+
+ Wiki admins can lock pages so that only other admins can edit them.
+
+* Full text search
+
+ ikiwiki can use the [[HyperEstraier]] search engine to add powerful
+ full text search capabilities to your wiki.
+
+* Commit mails
+
+ ikiwiki can be configured to send you commit mails with diffs of changes
+ to selected pages.
+
+* [[Plugins]]
+
+ Plugins can be used to add additional features to ikiwiki. The interface
+ is quite flexible, allowing plugins to implement additional markup
+ languages, register [[PreProcessorDirective]]s, hook into [[CGI]] mode,
+ and more. Ikiwiki's backend RCS support is also pluggable, so support for
+ new revision control systems can be added to ikiwiki.
+
+* [[todo/utf8]]
+
+ After rather a lot of fiddling, we think that ikiwiki correctly and fully
+ supports utf8 everywhere.