web commit by joey

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index c568213bf3093d31c31ea027e94fcff1527f8a74..5eafcbfbdbe61f34990f0082498f9840250b4071 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -22,7 +22,7 @@ run a simple wiki without page history, it can do that too.
 
 ## A wiki compiler
 
 
 ## A wiki compiler
 

-ikiwiki is a wiki compiler; it builds static website for your wiki, and
+ikiwiki is a wiki compiler; it builds a static website for your wiki, and

 updates it as pages are edited. It 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)
 updates it as pages are edited. It 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)


@@ -50,7 +50,7 @@ program, or other special file and link to it from your wiki pages.
 
 You can turn any page in the wiki into a [[blog]]. Pages matching a
 specified [[PageSpec]] will be displayed as a weblog within the blog
 
 You can turn any page in the wiki into a [[blog]]. Pages matching a
 specified [[PageSpec]] will be displayed as a weblog within the blog

-page. And an RSS feed can be generated to follow the blog.
+page. And RSS or Atom feeds can be generated to follow the blog.

 
 Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples
 of some of the flexible ways that this can be used.
 
 Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples
 of some of the flexible ways that this can be used.


@@ -59,11 +59,11 @@ Ikiwiki can also [[plugins/aggregate]] external blogs, feeding them into
 the wiki. This can be used to create a Planet type site that aggregates
 interesting feeds.
 
 the wiki. This can be used to create a Planet type site that aggregates
 interesting feeds.
 

-## Valid html and css
+## Valid html and [[css]]

 
 ikiwiki aims to produce 
 [valid XHTML 1.0](http://validator.w3.org/check?url=referer).
 
 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 
+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.
 
 ## [[Plugins]]
 change the look and layout of all pages in any way you would like.
 
 ## [[Plugins]]


@@ -90,7 +90,7 @@ incomplete list of some of them.
 
 You can tag pages and use these tags in various ways. Tags will show
 up in the ways you'd expect, like at the bottom of pages, in blogs, and
 
 You can tag pages and use these tags in various ways. Tags will show
 up in the ways you'd expect, like at the bottom of pages, in blogs, and

-in rss feeds.
+in RSS and Atom feeds.

 
 ### [[SubPages|SubPage]]
 
 
 ### [[SubPages|SubPage]]