diff options
| author | Simon McVittie <smcv@debian.org> | 2014-09-15 22:12:45 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2014-09-15 22:12:45 +0100 |
| commit | 5ff68d517165b0b24a01d4624be1ba2e4dff336f (patch) | |
| tree | e3e9a2695d214f2ba79aeb2d14fe34537c5d2034 | |
| parent | 7f5c2cfa5a987d887f42d6db95f80f42ceb3b5ff (diff) | |
| download | ikiwiki-5ff68d517165b0b24a01d4624be1ba2e4dff336f.tar ikiwiki-5ff68d517165b0b24a01d4624be1ba2e4dff336f.tar.gz | |
changelog, close bugs
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/pages_under_templates_are_invalid.mdwn | 2 | ||||
| -rw-r--r-- | doc/bugs/template_creation_error.mdwn | 2 |
3 files changed, 6 insertions, 0 deletions
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 <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 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]] |