diff options
| author | Joey Hess <joey@kitenet.net> | 2010-12-01 20:36:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-12-01 20:36:07 -0400 |
| commit | 017f335aff7df37d0a22f11f45fec05c5e446826 (patch) | |
| tree | c96974fbfcfde1a1d44894eb8b9931c1f42ba32e | |
| parent | 971322bdb68b5afabde47650174fdd4673fed0a2 (diff) | |
| parent | dae4a144e7219ce596f9d96206176a3d1d1ad4a5 (diff) | |
Merge branch 'bugfix'
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | doc/news/version_3.20101201.mdwn | 5 | ||||
| -rw-r--r-- | ikiwiki.spec | 2 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 33c2d3d07..ec85743a7 100644 --- 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 index 000000000..410640c75 --- /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 b0826d64e..09cc4a0f4 100644 --- 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 492222b86..6eb13103e 100644 --- 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" |