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 0aab7b9e6922cf520c01744094fae5fca8108498..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
@@ -20,9 +20,10 @@ could perhaps change it to `/sandbox-comments.atom` or
 --[[smcv]]
 
 > This is slightly hard to do, because you have to worry about 
-> conflicting pages setting feedname, which would cause ikiwiki to blow up.
+> conflicting pages setting feedname, which could cause ikiwiki to blow up.
 > 
 > Particularly for the non-usedirs case, where a page `sandbox/comments`
-> would produce the same feed as sandbox with `feedname=comments` .
-> I don't think there's a solution in the non-usedirs case, so maybe this
-> option would need to only work for usedirs. --[[Joey]]
+> would produce the same feed as sandbox with `feedname=comments`.
+> --[[Joey]]
+
+> [[done]] as feedfile option --[[Joey]]