From 72e64684948b6ba0e89759fbf74358ce5f112a59 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 14 Oct 2010 13:23:22 +0200
Subject: Sync with ikiwiki 3.20100926.

---
 page.tmpl    | 3 ++-
 rssitem.tmpl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/page.tmpl b/page.tmpl
index da8c294..8659018 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -11,7 +11,6 @@
 </TMPL_IF>
 </TMPL_IF>
 <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
-<meta http-equiv="Cache-Control" content="must-revalidate" />
 <title><TMPL_VAR TITLE></title>
 <TMPL_IF FAVICON>
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
@@ -118,6 +117,7 @@
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
 <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
 <TMPL_VAR COMMENTS>
@@ -130,6 +130,7 @@
 </TMPL_IF>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
+</TMPL_UNLESS>
 
 </div>
 
diff --git a/rssitem.tmpl b/rssitem.tmpl
index a64a4eb..272b340 100644
--- a/rssitem.tmpl
+++ b/rssitem.tmpl
@@ -8,7 +8,7 @@
 <TMPL_IF GUID>
 	<guid isPermaLink="no"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
-	<guid><TMPL_VAR URL></guid>
+	<guid isPermaLink="no"><TMPL_VAR URL></guid>
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
 <TMPL_IF CATEGORIES>
-- 
cgit v1.2.3


From 5a2106a2510b0bb38880db90eded65695ffd8674 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 22 Oct 2010 18:51:02 +0200
Subject: Move OTHERLANGUAGES down to footer (above COPYRIGHT).

---
 page.tmpl | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/page.tmpl b/page.tmpl
index 8659018..53ffaaa 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -86,23 +86,6 @@
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF OTHERLANGUAGES>
-<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
-<ul>
-<TMPL_LOOP OTHERLANGUAGES>
-<li>
-<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
-<TMPL_IF MASTER>
-(master)
-<TMPL_ELSE>
-&nbsp;(<TMPL_VAR PERCENT>%)
-</TMPL_IF>
-</li>
-</TMPL_LOOP>
-</ul>
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF SIDEBAR>
@@ -165,6 +148,23 @@ Links:
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<TMPL_IF OTHERLANGUAGES>
+<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
+<ul>
+<TMPL_LOOP OTHERLANGUAGES>
+<li>
+<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+<TMPL_IF MASTER>
+(master)
+<TMPL_ELSE>
+&nbsp;(<TMPL_VAR PERCENT>%)
+</TMPL_IF>
+</li>
+</TMPL_LOOP>
+</ul>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
 <TMPL_IF COPYRIGHT>
 <div class="pagecopyright">
 <a name="pagecopyright"></a>
-- 
cgit v1.2.3