aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-05-13 11:23:01 -0400
committerJoey Hess <joey@kitenet.net>2011-05-13 11:24:16 -0400
commitb4dd83642ae493249ae74282fd1c9112ec10aeed (patch)
treeb98b43900be2d4ff742342ed799dd714ae0953ef
parent8e120bf7182e93f27d4afa446193986e6309b485 (diff)
downloadikiwiki-b4dd83642ae493249ae74282fd1c9112ec10aeed.tar
ikiwiki-b4dd83642ae493249ae74282fd1c9112ec10aeed.tar.gz
merged quoting changes
-rw-r--r--debian/changelog3
-rw-r--r--doc/todo/nested_preprocessor_directives.mdwn2
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e89042e9f..9d1278eb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low
* openid, aggregate, pinger: Use Net::INET6Glue if available to
support making ipv6 connections. (Note that if LWPx::ParanoidAgent
is installed, it defeats this for openid.)
+ * Add additional directive quoting styles, to better support nested
+ directives. Both triple-single-quote and heredoc quotes can be used.
+ (Thanks, Timo Paulssen)
-- Joey Hess <joeyh@debian.org> Thu, 05 May 2011 13:02:19 -0400
diff --git a/doc/todo/nested_preprocessor_directives.mdwn b/doc/todo/nested_preprocessor_directives.mdwn
index 04a598b69..433fc6f37 100644
--- a/doc/todo/nested_preprocessor_directives.mdwn
+++ b/doc/todo/nested_preprocessor_directives.mdwn
@@ -65,3 +65,5 @@ nesting, a new syntax would be needed. Maybe something xml-like?
>> didn't put it in the other regexes. Not completely sure about the
>> implications.) Am now trying to wrap my head around a test case to
>> test the new formats for a bit. --Timo
+
+[[done]]!!! --[[Joey]]