X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a96240d744d0f229100d16ff3e7c25e60f86f15b..d0295d9dc0827cc272f93f20bae2eff783a8fabe:/doc/features.mdwn?ds=sidebyside diff --git a/doc/features.mdwn b/doc/features.mdwn index bc258d33f..92773f3c9 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -26,7 +26,7 @@ Some of ikiwiki's features: by ikiwiki. Markdown understands text formatted as it would be in an email, and is quite smart about converting it to html. The only additional markup provided by ikiwiki on top of regular markdown is the [[WikiLink]] and - [[PreprocessorDirective]] + [[PreprocessorDirective]]. If you prefer to use some other markup language, ikiwiki allows others to easily be added by [[plugins]]. For example it also supports traditional @@ -55,7 +55,7 @@ Some of ikiwiki's features: Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples of some of the flexible ways that this can be used. - Ikiwiki can also [[plugin/aggregate]] external blogs, feeding them into + 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.