Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/blog.mdwn b/doc/blog.mdwn
index 0d67619dada85a5c7abab3074e8e195e303f5b78..c4a379fdbaf0d29d9de0cd0d4e3abfa86df3d96c 100644 (file)
--- a/doc/blog.mdwn
+++ b/doc/blog.mdwn
@@ -1,22 +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/* !*/Discussion" show="10" rootpage="blog"]]
-
-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.
-
-The optional `rootpage` setting tells the wiki that new posts to this blog
-should default to being [[SubPages]] of "blog", and enables a form at the
-top of the blog that can be used to add new items.
-
-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"]]
-
-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="blog/* and !*/Discussion" show="10" rootpage="blog"]]