From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 02:30:42 +0000 (-0400)
Subject: Merge branch 'master' into commentreorg
X-Git-Tag: 3.20100515~63
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/937b24e0cf98d75dd353d80267efddcecab9e908

Merge branch 'master' into commentreorg
---

937b24e0cf98d75dd353d80267efddcecab9e908
diff --cc debian/NEWS
index 8f456bced,e65a15457..68f0a207b
--- a/debian/NEWS
+++ b/debian/NEWS
@@@ -8,13 -8,12 +8,18 @@@ ikiwiki (3.20100505) UNRELEASED; urgenc
      <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
      <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
      </TMPL_IF>
 +  
 +  Also, there is a new "comment()" pagespec, that can be used to match a
 +  comment on a page. It is recommended it be used instead of the old
 +  method of using a pagespec such as "internal(comment_*)" to match
 +  things that looked like comments. The old pagespec will now also match
 +  comments that are held for moderation; likely not what you want.
  
+   There have also been some changes to the style.css in this version,
+   particularly to support the new openid selector. If you have a modified
+   version, of style.css, updating it (or moving it to local.css) is
+   recommended.
+ 
   -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 21:47:08 -0400
  
  ikiwiki (3.20100427) unstable; urgency=low