X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/405e8a703126cc5de426063dedbd2394b747782a..ac2bf01045e7c61c64ad85025804db29ea00cca2:/templates/atompage.tmpl

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index acc4737c1..e834d7693 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -3,7 +3,7 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
 <title><TMPL_VAR TITLE></title>
 <link href="<TMPL_VAR PAGEURL>"/>
-<link href="<TMPL_VAR FEEDURL>" rel="self"/>
+<link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>
 <TMPL_IF NAME="AUTHOR">
  <name><TMPL_VAR AUTHOR></name>
@@ -31,7 +31,11 @@
   </rights>
  </TMPL_IF>
 </TMPL_IF>
-<id><TMPL_VAR PAGEURL></id>
+<TMPL_IF NAME="GUID">
+  <id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+  <id><TMPL_VAR PAGEURL></id>
+</TMPL_IF>
 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
 <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
 <updated><TMPL_VAR FEEDDATE></updated>