Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index 4d57b0e13d9c3993eb3df191489f4fbbce89e1fe..6a64a0c49d42180a79e52fa45b27eba378f5bc60 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,8 @@ ikiwiki (3.03) UNRELEASED; urgency=low
     config settings.
   * comments: If comment content checks fail, store the comment
     (in .ikiwiki/comments_pending) for moderator review.
-  * comments: Add a moderation web interface.
+  * comments: Add a moderation web interface, which admins can
+    access via their Preferences page.
   * git: Fix malformed utf8 recieved from git.
   * meta: New "updated" metadata specifies a fake modification time for a
     page, to be output into RSS and Atom feeds. (smcv)