aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Paulssen <timonator@perpetuum-immobile.de>2011-04-30 22:02:25 +0200
committerJoey Hess <joey@kitenet.net>2011-05-13 11:24:16 -0400
commit635f5284671b5f97531155ac004663c9a180a2d4 (patch)
treef4d1bd8b40e692eacd8b104408dc1d234e020b28
parent1c58634068ab39ed24e81a138375651ce04b244a (diff)
downloadikiwiki-635f5284671b5f97531155ac004663c9a180a2d4.tar
ikiwiki-635f5284671b5f97531155ac004663c9a180a2d4.tar.gz
document new quoting methods.
-rw-r--r--doc/ikiwiki/directive.mdwn17
1 files changed, 15 insertions, 2 deletions
diff --git a/doc/ikiwiki/directive.mdwn b/doc/ikiwiki/directive.mdwn
index fb88aa72d..2a7075e4c 100644
--- a/doc/ikiwiki/directive.mdwn
+++ b/doc/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