Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / todo / nested_preprocessor_directives.mdwn

diff --git a/doc/todo/nested_preprocessor_directives.mdwn b/doc/todo/nested_preprocessor_directives.mdwn
index 4a2795e300c134a37eff293e09473fd82ff96f3e..433fc6f37bc2cdf50f16b1c6fcbbeb6ae419f226 100644 (file)
--- a/doc/todo/nested_preprocessor_directives.mdwn
+++ b/doc/todo/nested_preprocessor_directives.mdwn
@@ -20,6 +20,8 @@ nesting, a new syntax would be needed. Maybe something xml-like?
 >> 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.
 >> 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.

+>> 
+>> [[!template id=gitbranch branch=timonator/heredoc_triplequote author="\[[timonator]]"]]

 >>
 >> In the meantime, this is an interesting approach:
 >> <https://github.com/timo/ikiwiki/commit/410bbaf141036164f92009599ae12790b1530886>
 >>
 >> In the meantime, this is an interesting approach:
 >> <https://github.com/timo/ikiwiki/commit/410bbaf141036164f92009599ae12790b1530886>


@@ -63,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
 >> 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]]