diff options
Diffstat (limited to 'ikiwiki')
-rw-r--r-- | ikiwiki/directive.mdwn | 17 | ||||
-rw-r--r-- | ikiwiki/pagespec.mdwn | 4 | ||||
-rw-r--r-- | ikiwiki/pagespec/sorting.mdwn | 6 |
3 files changed, 23 insertions, 4 deletions
diff --git a/ikiwiki/directive.mdwn b/ikiwiki/directive.mdwn index fb88aa7..1dc1e51 100644 --- a/ikiwiki/directive.mdwn +++ b/ikiwiki/directive.mdwn @@ -20,13 +20,26 @@ wrapped to multiple lines if you like: Also, multiple lines of *quoted* text can be used for a value. To allow quote marks inside the quoted text, delimit the block -of text with triple-quotes: +of text with triple-double-quotes or triple-single-quotes: \[[!directive text=""" 1. "foo" 2. "bar" 3. "baz" - """]] + """ othertext=''' + 1. 'quux' + 2. "foo" + ''']] + +If you want to put text with triple quotes into a parameter value, you can +use perl-style here-doc syntax, even nesting it like this: + + \[[!directive text=<<OUTER + [[!otherdirective <<INNER + inner text + INNER]] + outer text + OUTER]] ikiwiki also has an older syntax for directives, which requires a space in directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn index 6aec561..0f298ad 100644 --- a/ikiwiki/pagespec.mdwn +++ b/ikiwiki/pagespec.mdwn @@ -32,6 +32,7 @@ Some more elaborate limits can be added to what matches using these functions: tags matched by a glob) * "`backlink(page)`" - matches only pages that a given page links to * "`creation_month(month)`" - matches only files created on the given month + number * "`creation_day(mday)`" - or day of the month * "`creation_year(year)`" - or year * "`created_after(page)`" - matches only files created after the given page @@ -50,7 +51,8 @@ Some more elaborate limits can be added to what matches using these functions: * "`admin()`" - tests whether a modification is being made by one of the wiki admins. * "`ip(address)`" - tests whether a modification is being made from the - specified IP address. + specified IP address. Glob patterns can be used in the address. For + example, `ip(127.0.0.*)` * "`comment(glob)`" - matches comments to a page matching the glob. * "`comment_pending(glob)`" - matches unmoderated, pending comments. * "`postcomment(glob)`" - matches only when comments are being diff --git a/ikiwiki/pagespec/sorting.mdwn b/ikiwiki/pagespec/sorting.mdwn index ccd7f7e..0c6cc74 100644 --- a/ikiwiki/pagespec/sorting.mdwn +++ b/ikiwiki/pagespec/sorting.mdwn @@ -7,10 +7,14 @@ orders can be specified. * `mtime` - List pages with the most recently modified first. -* `title` - Order by title (page name). +* `title` - Order by title (page name), e.g. "z/a a/b a/c" + +* `path` - Order by page name including parents, e.g. "a/b a/c z/a" [[!if test="enabled(sortnaturally)" then=""" * `title_natural` - Orders by title, but numbers in the title are treated as such, ("1 2 9 10 20" instead of "1 10 2 20 9") + +* `path_natural` - Like `path`, but numbers in the title are treated as such """]] [[!if test="enabled(meta)" then=""" * `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]` |