html too

[ikiwiki.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 30fe5987bb8cb3e53f19685ab64886cc00289dbc..9e9e9195d5d899b125716705dcfe9fa1de07e935 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -3,7 +3,9 @@ Some of ikiwiki's features:
 * [[Subversion]]
 
   Rather than implement its own system for storing page histories etc,
-  ikiwiki simply uses subversion. (It's also possible to [[plugins/write]] support for other systems.)
+  ikiwiki simply uses subversion. (It's also possible to [[plugins/write]]
+  support for other systems, and ikiwiki also includes support for [[Git]]
+  now.)
 
   Instead of editing pages in a stupid web form, you can use vim and commit
   changes via svn. Or work disconnected using svk and push your changes out
@@ -21,9 +23,14 @@ 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]] and 
+  provided by ikiwiki on top of regular markdown is the [[WikiLink]] and 
   [[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
+  [[plugins/WikiText]] formatted pages or pages written as pure
+  [[plugins/HTML]].
+
 * support for other file types
 
   ikiwiki also supports files of any other type, including plain text,
@@ -69,7 +76,7 @@ Some of ikiwiki's features:
 * [[PageHistory]]
 
   Well, sorta. Rather than implementing YA history browser, it can link to
-  [[ViewCVS]] or the link to browse the history of a wiki page.
+  [[ViewCVS]] or the like to browse the history of a wiki page.
 
 * [[RecentChanges]], editing pages in a web browser
 
@@ -117,7 +124,16 @@ Some of ikiwiki's features:
 
 * [[Plugins]]
 
-  Plugins can be used to add additional features to ikiwiki. The interface is quite flexible, allowing plugins to register [[PreProcessorDirective]]s, hook into [[CGI]] mode, and more. Ikiwiki's backend RCS support is also pluggable, so support for new revision control systems can be added to ikiwiki. 
+  Plugins can be used to add additional features to ikiwiki. The interface
+  is quite flexible, allowing plugins to implement additional markup
+  languages, register [[PreProcessorDirective]]s, hook into [[CGI]] mode,
+  and more. Ikiwiki's backend RCS support is also pluggable, so support for
+  new revision control systems can be added to ikiwiki. 
+
+* [[todo/utf8]]
+
+  After rather a lot of fiddling, we think that ikiwiki correctly and fully
+  supports utf8 everywhere.
 
 ----