X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/40057f507dc4efc9073f1e34b1e1047573d66609..06bd93a165603557bdd8610a0031468875d01841:/doc/index.mdwn

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 23e60c00b..9d1110772 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,19 +1,24 @@
-[[ikiwiki_logo|logo/ikiwiki.png]]  
-ikiwiki is a **wiki compiler**. It converts wiki pages
-into html pages suitable for publishing on a website. Unlike a traditional
-wiki, ikiwiki does not have its own means of storing page history.
-Instead it can use [[Subversion]] (or [[Git]]).
+Ikiwiki is a **wiki compiler**. It converts wiki pages
+into HTML pages suitable for publishing on a website. Ikiwiki stores
+pages and history in a revision control system such as [[Subversion]]
+or [[Git]]. There are many other [[features]], including support for
+[[blogging|blog]], as well as a large array of [[plugins]].
 
-* [[News]] is a blog (built using ikiwiki) of news items about ikiwiki. It's the best way to find out when there's a new version to [[Download]].
+[[template id=links]]
 
-* See [[Features]] for a list of ikiwiki's features. [[RoadMap]], [[TODO]] and [[bugs]] might also be of interest. Feel free to post your thoughts about ikiwiki to [[Discussion]].
+## using ikiwiki
 
-* [[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents the parameters and usage of the ikiwiki program. If you use ikiwiki, please add your wiki to [[IkiWikiUsers]].
+[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
+[[man_page|usage]]. There are some [[examples]] of things you can do
+ with ikiwiki, and some [[tips]].
 
-* [[Security]] lists potential security problems. ikiwiki is still being developed, and is being written with security as a priority, so don't expect things to stay in this list for long.
+All wikis are supposed to have a [[SandBox]], so this one does too.
 
-* Developers, please document any ikiwiki patches you have in the [[PatchQueue]].
+## developer resources
 
-All wikis are supposed to have a [[SandBox]], so this one does too.
+The [[RoadMap]] describes where the project is going.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
+can be submitted and tracked using this wiki.
 
-ikiwiki is developed by [[Joey]] and is [[FreeSoftware]].
+ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].