X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/0f22d66c965d7f2a3e4698de7ddf992efebf6c42..543479eb22c43d26f73f2b43dbea45eea6bd56c1:/doc/features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 5152beffd..27db7bc65 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,22 +38,29 @@ 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]]
 
   You can turn any page in the wiki into a [[blog]]. Pages matching a
-  specified [[GlobList]] will be displayed as a weblog within the blog
+  specified [[PageSpec]] will be displayed as a weblog within the blog
   page. And an RSS feed can be generated to follow the blog.
 
   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]].