merged filter-full

diff --git a/debian/changelog b/debian/changelog
index 3a581cccb9489e185d12fccf0b1ee240caa24175..699fae7fa26d9bf550d7b29cb000d2188071d3c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,13 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * Add --changesetup mode that allows easily changing options in a
     setup file.
   * openid: Fix handling of utf-8 nicknames.
   * Add --changesetup mode that allows easily changing options in a
     setup file.
   * openid: Fix handling of utf-8 nicknames.

+  * Clarified what the filter hook should be passed: Only be the raw,
+    complete text of a page. Not a snippet, or data read in from an
+    unrelated file.
+  * template: Do not pass filled in template through filter hook.
+    Avoids causing breakage in po plugin.
+  * color, comments, conditional, cutpaste, more, sidebar, toggle: Also
+    avoid unnecessary calls to filter hook.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index 9fd0de694e67dfd525b2e2bc84794614124db071..d826546e68c809b01476d3d2d4e37605b1e2397c 100644 (file)
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -45,4 +45,4 @@ This has been fixed in my po branch.
 >>> you found this solution, as I didn't like changing the filter
 >>> prototype. I believe you can now merge this code. --[[intrigeri]]
 
 >>> you found this solution, as I didn't like changing the filter
 >>> prototype. I believe you can now merge this code. --[[intrigeri]]
 

-[[!tag patch]]
+[[!tag patch done]]