X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/042a81cde78df8b5c445739a27d7b1e870fa94e4..5c416cea475025494459fc741d8533afcb91f2a6:/doc/features.mdwn?ds=sidebyside

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 0dbdba5df..4dee6c2d8 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -64,9 +64,11 @@ Ikiwiki can also [[plugins/aggregate]] external blogs, feeding them into
 the wiki. This can be used to create a Planet type site that aggregates
 interesting feeds.
 
-You can also mix blogging with podcasting by dropping audio files where
-they will be picked up like blog posts. This will work for any files that
-you would care to syndicate.
+You can also mix blogging with [[podcasting|podcast]]. Simply drop
+media files where they will be picked up like blog posts. For
+fuller-featured podcast feeds, enclose media files in blog posts
+using [[plugins/meta]]. Either way, this will work for any files
+that you would care to syndicate.
 
 ## Valid html and [[css]]
 
@@ -131,7 +133,7 @@ page being concurrently edited, regular commit conflict markers are
 shown in the file to resolve the conflict, so if you're already familiar
 with that there's no new commit marker syntax to learn.
 
-### [[RecentChanges]], editing pages in a web browser
+### [[Json.tl.ph]], editing pages in a web browser
 
 Nearly the definition of a wiki, although perhaps ikiwiki challenges how
 much of that web gunk a wiki really needs. These features are optional
@@ -150,7 +152,7 @@ authentication, or other methods implemented via plugins.
 
 Thanks to subpages, every page can easily and automatically have a
 /Discussion subpage. By default, these links are included in the
-[[templates]] for each page. If you prefer blog-syle
+[[templates]] for each page. If you prefer blog-style
 [[plugins/comments]], that is available too.
 
 ### Edit controls