+ Automatically included on pages. Rather faster than eg [[MoinMoin]] and always there to help with navigation.
+
+* [[PageHistory]]
+
+ Well, sorta. Rather than implementing YA history browser, it can link to
+ [[ViewCVS]] or the link to browse the history of a wiki page.
+
+* [[RecentChanges]], editing pages in a web browser
+
+ Nearly the definition of a wiki, although perhaps ikiwiki challenges how
+ much of that web gunk a wiki really needs. These features are optional
+ and can be enabled by enabling [[CGI]].
+
+* User registration
+
+ Can optionally be configured to allow only registered users to post
+ pages; online user registration form, etc.
+
+* Discussion pages
+
+ Thanks to subpages, every page can easily and automatically have a
+ /Discussion subpage. By default, these links are included in the
+ [[templates]] for each page.
+
+* 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.
+
+----