Merge commit 'upstream/master'

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

diff --git a/doc/blog.mdwn b/doc/blog.mdwn
index d300736a86b9a6feb5c673aae30a4c15d129f45d..c4a379fdbaf0d29d9de0cd0d4e3abfa86df3d96c 100644 (file)
--- a/doc/blog.mdwn
+++ b/doc/blog.mdwn
@@ -1,8 +1,4 @@
-You can turn any page on this wiki into a weblog by inserting a
-[[PostProcessorDirective]]. Like this:
+Ikiwiki allows turning any page into a weblog, by using the
+[[ikiwiki/directive/inline]] [[ikiwiki/directive]]. For example:

 
 

-\\[[inline pages="blog/*" show="10"]]
-
-Any pages that match the specified [[GlobList]] (in the exaple, any
-[[SubPages]] of "blog") will be part of the blog, and the newest 10
-of them will appear in the page.
+       \[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]