X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3065ec79ad7e90c3febd686ce372f1045f88b098..6a7bd65b9b2f58f636204d49e9cc08ca2683c69b:/doc/index.mdwn?ds=sidebyside

diff --git a/doc/index.mdwn b/doc/index.mdwn
index a60cdf76a..fc8ef769d 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,20 +1,33 @@
-ikiwiki is a wiki compiler. It converts a directory full of 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 or its own
-markup language. Instead it uses [[Subversion]] and [[MarkDown]].
-
-* See [[Features]] for a current list of ikiwiki's features. 
-
-* [[WhyIkiWiki]] might be useful if you're considering using this.
-
-* [[Setup]] has a tutorial for setting up ikiwki.
-
-* [[TODO]] and [[bugs]] lists things that need to be added to ikiwiki before most people would consider it a full-fledged wiki.
-
-* [[Security]] lists potential security problems. ikiwiki is still being developed, and is being written with security as a priority, don't expect things to stay in this list for long.
-
-Ikiwiki is _not_ yet formally realeased. If you really have to have it: svn://svn.kitenet.net/ikiwiki/trunk
-
-All wikis are supposed to have a [[SandBox]], so this one does to.
-
-ikiwiki is developed by [[Joey]].
+Ikiwiki is a **wiki compiler**. It converts wiki pages
+into HTML pages suitable for publishing on a website. Ikiwiki stores
+pages and hostory 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]].
+
+[[template id=note text="""
+[[ikiwiki_logo|logo/ikiwiki.png]]  
+[[News]]  
+[[Download]]  
+[[Setup]]  
+[[Usage]]  
+[[Security]]  
+[[Users|IkiWikiUsers]]  
+[[Contact]]  
+"""]]
+
+### using ikiwiki
+
+[[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]].
+
+All wikis are supposed to have a [[SandBox]], so this one does too.
+
+### developer resources
+
+The [[RoadMap]] describes where the project is going.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches]]
+can be submitted and tracked using this wiki.
+
+ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].