Implemented --underlaydir, and moved files provided by underlay out of doc

[ikiwiki.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 95e3bcfc7c98bd78e9a4a3bd067800c580f48f94..eaf0d539fb5588189975bb93dcc5d074ba625511 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -36,7 +36,7 @@ Currently implemented:
 
 * [[SubPage]]s
 
-  Arbitrarily deep hierarchies of pages with fairly simple and useful [[SubPage/LinkingRUles]]
+  Arbitrarily deep hierarchies of pages with fairly simple and useful [[SubPage/LinkingRules]]
 
 * [[blog]]s
 
@@ -44,16 +44,20 @@ Currently implemented:
   matching a specified [[GlobList]] will be displayed as a weblog within
   the blog page. And an RSS feed can be generated to follow the blog.
 
+  Ikiwikit's own [[TODO]] and [[news]] pages are good examples of some of the flexible ways that this can be used.
+
 * Fast compiler
 
   ikiwiki is fast and smart about updating a wiki, it only builds pages
   that have changed (and tracks things like creation of new pages and links
   that can indirectly cause a page to need a rebuild)
 
-* [[Templates]]
+* valid html and css
 
-  ikiwiki generates html using templates so you can change the look and 
-  layout of all pages in any way you would like.
+  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 can 
+  change the look and layout of all pages in any way you would like.
 
 * [[BackLinks]]
 
@@ -86,7 +90,7 @@ Currently implemented:
   Since it uses subversion, ikiwiki takes advantage of its smart merging to
   avoid any conflicts when two people edit different parts of the same page
   at the same time. No annoying warnings about other editors, or locking,
-  etc, instead the other person's changes will be automaticaly merged with
+  etc, instead the other person's changes will be automatically merged with
   yours when you commit.
 
   In the rare cases where automatic merging fails due to the same part of a
@@ -96,7 +100,7 @@ Currently implemented:
 
 * page locking
 
-  Wiki admin can [[lock]] pages so that only other admins can edit them.
+  Wiki admins can lock pages so that only other admins can edit them.
 
 ----