X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0f22d66c965d7f2a3e4698de7ddf992efebf6c42..e49ff966a39d1037ccbf168b8dbd12618cf1b41e:/doc/features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 5152beffd..0a235d708 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -28,7 +28,8 @@ Some of ikiwiki's features:
 
   If you prefer to use some other markup language, ikiwiki allows others to
   easily be added by [[plugins]]. For example it also supports traditional
-  [[plugins/WikiText]] formatted pages.
+  [[plugins/WikiText]] formatted pages or pages written as pure
+  [[plugins/HTML]].
 
 * support for other file types
 
@@ -37,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]]
 
@@ -50,9 +52,15 @@ Some of ikiwiki's features:
   Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples
   of some of the flexible ways that this can be used.
 
+  Ikiwiki can also [[plugin/aggregate]] external blogs, feeding them into
+  the wiki. This can be used to create a Planet type site that aggregates
+  interesting feeds.
+
 * [[tags]]
 
-  You can tag pages and use these tags in various ways.
+  You can tag pages and use these tags in various ways. Tags will show
+  up in the ways you'd expect, like at the bottom of pages, in blogs, and
+  in rss feeds.
 
 * Fast compiler
 
@@ -134,6 +142,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]].