X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=doc%2Ffeatures.mdwn;h=6f5b638f5bb5ebb8d7d3a67dd18363f4c9529fc5;hp=8a05a1679ff95e47df79a044034c3dcbb6c1abce;hb=7f8efe4524fb8cc2066e07c4f9fbad3b14fbccfb;hpb=60631f58b8f6532eccbead29d239aaf25de93610

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 8a05a1679..6f5b638f5 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -4,11 +4,21 @@ Currently implemented:
 
 * [[Subversion]]
 
-  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).
+  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. Deal with edit conflicts with others in a sane environment. Take advantage of subversion's smart merges.
+  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 immediately whenever you commit.
+  ikiwiki can be run from a [[post-commit]] hook to update your wiki
+  immediately whenever you commit.
+
+  Note that ikiwiki does not require subversion to function. If you want to
+  run a simple wiki without page history, it can do that too.
 
 * [[MarkDown]]
 
@@ -58,6 +68,12 @@ Currently implemented:
   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.
+
 ----
 
 It also has lots of [[TODO]] items and [[Bugs]]. This wiki is not ready for production!