Merge remote-tracking branch 'origin/master'

[pod.git] / sf / feed.xml

diff --git a/sf/feed.xml b/sf/feed.xml
index fbc334f8675acd9996cc988c537900cf13470461..bb7d33f26fde50c1685e4caa292e82db8080e2df 100644 (file)
--- a/sf/feed.xml
+++ b/sf/feed.xml
@@ -5,39 +5,44 @@ title: ""
     xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule"
     xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
     <channel>
     xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule"
     xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
     <channel>

-        <atom:link href="{{ site.url }}/sf/feed.xml" rel="self" type="application/rss+xml" />
+        <atom:link href="{{ site.podcast.url }}/feed.xml" rel="self" type="application/rss+xml" />

         <title>{{ site.podcast.title }}</title>
         <title>{{ site.podcast.title }}</title>

-        <link>{{ site.podcast.url }}/sf</link>
-        <description>{{ site.podcast.escription | xml_escape }}</description>
+        <link>{{ site.podcast.url }}</link>
+        <description>{{ site.podcast.description | xml_escape }}</description>

         <managingEditor>{{ site.podcast.email }} ({{ site.podcast.author }})</managingEditor>
         <webMaster>{{ site.podcast.email }} ({{ site.podcast.author }})</webMaster>
         <language>{{ site.podcast.lang }}</language>
         <managingEditor>{{ site.podcast.email }} ({{ site.podcast.author }})</managingEditor>
         <webMaster>{{ site.podcast.email }} ({{ site.podcast.author }})</webMaster>
         <language>{{ site.podcast.lang }}</language>

-        <copyright>Copyright (C) {{ site.time | date: "%Y" }} {{ site.author }}. All Rights Reserved.</copyright>
+        <copyright>Copyright (C) {{ site.time | date: "%Y" }} {{ site.author | xml_escape }}. All Rights Reserved.</copyright>

         <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
         <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
         <image>
             <url>{{ site.podcast.url }}/RJS_pod_1400x1400.jpg</url>
             <title>{{ site.podcast.title }}</title>
         <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
         <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
         <image>
             <url>{{ site.podcast.url }}/RJS_pod_1400x1400.jpg</url>
             <title>{{ site.podcast.title }}</title>

-            <link>{{ site.podcast.url }}/sf</link>
+            <link>{{ site.podcast.url }}</link>

         </image>
         <docs>http://www.rssboard.org/rss-specification</docs>
         </image>
         <docs>http://www.rssboard.org/rss-specification</docs>

-        <itunes:author>{{ site.podcast.title }}</itunes:author>
+        <itunes:author>{{ site.podcast.author }}</itunes:author>
+        <itunes:subtitle>{{ site.podcast.title | xml_escape }}</itunes:subtitle>
+        <itunes:summary>{{ site.podcast.description | xml_escape }}</itunes:summary>

         <itunes:explicit>clean</itunes:explicit>
         <itunes:image href="{{ site.url }}/RJS_pod_1400x1400.jpg"/>
         <itunes:owner>
         <itunes:explicit>clean</itunes:explicit>
         <itunes:image href="{{ site.url }}/RJS_pod_1400x1400.jpg"/>
         <itunes:owner>

-        <itunes:name><![CDATA[RJS Pod]]></itunes:name>
-                <itunes:email>{{ site.email }} (Podcast)</itunes:email>
+            <itunes:name>{{ site.podcast.author }}</itunes:name>
+            <itunes:email>{{ site.email }}</itunes:email>

         </itunes:owner>
         <itunes:category text="News">
             <itunes:category text="Politics"/>
         </itunes:category>
         </itunes:owner>
         <itunes:category text="News">
             <itunes:category text="Politics"/>
         </itunes:category>

+        <itunes:keywords>
+            { site.podcast.keywords | xml_escape }}
+        </itunes:keywords>

 {% for post in site.posts %}        <item>
             <title>{{ post.title | xml_escape }}</title>
 {% for post in site.posts %}        <item>
             <title>{{ post.title | xml_escape }}</title>

-            <link>{{ site.podcast.url }}{{ post.url }}</link>
-            <description>{{ post.excerpt | xml_escape }}</description>
-            <guid isPermaLink="true">{{ site.podcast.url }}{{ post.url }}</guid>
+            <link>{{ post.url | absolute_url }}</link>
+            <description>{{ post.summary | xml_escape }}</description>
+            <guid isPermaLink="true">{{ post.url | absolute_url }}</guid>

             <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
             <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>

-            <enclosure url="http:{{ post.file }}" length="{{ post.length }}" type="audio/mp3"/>
+            <enclosure url="{{ post.mediaURL }}" length="{{ post.mediaLength }}" type="audio/mp3"/>

             <itunes:author>{{ site.podcast.author }}</itunes:author>
             <itunes:summary>{{ post.summary | xml_escape }}</itunes:summary>
             <itunes:duration>{{ post.duration }}</itunes:duration>
             <itunes:author>{{ site.podcast.author }}</itunes:author>
             <itunes:summary>{{ post.summary | xml_escape }}</itunes:summary>
             <itunes:duration>{{ post.duration }}</itunes:duration>