web commit by hb: new version 2.1 on the front

[ikiwiki.git] / doc / index.mdwn

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 83e1a0b23a5ee1c64571a5eeda287aca76efd615..9fc0ddecc26e83390cafa85317afade06c7706d5 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,23 +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 means of storing page history,
+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]].
 
 * [[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]].
 
-* 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]].
+* 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]].
 
 [[template id=note text="""
+[[ikiwiki_logo|logo/ikiwiki.png]]  
+[[news/Version_2.1]] is now available.  
 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.
+  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]], or [[contact]] the developers.
 
 * [[Security]] lists potential security problems. ikiwiki is still being
   developed, and is being written with security as a priority, so don't