summaryrefslogtreecommitdiff
path: root/ikiwiki
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-06-15 10:33:52 +0200
committerJonas Smedegaard <dr@jones.dk>2011-06-15 10:33:52 +0200
commitb04cb8c6cb13f212c21cbc4abcc1ef1120f4edb8 (patch)
tree3a250531e724b9c2a514da70799f4d3e91090cf5 /ikiwiki
parent5749a9d2cc502cee4451b8b01898649d1bad8444 (diff)
Sync with ikiwiki 3.20110608.
Diffstat (limited to 'ikiwiki')
-rw-r--r--ikiwiki/directive.mdwn17
-rw-r--r--ikiwiki/pagespec.mdwn1
2 files changed, 16 insertions, 2 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..fe1af4c 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