web commit from 196.40.10.246: poll vote (It's fast enough)

[git.ikiwiki.info.git] / doc / index.mdwn

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 23e60c00bb5b7e671fb2569ff5cc15c0ee57bf32..357081fa4c44c1d140df671106b5da95e6df60eb 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,18 +1,35 @@
-[[ikiwiki_logo|logo/ikiwiki.png]]  

 ikiwiki is a **wiki compiler**. It converts wiki pages
 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.
-Instead it can use [[Subversion]] (or [[Git]]).
+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]].

 
 

-* [[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]].
+* 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.00]] is now available.  
+If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
+Thanks! --[[Joey]]
+"""]]

 
 

-* See [[Features]] for a list of ikiwiki's features. [[RoadMap]], [[TODO]] and [[bugs]] might also be of interest. Feel free to post your thoughts about ikiwiki to [[Discussion]].
+* [[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.

 
 

-* [[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents the parameters and usage of the ikiwiki program. If you use ikiwiki, please add your wiki to [[IkiWikiUsers]].
+* 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.
+* [[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]].
+* Developers, please document any ikiwiki patches you have in the
+  [[PatchQueue]].

 
 All wikis are supposed to have a [[SandBox]], so this one does too.
 
 
 All wikis are supposed to have a [[SandBox]], so this one does too.