Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 07ce648eabdbcf3f864745f679037bde14d591d8..66f7ecb7381383ac9b326779682643501e8dcd0e 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -71,10 +71,14 @@ you would care to syndicate.
 ## Valid html and [[css]]
 
 Ikiwiki aims to produce 
-[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
-generates html using [[templates]], and uses [[css]], so you
+[valid XHTML 1.0](http://validator.w3.org/check?url=referer).
+(Experimental [[tips/HTML5]] support is also available.)
+
+Ikiwiki generates html using [[templates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
+Ikiwiki ships with several ready to use [[themes]].
+
 ## [[Plugins]]
 
 Plugins can be used to add additional features to ikiwiki. The interface is
@@ -146,7 +150,7 @@ authentication, or other methods implemented via plugins.
 
 Thanks to subpages, every page can easily and automatically have a
 /Discussion subpage. By default, these links are included in the
-[[templates]] for each page. If you prefer blog-syle
+[[templates]] for each page. If you prefer blog-style
 [[plugins/comments]], that is available too.
 
 ### Edit controls