From b04cb8c6cb13f212c21cbc4abcc1ef1120f4edb8 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 15 Jun 2011 10:33:52 +0200
Subject: Sync with ikiwiki 3.20110608.

---
 ikiwiki/directive.mdwn | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'ikiwiki/directive.mdwn')

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
-- 
cgit v1.2.3