Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 1d762bed4d95a9b15d8e950ec1330455ded61909..e9be02be446a42851fc5aabc46441d72ecfba561 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -1,5 +1,5 @@
 An overview of some of ikiwiki's features:
-[[toc ]]
+[[!toc ]]
 
 ## Uses a real RCS
 
@@ -32,7 +32,7 @@ Any page with a filename ending in ".mdwn" is converted from markdown to html
 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 [[ikiwiki/WikiLink]] and 
-[[ikiwiki/PreprocessorDirective]].
+the [[ikiwiki/directive]].
 
 If you prefer to use some other markup language, ikiwiki allows others to
 easily be added by [[plugins]]. For example it also supports traditional
@@ -47,7 +47,7 @@ program, or other special file and link to it from your wiki pages.
 
 ## Blogging
 
-You can turn any page in the wiki into a [[ikiwiki/blog]]. Pages matching a
+You can turn any page in the wiki into a [[blog]]. Pages matching a
 specified [[ikiwiki/PageSpec]] will be displayed as a weblog within the blog
 page. And RSS or Atom feeds can be generated to follow the blog.
 
@@ -74,7 +74,7 @@ can change the look and layout of all pages in any way you would like.
 
 Plugins can be used to add additional features to ikiwiki. The interface
 is quite flexible, allowing plugins to implement additional markup
-languages, register [[ikiwiki/PreProcessorDirective]]s, hook into [[CGI]] mode,
+languages, register [[directives|ikiwiki/directive]], hook into [[CGI]] mode,
 and more. Most of ikiwiki's features are actually provided by plugins.
 Ikiwiki's backend RCS support is also pluggable, so support for new
 revision control systems can be added to ikiwiki.
@@ -158,8 +158,8 @@ Well, sorta. Rather than implementing YA history browser, it can link to
 
 ### Full text search
 
-ikiwiki can use the [[HyperEstraier]] search engine to add powerful
-full text search capabilities to your wiki.
+ikiwiki can use the xapian search engine to add powerful
+full text [[plugins/search]] capabilities to your wiki.
 
 ### [[w3mmode]]