changelog, close bugs

diff --git a/debian/changelog b/debian/changelog
index 4356a7aedec70d2c919296bcd66d25b839c3368d..ff1e73b86a268aa527524defb72909e516ddeabd 100644 (file)
--- 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
   * 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 <smcv@debian.org>  Fri, 12 Sep 2014 21:23:58 +0100
 
 
  -- Simon McVittie <smcv@debian.org>  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 c031543c111d5ee0ec9c662379d50eef9eb57164..20d711fcb51a2d5e53ba015e61bd7055dd4cd299 100644 (file)
--- 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]]
 
 >> 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 d1fb788f5287878f28910e6a1def1e0336e18cd1..33a863ec56aa431bd83136dcdfa08b74886b29aa 100644 (file)
--- 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]]
 >>>> 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]]