Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / inline_plugin:_ability_to_override_feed_name.mdwn

diff --git a/doc/todo/inline_plugin:_ability_to_override_feed_name.mdwn b/doc/todo/inline_plugin:_ability_to_override_feed_name.mdwn
index 41bae45fab524a80b1b29705f32a9ef61767664e..df5bf91947b0c0705bc74481c0b7ae8de13fcff8 100644 (file)
--- a/doc/todo/inline_plugin:_ability_to_override_feed_name.mdwn
+++ b/doc/todo/inline_plugin:_ability_to_override_feed_name.mdwn
@@ -24,7 +24,6 @@ could perhaps change it to `/sandbox-comments.atom` or
 > 
 > Particularly for the non-usedirs case, where a page `sandbox/comments`
 > would produce the same feed as sandbox with `feedname=comments`.
-> 
-> Hmm, looking some more, since inline tracks `%knownfeeds` and uniquifys
-> the names on conflicts, you'd just end up with `sandbox/comments.atom2`
-> if there were a conflict -- acceptable. --[[Joey]]
+> --[[Joey]]
+
+> [[done]] as feedfile option --[[Joey]]