summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-02-22 17:25:53 -0400
committerJoey Hess <joey@kitenet.net>2011-02-22 17:25:53 -0400
commit9836bceaa520919530e4311582b4fee2fd5c4e36 (patch)
treeb033d7da5f09a356d696d5fdd6cc73c415e1bb25
parent72c8f01b36c841b0e83a2ad7ad1365b9116075c5 (diff)
bookeeping
-rw-r--r--debian/changelog1
-rw-r--r--doc/todo/feed_enhancements_for_inline_pages.mdwn2
2 files changed, 3 insertions, 0 deletions
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 <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 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