web commit by joey

[ikiwiki.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index d67555a639a7aaf456f27a24ecffef153c0bbbb0..f63122edfa49726d5f5e2168c888efdabc7164b2 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -23,7 +23,8 @@ Some of ikiwiki's features:
   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 aside from regular markdown is the [[WikiLink]].
+  provided by ikiwiki aside from regular markdown is the [[WikiLink]] and 
+  [[PreprocessorDirective]]
 
 * support for other file types
 
@@ -60,7 +61,8 @@ Some of ikiwiki's features:
 
 * [[BackLinks]]
 
-  Automatically included on pages. Rather faster than eg [[MoinMoin]] and always there to help with navigation.
+  Automatically included on pages. Rather faster than eg MoinMoin and
+  always there to help with navigation.
 
 * [[PageHistory]]
 
@@ -97,6 +99,9 @@ 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.
@@ -108,8 +113,12 @@ Some of ikiwiki's features:
 
 * Commit mails
 
-  ikiwiki can be configured to send you commits mails with diffs of changes
-  of selected pages.
+  ikiwiki can be configured to send you commit mails with diffs of changes
+  to selected pages.
+
+* [[Plugins]]
+
+  A plugin system allows extending ikiwiki in arbitrary ways.
 
 ----