summaryrefslogtreecommitdiff
path: root/doc/features.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-05 15:59:42 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-05 15:59:42 -0500
commitf92505d78b82c6ac146e43054ebd12441575a602 (patch)
tree2897a21c04f473ee3100a6a59ccce6336a1f7692 /doc/features.mdwn
parentfbe2ab4419e086ff84991bf25f1549aaabc5143b (diff)
parent11f4942d68f3276bfdc4688e4091e559f9481874 (diff)
Merge branch 'master' into prefix-directives
Diffstat (limited to 'doc/features.mdwn')
-rw-r--r--doc/features.mdwn7
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn
index a7b5c19ab..1d762bed4 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -127,7 +127,7 @@ with that there's no new commit marker syntax to learn.
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]].
+and can be enabled by enabling [[CGI]] and a [[Revision_Control_System|rcs]].
### User registration
@@ -161,11 +161,6 @@ Well, sorta. Rather than implementing YA history browser, it can link to
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.
-
### [[w3mmode]]
Can be set up so that w3m can be used to browse a wiki and edit pages