Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn

diff --git a/doc/todo/integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn b/doc/todo/integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn
index 84372fc1d55eb2e15932fb8c44e37f8976be3155..16d33b0bbb2908284713fa3651acf0aba71d7278 100644 (file)
--- a/doc/todo/integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn
+++ b/doc/todo/integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn
@@ -3,9 +3,11 @@ allows the user to subscribe to the feed, using Live Bookmarks, Google Reader,
 Bloglines, My Yahoo!, or an external reader program.  The list of available
 applications comes from URIs and titles in the preferences, under
 `browser.contentHandlers.types.*`.  For the benefit of people who use
-[[plugin/aggregate]] as their feed reader, the ikiwiki CGI could expose a URI
+[[plugins/aggregate]] as their feed reader, the ikiwiki CGI could expose a URI
 to directly add a new feed to the aggregated list; this would allow users to
-configure their browser to subscribe to feeds via [[plugin/aggregate]] running
+configure their browser to subscribe to feeds via [[plugins/aggregate]] running
 on their site.  We could then provide the manual configuration settings as a
 [[tip|tips]], and perhaps provide an extension or other mechanism to set them
 automatically. --[[JoshTriplett]]
+
+[[wishlist]]