Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9f6790ceb6a2c16632a41acb78e1b12b3c07f3f7..6384c8df99d657f48db3f0942d6983e1d6ba484f 100644 (file)
--- 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.