merged quoting changes

diff --git a/debian/changelog b/debian/changelog
index e89042e9fd3017ebfc2f59ec2294d87de4449167..9d1278eb16d74364dd981c05ed6c6f7fa0da8afe 100644 (file)
--- 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 04a598b6990b64cc986d015d2edd1f69141643f7..433fc6f37bc2cdf50f16b1c6fcbbeb6ae419f226 100644 (file)
--- 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]]