changelog/NEWS update for template changes

diff --git a/debian/NEWS b/debian/NEWS
index 69967c84caddd974552344e0098eaccfde912e4f..664f55b6edf08ee721e36395fefa1d1b959c9758 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -6,6 +6,10 @@ ikiwiki (3.20100422) unstable; urgency=low
   of your wiki. (For example, templates/page.tmpl.) When these templates
   are changed, ikiwiki will automatically rebuild pages that use them.
 
+  Allowing untrusted users to upload attachments with the ".tmpl"
+  extension is not recommended, as that allows anyone to change
+  a wiki's templates.
+
   The --getctime switch is renamed to --gettimes, and it also gets the 
   file modification time. And it's a lot faster (when using git). But
   the really important change is, you don't have to remember to use this

diff --git a/debian/changelog b/debian/changelog
index 0ab04f522864ab2c1bff2bcae802f00b49d01801..425e28fa6a352776a2e26ba8b8fc58956043448c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ ikiwiki (3.20100422) UNRELEASED; urgency=low
   [ Joey Hess ]
   * tag: Automatic creation of tag pages can now be enabled using
     the tag_autocreate setting. (David Riebenbauer)
+  * Customised templates can now be included in the source of wikis
+    (and also in underlays), and dependencies on them are tracked.
+  * TMPL_INCLUDE is no longer supported in any template.
+  * underlay: Removed the add_templates option.
+  * Add template_depends function to plugin API.
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
   * comments: Fix missing entity encoding in title.
   * txt: Add a special case for robots.txt.