X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Findex.mdwn;h=732cf7a894f96166239ef016dcfc1d36610ea5b1;hb=b1c9ca545bd58a8db665e06c5867ede2fe94e32a;hp=c401d5f17ec3c7b8466a7be4eaf8b01c4cda6d99;hpb=ddfab39be3bb7f777e85bc07e9dfffa2a0b77f0f;p=ikiwiki.git

diff --git a/doc/index.mdwn b/doc/index.mdwn
index c401d5f17..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,33 +1,28 @@
-[[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|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]].
 
-* [[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 and [[plugins]] for information about its plugins. [[RoadMap]], [[TODO]]
-  and [[bugs]] might also be of interest. 
+## using ikiwiki
 
-* Feel free to post your questions and thoughts about ikiwiki to [[Discussion]].
+[[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]].
 
-[[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.
+All wikis are supposed to have a [[SandBox]], so this one does too.
 
-* [[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.
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
 
-* 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.
+The [[forum]] is open for discussions.
+[[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]].