X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/20020cc9daa059173f12331babe9eb76f47c72be..aebcbca4d620183d273736953da21ef05eb45e5c:/doc/index.mdwn?ds=sidebyside

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 418971caf..8f3911bd9 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,20 +1,31 @@
-ikiwiki is a wiki compiler. It converts a directory full of wiki pages
+[[ikiwiki_logo|logo/ikiwiki.png]]  
+ikiwiki is a **wiki compiler**. It converts wiki pages
 into html pages suitable for publishing on a website. Unlike a traditional
-wiki, ikiwiki does not have its own means of storing page history or its own
-markup language. Instead it uses [[Subversion]] and [[MarkDown]].
+wiki, ikiwiki does not have its own means of storing page history.
+Instead it can use [[Subversion]] (or [[Git]]).
 
-* See [[Features]] for a current list of ikiwiki's features. 
+* [[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]].
 
-* [[WhyIkiWiki]] might be useful if you're considering using this.
+* See [[Features]] for a list of ikiwiki's features. [[RoadMap]], [[TODO]]
+  and [[bugs]] might also be of interest. Feel free to post your questions
+  and thoughts about ikiwiki to [[Discussion]].
 
-* [[Setup]] has a tutorial for setting up ikiwki.
+[[template id=note text="""
+If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
+Thanks! --[[Joey]]
+"""]]
 
-* [[TODO]] and bugs lists things that need to be added to ikiwiki before most people would consider it a full-fledged wiki.
+* [[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents
+  the parameters and usage of the ikiwiki program.
 
-* [[Security]] lists potential security problems. ikiwiki is still being developed, and is being written with security as a priority, don't expect things to stay in this list for long.
+* [[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.
 
-Ikiwiki is _not_ yet formally realeased. If you really have to have it: svn://svn.kitenet.net/ikiwiki/trunk
+* Developers, please document any ikiwiki patches you have in the
+  [[PatchQueue]].
 
-All wikis are supposed to have a [[SandBox]], so this one does to.
+All wikis are supposed to have a [[SandBox]], so this one does too.
 
-ikiwiki is developed by [[Joey]].
+ikiwiki is developed by [[Joey]] and is [[FreeSoftware]].