merge smcv/ready/urlto

[ikiwiki.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index ab521213df223cdcfc400bcc6004bcd2d94b9146..0dbdba5df1fe37e79c7311ab74dc9194d7dc2810 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 html and [[css]]
 
 Ikiwiki aims to produce 

-[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
-generates html using [[templates|wikitemplates]], 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.
 
 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
 ## [[Plugins]]
 
 Plugins can be used to add additional features to ikiwiki. The interface is