bah, globlists are not anded..

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 5765552f01d85482ea8deb08df2e359b60dc88cb..ac5dc03752049dcab125b8839b11b68928985eae 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -37,12 +37,14 @@ Some of ikiwiki's features:
 
 * [[blog]]s
 
 
 * [[blog]]s
 

-  You can turn any page in the wiki into a [[blog]]. Pages with names 
-  matching a specified [[GlobList]] will be displayed as a weblog within
-  the blog page. And an RSS feed can be generated to follow the 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
+  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's own [[TODO]], [[news]], and [[plugins]] pages are good examples
+  of some of the flexible ways that this can be used.
+
+  Note that this also includes support for tag-based blogging.

 
 * Fast compiler
 
 
 * Fast compiler
 


@@ -97,9 +99,6 @@ Some of ikiwiki's features:
   shown in the file to resolve the conflict, so if you're already familiar
   with that there's no new commit marker syntax to learn.
 
   shown in the file to resolve the conflict, so if you're already familiar
   with that there's no new commit marker syntax to learn.
 

-  For all the gory details of how ikiwiki handles this behind the scenes,
-  see [[commit-internals]].
-

 * page locking
 
   Wiki admins can lock pages so that only other admins can edit them.
 * page locking
 
   Wiki admins can lock pages so that only other admins can edit them.