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

diff --git a/debian/changelog b/debian/changelog
index 6828e6b3f85d86d852c74cc7844be3f23bd2eb12..bae0e7ee01e6448f8c6c5d308915ef6bac33a56c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,12 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
   * Fix utf8 issues in calls to md5_hex.
   * moderatedcomments: Added moderate_pagespec that can be used
     to control which users or comment locations are moderated.
-    This can be used, just for example, to moderate http://myopenid.com/*
+    This can be used, just for example, to moderate "user(http://myopenid.com/*)"
     if you're getting a lot of spammers from one particular openid
     provider (who should perhaps answer your emails about them),
     while not moderating other users.
   * moderatedcomments: The moderate_users setting is deprecated. Instead,
-    set moderate_pagespec to "!admin()" or "user(*)" instead.
+    set moderate_pagespec to "!admin()" or "user(*)".
   * Fix missing span on recentchanges page template.
   * search: Avoid '$' in the wikiname appearing unescaped on omega's
     query template, where it might crash omega.