From 135628f6d44f97a0150b2b0313a0565abe44f1ae Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Sep 2008 19:39:05 -0400 Subject: move inline docs to ikiwiki/directive/inline ikiwiki/blog will be going away --- doc/ikiwiki/blog.mdwn | 12 ------------ doc/ikiwiki/directive/aggregate.mdwn | 2 +- doc/ikiwiki/formatting.mdwn | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 doc/ikiwiki/blog.mdwn (limited to 'doc/ikiwiki') diff --git a/doc/ikiwiki/blog.mdwn b/doc/ikiwiki/blog.mdwn deleted file mode 100644 index 016e608ba..000000000 --- a/doc/ikiwiki/blog.mdwn +++ /dev/null @@ -1,12 +0,0 @@ -[[!meta robots="noindex, follow"]] -[[!if test="enabled(inline)" - then="This wiki has the inline plugin **enabled**." - else="This wiki has the inline plugin **disabled**."]] - -[[!if test="enabled(inline)" - then="You can" - else="If this wiki had the inline plugin enabled, you could"]] -turn any page on this wiki into a weblog by using the [[directive/inline]] -[[directive]]. For example: - - \[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]] diff --git a/doc/ikiwiki/directive/aggregate.mdwn b/doc/ikiwiki/directive/aggregate.mdwn index 702d91cf5..70174f440 100644 --- a/doc/ikiwiki/directive/aggregate.mdwn +++ b/doc/ikiwiki/directive/aggregate.mdwn @@ -14,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. -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/*)"]] diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn index 0145f9da6..8b74cd73d 100644 --- a/doc/ikiwiki/formatting.mdwn +++ b/doc/ikiwiki/formatting.mdwn @@ -95,7 +95,7 @@ you use the following additional features: """]] [[!if test="enabled(inline) and blog" then=""" - * Create a [[blog]] by inlining a set of pages: + * Create a blog by inlining a set of pages: \[[!inline pages="blog/*"]] """]] -- cgit v1.2.3