merge schmonz/fancypodcast

diff --git a/debian/changelog b/debian/changelog
index bc05aa091e8a97c710fa3c0fd17d3fbc37ca9d2f..81931465ae721fb99d30b72669855930d8e31710 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,13 @@ ikiwiki (3.20130712) UNRELEASED; urgency=low
 
   * calendar: Display the popup mouseover when there is only 1 page for a
     given day, for better UI consistency.
 
   * calendar: Display the popup mouseover when there is only 1 page for a
     given day, for better UI consistency.

+  * meta: Can now be used to add an enclosure to a page, which is a fancier
+    way to do podcasting than just inlining the media files directly;
+    this way you can write a post about the podcast episode with show notes,
+    author information, etc.
+    (schmonz)
+  * aggregate: Show author in addition to feedname, if different.
+    (schmonz)

 
  -- Joey Hess <joeyh@debian.org>  Fri, 19 Jul 2013 18:53:23 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 19 Jul 2013 18:53:23 -0400
 

diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn
index 79b21404930c8b26b3b9362aa6615802534763f2..04d86823cfa9c9aa64c65619521d1170958d2d59 100644 (file)
--- a/doc/todo/fancypodcast.mdwn
+++ b/doc/todo/fancypodcast.mdwn
@@ -346,3 +346,7 @@ Does this added tag provide any benefits? --[[Joey]]
 > than the atom namespace bits. --[[schmonz]]
 
 >> Sounds ok then. --[[Joey]]
 > than the atom namespace bits. --[[schmonz]]
 
 >> Sounds ok then. --[[Joey]]

+
+----
+
+[[merged|done]] --[[Joey]]