bookeeping

diff --git a/debian/changelog b/debian/changelog
index 58297147068b9f2c8db2db90dea6d4adecaa96b2..72bd5f8c64661daaf6ee392f9d6bc5884b201f8f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ ikiwiki (3.20110125) UNRELEASED; urgency=low
     (Giuseppe Bilotta)
   * Fix broken baseurl in cgi mode when usedirs is disabled. Bug introduced
     in 3.20101231.
+  * inline: Fix link to nested inlined pages's feeds. (Giuseppe Bilotta)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 01 Feb 2011 21:00:57 -0400
 

diff --git a/doc/todo/feed_enhancements_for_inline_pages.mdwn b/doc/todo/feed_enhancements_for_inline_pages.mdwn
index fde5ac01f1a5b4ff9052bbbd2d0999fdb4b21eed..02b4e9d364b64cd28d1364407535b76ec9938efc 100644 (file)
--- a/doc/todo/feed_enhancements_for_inline_pages.mdwn
+++ b/doc/todo/feed_enhancements_for_inline_pages.mdwn
@@ -26,6 +26,8 @@ name’. As explained in the commit message for the patch itself, this is
 a ‘forgotten part’ from a previous page vs destpage fix which has
 already been included upstream.
 
+> Applied. --[[Joey]] 
+
 The second patch, ‘inline: improve feed title and description
 management’, aligns feed title and description management by introducing
 a `title` option to complement `description`, and by basing the