From 9836bceaa520919530e4311582b4fee2fd5c4e36 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 22 Feb 2011 17:25:53 -0400 Subject: bookeeping --- debian/changelog | 1 + doc/todo/feed_enhancements_for_inline_pages.mdwn | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 582971470..72bd5f8c6 100644 --- 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 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 fde5ac01f..02b4e9d36 100644 --- 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 -- cgit v1.2.3