Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / ikiwiki / directive / aggregate.mdwn

diff --git a/doc/ikiwiki/directive/aggregate.mdwn b/doc/ikiwiki/directive/aggregate.mdwn
index f132c9746f4bb88a0dc901dc59a4645c96b40348..70174f44068d528deb003a186b661399c77c9275 100644 (file)
--- a/doc/ikiwiki/directive/aggregate.mdwn
+++ b/doc/ikiwiki/directive/aggregate.mdwn
@@ -1,7 +1,6 @@
-The `aggregate` directive is supplied by the [[!iki plugins/aggregate]] plugin.
-
-This plugin requires extra setup, specifically, a cron job.
-See the plugin documentation for details.
+The `aggregate` directive is supplied by the [[!iki plugins/aggregate desc=aggregate]] plugin.
+This plugin requires extra setup, specifically, a cron job. See the
+plugin's documentation for details.

 
 This directive allows content from other feeds to be aggregated into the wiki.
 Aggregate a feed as follows:
 
 This directive allows content from other feeds to be aggregated into the wiki.
 Aggregate a feed as follows:


@@ -15,7 +14,7 @@ more frequently than once every 15 minutes (though possibly less
 frequently, if the cron job runs less frequently than that), and puts a
 page per post under the example/ directory in the wiki.
 
 frequently, if the cron job runs less frequently than that), and puts a
 page per post under the example/ directory in the wiki.
 

-You can then use ikiwiki's [[ikiwiki/blog]] support to create a blog of one or
+You can then use ikiwiki's [[inline]] directive to create a blog of one or

 more aggregated feeds. For example:
 
        \[[!inline pages="internal(example/*)"]]
 more aggregated feeds. For example:
 
        \[[!inline pages="internal(example/*)"]]