X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8e90d620f6c32e328d0e81dd7c2158c33ac3c3aa..8b7e15f1c03f75c262fa1c97315edbb2c4cc201a:/doc/index.mdwn?ds=sidebyside

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 4b0d331e2..9d1110772 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,37 +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 many
-wikis, ikiwiki does not have its own ad-hoc means of storing page history,
-and instead uses a revision control system such as [[Subversion]].
+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]]
 
-* Ikiwiki has a nice set of wiki [[features]] which can be expanded by
-  a large array of [[plugins]]. It also has some [[bugs]], a [[TODO]] list,
-  and a [[RoadMap]].
+## using ikiwiki
 
-[[template id=note text="""
-If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
-Thanks! --[[Joey]]
-"""]]
-
-* [[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.
-
-* Feel free to post your questions and thoughts about ikiwiki to [[Discussion]].
-
-* [[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.
-
-* Developers, please document any ikiwiki patches you have in the
-  [[PatchQueue]].
+[[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.
 
-ikiwiki is developed by [[Joey]] and is [[FreeSoftware]].
+## developer resources
 
+The [[RoadMap]] describes where the project is going.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
+can be submitted and tracked using this wiki.
 
-JUST A TEST
\ No newline at end of file
+ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].