X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c1160151d354b7f46cafcf0e5e10402322d44e58..1bdfa4d8b54763eee1c266e3516bb50dd864cedc:/doc/features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index c22d2be91..1b09a3274 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -23,11 +23,13 @@ Some of ikiwiki's features:
   page with a filename ending in ".mdwn" is converted from markdown to html
   by ikiwiki. Markdown understands text formatted as it would be in an email,
   and is quite smart about converting it to html. The only additional markup
-  provided by ikiwiki aside from regular markdown is the [[WikiLink]] and 
+  provided by ikiwiki on top of regular markdown is the [[WikiLink]] and 
   [[PreprocessorDirective]]
 
   If you prefer to use some other markup language, ikiwiki allows others to
-  be added by [[plugins]].
+  easily be added by [[plugins]]. For example it also supports traditional
+  [[plugins/WikiText]] formatted pages or pages written as pure
+  [[plugins/HTML]].
 
 * support for other file types
 
@@ -36,9 +38,10 @@ Some of ikiwiki's features:
   unchanged by ikiwiki as it builds your wiki. So you can check in an image,
   program, or other special file and link to it from your wiki pages.
 
-* [[SubPage]]s
+* [[SubPages|SubPage]]
 
-  Arbitrarily deep hierarchies of pages with fairly simple and useful [[SubPage/LinkingRules]]
+  Arbitrarily deep hierarchies of pages with fairly simple and useful
+  [[SubPage/LinkingRules]]
 
 * [[blogging|blog]]
 
@@ -133,6 +136,11 @@ Some of ikiwiki's features:
   After rather a lot of fiddling, we think that ikiwiki correctly and fully
   supports utf8 everywhere.
 
+* [[w3mmode]]
+
+  Can be set up so that w3m can be used to browse a wiki and edit pages
+  without using a web server.
+
 ----
 
 It also has some [[TODO]] items and [[Bugs]].