Merge remote-tracking branch 'origin/master'

diff --git a/debian/changelog b/debian/changelog
index 07b1161fbcb45239d4558779024ddbe0cb554b8d..ff60062b22261a2cc970a3e2c6720d61d60e2a27 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ikiwiki (3.20110329) UNRELEASED; urgency=low
   * tag: Avoid autocreating multiple tag pages that vary only in
     capitalization. The first capitalization seen of a tag will be used
     for the tag page.
+  * Fix yaml build dep. Closes: #624712
 
  -- Joey Hess <joeyh@debian.org>  Mon, 28 Mar 2011 13:08:23 -0400
 

diff --git a/doc/todo/nested_preprocessor_directives.mdwn b/doc/todo/nested_preprocessor_directives.mdwn
index b5080dc3ca22ef24ad87de301f3cc7b0f584b567..1d44cea88ba4846bc3f5f3303c433b183228acdf 100644 (file)
--- a/doc/todo/nested_preprocessor_directives.mdwn
+++ b/doc/todo/nested_preprocessor_directives.mdwn
@@ -16,3 +16,19 @@ nesting, a new syntax would be needed. Maybe something xml-like?
 >     """]]
 >
 > --[[JoshTriplett]]
+
+>> Yes it's definitely possible to do something like that. I'm not 100%
+>> sure if it can be done in perl regexp or needs a real recursive descent
+>> parser though.
+>>
+>> In the meantime, this is an interesting approach:
+>> <https://github.com/timo/ikiwiki/commit/a73837a8f26147e42a0bb2dde38b4890b27822b3>
+>> 
+>>     \[[!directive text=<<FOO
+>>     ...
+>>     <<FOO]]
+>> 
+>> Since that's implemented, I will probably just merge it,
+>> once I satisfy myself it doesn't blow up in any edge cases.
+>> (It also adds triple single quotes as a third, distinct type of quotes,
+>> which feels a bit redundant given the here docs.) --[[Joey]]