From: Joey Hess Date: Tue, 14 Sep 2010 19:13:13 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100915~9 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ad5f4f14f52233148a9ecae2b3e7e0964c6c02ba?hp=382b0b349988d92f8571b38beb8be003e0b334a0 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/debian/changelog b/debian/changelog index 3428aa6d3..8b127b574 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low information earlier than the delete hook. * actiontabs: Improve tab padding. * blueview: Fix display of links to translated pages in the page header. + * Set isPermaLink="no" for guids in rss feeds. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index a64a4ebd7..272b340bb 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -8,7 +8,7 @@ - +