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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 1406f5a1b..27db7bc65 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -46,15 +46,21 @@ Some of ikiwiki's features:
 * [[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
 
@@ -136,7 +142,7 @@ Some of ikiwiki's features:
   After rather a lot of fiddling, we think that ikiwiki correctly and fully
   supports utf8 everywhere.
 
-* [[serverless]] mode
+* [[w3mmode]]
 
   Can be set up so that w3m can be used to browse a wiki and edit pages
   without using a web server.