X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/20feea7e08f8c129e606e1bb19561fb3267fcdc1..d877b9644bcfbbfc5eaf3f7fc13cb96ecda946c9:/doc/index.mdwn?ds=sidebyside

diff --git a/doc/index.mdwn b/doc/index.mdwn
index ed41e6f75..06acc9cec 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.
+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]].
-[9lover](http://www.9lover.com)
\ No newline at end of file
+Ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].