summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2009-01-17 14:01:53 +0100
committerintrigeri <intrigeri@boum.org>2009-01-17 14:01:53 +0100
commit832d4d31d177d5d5f848250496048a00e9d70e2f (patch)
tree5fcda7f65be83ba15ae1ca321f77962bf3efd015 /debian
parent40de619d4968ecd7dc0086ca5118746bc3db3860 (diff)
parent9e3bca852f9a39c43b4a7309b93ba9b0857ac4b9 (diff)
Merge commit 'upstream/master' into prv/po
Conflicts: IkiWiki/Plugin/editpage.pm IkiWiki/Plugin/skeleton.pm.example doc/plugins/write.mdwn t/syntax.t
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f35606148..6384c8df9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
ikiwiki (3.02) UNRELEASED; urgency=low
+ * blogspam: New plugin, adding spam filtering for page editing / comment
+ posting using the BlogSpam.net API.
+ * Add auto-blog.setup, which will set up an ikiwiki instance tuned for use
+ in blogging.
+ * checkcontent: New hook, can be used to implement arbitrary content
+ filters, including spam filters.
* table: Fix misparsed links in external files.
* table: Find links in external files in scan pass.
* rename: Show full names of affected pages.
@@ -16,8 +22,6 @@ ikiwiki (3.02) UNRELEASED; urgency=low
the nostromo web server.
* Recommend libterm-readline-gnu-perl since that makes auto.setup
behave better.
- * Add auto-blog.setup, which will set up an ikiwiki instance tuned for use
- in blogging.
-- Joey Hess <joeyh@debian.org> Tue, 06 Jan 2009 15:02:52 -0500