X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/147921cdb83913ac82d78188a70820249d76a0af..691c0a1af914ff9b49aa11cd9432146073e268c1:/doc/index.mdwn?ds=sidebyside

diff --git a/doc/index.mdwn b/doc/index.mdwn
index e5f1530d2..93526c42c 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,34 +1,26 @@
-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
+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|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/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]]
+[[!template id=links]]
 
-Quick links:
-* [[News]]
-* [[Download]]
-* [[Setup]]
-* [[Usage]]
-* [[Security]]
-* [[IkiWikiUsers]]
-* [[Contact]]
-"""]]
+## using ikiwiki
 
-### users
-
-[[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents
-the parameters and usage of the ikiwiki program. There are some
-[[examples]] of things you can do with 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.
 
-## developers
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
+
+## developer resources
 
 The [[RoadMap]] describes where the project is going.
-[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches]]
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 can be submitted and tracked using this wiki.
 
 ikiwiki is developed by [[Joey]] and many contributors,