more doubled slashes..

[git.ikiwiki.info.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index a43cd1c9a64cc187297bd31456e883e35021c52e..27db7bc65546c2ad4be8856d95b6c44f97e7ab7b 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -46,12 +46,16 @@ Some of ikiwiki's features:
 * [[blogging|blog]]
 
   You can turn any page in the wiki into a [[blog]]. Pages matching a
 * [[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.
 
   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. Tags will show
 * [[tags]]
 
   You can tag pages and use these tags in various ways. Tags will show