From 7609bea2373599512f0be20a688941f0b84b7916 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 9 Oct 2013 13:50:16 +0200 Subject: Sync with ikiwiki 3.20130904.1. --- ikiwiki/directive/edittemplate.mdwn | 16 +++++++--------- ikiwiki/directive/inline.mdwn | 4 +++- ikiwiki/directive/meta.mdwn | 6 ++++++ ikiwiki/directive/poll.mdwn | 2 ++ ikiwiki/directive/table.mdwn | 5 ++++- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ikiwiki/directive/edittemplate.mdwn b/ikiwiki/directive/edittemplate.mdwn index c486e82..569c281 100644 --- a/ikiwiki/directive/edittemplate.mdwn +++ b/ikiwiki/directive/edittemplate.mdwn @@ -2,9 +2,15 @@ The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate desc This directive allows registering template pages, that provide default content for new pages created using the web frontend. To register a -template, insert a [[ikiwiki/directive/template]] directive on some other page. +template, insert a [[ikiwiki/directive/template]] directive on some other +page. \[[!edittemplate template="bugtemplate" match="bugs/*"]] + +A recommended place to put the directive is on the parent page +of the pages that will be created using the template. So the above +example would be put on the bugs page. (Do not put the directive on the +template page itself.) In the above example, the page named "bugtemplate" is registered as a template to be used when any page named "bugs/*" is created. To avoid @@ -25,12 +31,4 @@ like other ikiwiki [[templates]]. Currently only one variable is set: `` is replaced with the name of the page being created. ----- - -It's generally not a good idea to put the `edittemplate` directive in -the template page itself, since the directive would then be included as -part of the template on new pages, which would then in turn be registered -as templates. If multiple pages are registered as templates for a new page, -an arbitrary one is chosen, so that could get confusing. - [[!meta robots="noindex, follow"]] diff --git a/ikiwiki/directive/inline.mdwn b/ikiwiki/directive/inline.mdwn index a9c241a..d2f6d1d 100644 --- a/ikiwiki/directive/inline.mdwn +++ b/ikiwiki/directive/inline.mdwn @@ -11,7 +11,9 @@ 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. Note that if files that are not pages match the [[PageSpec]], they will be included in the feed using RSS -enclosures, which is useful for podcasting. +enclosures, which is useful for simple [[!iki podcast desc=podcasting]]; +for fuller-featured podcast feeds, enclose media files in blog posts +using [[meta]]. The optional `rootpage` parameter tells the wiki that new posts to this blog should default to being [[SubPages|SubPage]] of "blog", and enables a diff --git a/ikiwiki/directive/meta.mdwn b/ikiwiki/directive/meta.mdwn index 984f685..955648c 100644 --- a/ikiwiki/directive/meta.mdwn +++ b/ikiwiki/directive/meta.mdwn @@ -136,6 +136,12 @@ Supported fields: [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled, since it can be used to insert unsafe content. +* enclosure + + Specifies a link to a file to be rendered as an "enclosure" in + RSS/Atom feeds (and a plain old link in HTML). Useful for + [[!iki podcast desc=podcasting]]. + * redir Causes the page to redirect to another page in the wiki. diff --git a/ikiwiki/directive/poll.mdwn b/ikiwiki/directive/poll.mdwn index 6aa3d2c..0b47a21 100644 --- a/ikiwiki/directive/poll.mdwn +++ b/ikiwiki/directive/poll.mdwn @@ -19,6 +19,8 @@ Parameters: * `open` - Whether voting is still open. Set to "no" to close the poll to voting. +* `expandable` - Set to "yes" to make this poll have an interface to add + another choice to the poll. * `total` - Show total number of votes at bottom of poll. Default is "yes". * `percent` - Whether to display percents. Default is "yes". diff --git a/ikiwiki/directive/table.mdwn b/ikiwiki/directive/table.mdwn index a6692f9..3e79177 100644 --- a/ikiwiki/directive/table.mdwn +++ b/ikiwiki/directive/table.mdwn @@ -26,7 +26,7 @@ cells. For example: \[[!table data=""" left||right| a|b|c|d - this cell spans 4 columns||| + this cell spans **4** columns||| """]] ## usage @@ -47,4 +47,7 @@ or a spreadsheet), `delimiter` must be set to a literal tab character. These are difficult to type in most web browsers - copying and pasting one from the table data is likely to be the easiest way. +Note that the contents of table cells can contain arbitrary ikiwiki and +markdown markup. + [[!meta robots="noindex, follow"]] -- cgit v1.2.3