urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix'

master
Joey Hess 2010-12-01 20:36:07 -04:00
parent 971322bdb6 dae4a144e7
commit 017f335aff
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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

5
doc/news/version_3.20101201.mdwn 100644
View File

@ -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."""]]

2
ikiwiki.spec
View File

@ -1,5 +1,5 @@
Name: ikiwiki
Version: 3.20101129
Version: 3.20101201
Release: 1%{?dist}
Summary: A wiki compiler

2
po/ikiwiki.pot
View File

@ -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"