X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ad247de723cc540aaaae584cdceefaeb06f62284..ad8dfc67ab2001d343fce5737ee922136764fa19:/basewiki/blog.mdwn

diff --git a/basewiki/blog.mdwn b/basewiki/blog.mdwn
index 1276cb1e8..4b4e376b1 100644
--- a/basewiki/blog.mdwn
+++ b/basewiki/blog.mdwn
@@ -1,33 +1,37 @@
 You can turn any page on this wiki into a weblog by inserting a
 [[PreProcessorDirective]]. Like this:
 
-	\\[[inline pages="blog/* !*/Discussion" show="10" rootpage="blog"]]
+	\[[inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
 
-Any pages that match the specified [[GlobList]] (in the example, any
+Any pages that match the specified [[PageSpec]] (in the example, any
 [[SubPage]] of "blog") will be part of the blog, and the newest 10
 of them will appear in the page.
 
-The optional `rootpage` setting tells the wiki that new posts to this blog
-should default to being [[SubPage]] of "blog", and enables a form at the
+The optional `rootpage` parameter tells the wiki that new posts to this blog
+should default to being [[SubPage]]s of "blog", and enables a form at the
 top of the blog that can be used to add new items.
 
+There is also an optional `rss` parameter that can control whether an RSS
+feed is generated. The default is to generate an RSS feed, if the wiki is
+globally configured to do so, but you can set `rss=no` to disable this.
+
 If you want your blog to have an archive page listing every post ever made
 to it, you can accomplish that like this:
 
-	\\[[inline pages="blog/* !*/Discussion" archive="yes"]]
+	\[[inline pages="blog/* and !*/Discussion" archive="yes"]]
 
 You can even create an automatically generated list of all the pages on the
 wiki, with the most recently added at the top, like this:
 
-	\\[[inline pages="* !*/Discussion" archive="yes"]]
+	\[[inline pages="* and !*/Discussion" archive="yes"]]
 
 If you want to be able to add pages to a given blog feed by tagging them,
 you can do that too. To tag a page, just make it link to a page or pages 
-that represent its tags. Then use the special link() [[GlobList]] to match
+that represent its tags. Then use the special link() [[PageSpec]] to match
 all pages that have a given tag:
 
-	\\[[inline pages="link(life)"]]
+	\[[inline pages="link(life)"]]
 
 Or include some tags and exclude others:
 
-	\\[[inline pages="link(debian) !link(social)"]]
+	\[[inline pages="link(debian) and !link(social)"]]