Merge branch 'bugfix'

diff --git a/debian/changelog b/debian/changelog
index 33c2d3d0769a1f2f524f046b0310681a728e9617..ec85743a7ad82f0541967ef0e3a521c8467500f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20101201) unstable; urgency=low
+
+  * meta: Fix calling of htmlscrubber to pass the page parameter.
+    The change of the htmlscrubber to look at page rather than destpage
+    caused htmlscrubber_skip to not work for meta directives.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 01 Dec 2010 20:28:01 -0400
+
 ikiwiki (3.20101130) UNRELEASED; urgency=low
 
   * Better support for serving the same site on multiple urls. (Such as

diff --git a/doc/news/version_3.20101201.mdwn b/doc/news/version_3.20101201.mdwn
new file mode 100644 (file)
index 0000000..410640c
--- /dev/null
+++ b/doc/news/version_3.20101201.mdwn
@@ -0,0 +1,5 @@
+ikiwiki 3.20101201 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * meta: Fix calling of htmlscrubber to pass the page parameter.
+     The change of the htmlscrubber to look at page rather than destpage
+     caused htmlscrubber\_skip to not work for meta directives."""]]
\ No newline at end of file

diff --git a/ikiwiki.spec b/ikiwiki.spec
index b0826d64e969fdcc612633c4f00fc6e4754326ba..09cc4a0f4be256e5e184ddb42d6588d38f70c2b9 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20101129
+Version: 3.20101201
 Release:        1%{?dist}
 Summary:        A wiki compiler
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 492222b86f3ea3d1803fb72660d6e7a2d58d70dd..6eb13103ea9dd7da52846939ba262d6bebe4c586 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 14:01-0400\n"
+"POT-Creation-Date: 2010-12-01 20:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"