X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c77e9a9b3cd4d6323f57923743d7acacca24aa1d..efe91335c65b96f3eb8b32d8c58c9cce68db47b4:/doc/features.mdwn?ds=sidebyside diff --git a/doc/features.mdwn b/doc/features.mdwn index 5044147a4..eaf0d539f 100644 --- 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 @@ -52,10 +52,12 @@ Currently implemented: 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]] @@ -88,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