From: Joey Hess Date: Fri, 12 Mar 2010 17:52:34 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/3fd202db7b3b3ea4eb8fc7ecda8db38f8ed788af?hp=58a6847cfb445dbb87716e4064f8151cc44a233a Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/debian/changelog b/debian/changelog index 6828e6b3f..bae0e7ee0 100644 --- 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.