From 5ff68d517165b0b24a01d4624be1ba2e4dff336f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 15 Sep 2014 22:12:45 +0100 Subject: [PATCH] changelog, close bugs --- debian/changelog | 2 ++ doc/bugs/pages_under_templates_are_invalid.mdwn | 2 ++ doc/bugs/template_creation_error.mdwn | 2 ++ 3 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4356a7aed..ff1e73b86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ ikiwiki (3.20140912) UNRELEASED; urgency=medium * filecheck: accept MIME types not containing ';' * autoindex: index files in underlays if the resulting pages aren't going to be committed. Closes: #611068 + * Add [[!templatebody]] directive so template pages don't have to be + simultaneously a valid template and valid HTML -- Simon McVittie Fri, 12 Sep 2014 21:23:58 +0100 diff --git a/doc/bugs/pages_under_templates_are_invalid.mdwn b/doc/bugs/pages_under_templates_are_invalid.mdwn index c031543c1..20d711fcb 100644 --- a/doc/bugs/pages_under_templates_are_invalid.mdwn +++ b/doc/bugs/pages_under_templates_are_invalid.mdwn @@ -17,3 +17,5 @@ Maybe just encode all < and > when compling pages within the templates fol >> My `templatebody` branch on [[template creation error]] fixes this. >> --[[smcv]] + +>>> [[Merged|done]] --[[smcv]] diff --git a/doc/bugs/template_creation_error.mdwn b/doc/bugs/template_creation_error.mdwn index d1fb788f5..33a863ec5 100644 --- a/doc/bugs/template_creation_error.mdwn +++ b/doc/bugs/template_creation_error.mdwn @@ -268,3 +268,5 @@ same logic as IkiWiki itself. I don't think that's serious. --[[smcv]] >>>> advocate), that should likewise warn if `add_link` actually adds a link in >>>> the render phase. such a warning would have helped spotting the >>>> link-related [[template evaluation oddities]] earlier. --[[chrysn]] + +>>>>> [[Merged|done]] --[[smcv]]