From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 15 Oct 2008 18:45:28 +0000 (-0400)
Subject: inline: Use the feed's description in the rss and atom links. Closes: #502113
X-Git-Tag: 2.67~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8f4b9c7993cd5e7e5e6b07d512ffa8ecf9f5a7a;p=ikiwiki.git

inline: Use the feed's description in the rss and atom links. Closes: #502113
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index aa8fe2baa..6d88c2f15 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -376,7 +376,7 @@ sub preprocess_inline (@) { #{{{
 					genfeed("rss",
 						$config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist));
 				$toping{$params{destpage}}=1 unless $config{rebuild};
-				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="$desc (RSS)" href="$rssurl" />};
 			}
 		}
 		if ($atom) {
@@ -386,7 +386,7 @@ sub preprocess_inline (@) { #{{{
 				writefile($atomp, $config{destdir},
 					genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist));
 				$toping{$params{destpage}}=1 unless $config{rebuild};
-				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+				$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="$desc (Atom)" href="$atomurl" />};
 			}
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index f5156a667..ecef4f158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (2.67) UNRELEASED; urgency=low
   * Pass HTTPS variable through the wrapper so that CGI->https can be used
     by plugins. Closes: #502047
   * inline: Allow MTIME to be used in inlinepage.tmpl.
+  * inline: Use the feed's description in the rss and atom links.
+    Closes: #502113
 
  -- Joey Hess <joeyh@debian.org>  Mon, 06 Oct 2008 16:07:50 -0400