X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/04a9dbfe7daa9c352ae4e9af17df8134248f3806..c36b2627e2bf2ecda3783a3e19cec8cbd81bb89d:/doc/index.mdwn?ds=inline

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 22709f88d..6a9851517 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,18 +1,17 @@
-[[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
+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 and [[plugins]] for information about its plugins. [[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]].
 
 [[template id=note text="""
+[[ikiwiki_logo|logo/ikiwiki.png]]  
+[[Version_2.0|news/ikiwiki_version_2.0]] is now available.  
 If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
 Thanks! --[[Joey]]
 """]]
@@ -21,13 +20,16 @@ Thanks! --[[Joey]]
   the parameters and usage of the ikiwiki program. There are some
   [[examples]] of things you can do with ikiwiki.
 
+* This wiki is used for tracking ikiwiki's [[TODO]] items, [[bugs]],
+  [[patches|patch]], and its general [[RoadMap]].
+
+* 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
   expect things to stay in this list for long.
 
-* Developers, please document any ikiwiki patches you have in the
-  [[PatchQueue]].
-
 All wikis are supposed to have a [[SandBox]], so this one does too.
 
 ikiwiki is developed by [[Joey]] and is [[FreeSoftware]].