X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Findex.mdwn;h=1a416d79888d00cc9bb15b7bf4f724142cef871b;hb=bd4769fac49fed4f5f900e05a440ca2e06403c55;hp=528064dc35a877dfc0668bedf4f7029edb6f4187;hpb=31936ad199ddd9fc371f0ee22788ab733ac5fd2e;p=ikiwiki.git

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 528064dc3..1a416d798 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,31 +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
-[[blogging|blog]], as well as a large array of [[plugins]].
-[[template id=note text="""
-[[ikiwiki_logo|logo/ikiwiki.png]]  
-Quick links:  
-[[News]]  
-[[Download]]  
-[[Setup]]  
-[[Usage]]  
-[[Security]]  
-[[IkiWikiUsers]]  
-[[Contact]]  
-"""]]
-### using ikiwiki
-
-[[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, and some [[tips]].
+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|ikiwiki/blog]], as well as a large array of [[plugins]].
+
+[[template id=links]]
+
+## 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
+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,