X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f4ca9ee2f8a912a9753a87da273e18ba1e983cc0..056002c2e1df510efc50d133efce7a41fdfa6e6a:/doc/features.mdwn diff --git a/doc/features.mdwn b/doc/features.mdwn index f0533c537..b58392fd5 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -41,7 +41,7 @@ Some of ikiwiki's features: matching a specified [[GlobList]] will be displayed as a weblog within the blog page. And an RSS feed can be generated to follow the blog. - Ikiwikit's own [[TODO]] and [[news]] pages are good examples of some of + Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples of some of the flexible ways that this can be used. * Fast compiler @@ -97,9 +97,6 @@ Some of ikiwiki's features: 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. - For all the gory details of how ikiwiki handles this behind the scenes, - see [[commit-internals]]. - * page locking Wiki admins can lock pages so that only other admins can edit them.