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

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 22709f88d436635903a6ce80f5efab2b4113cfe6..e5fbd70d4a34ba753c44c05c9df93981f5fc662a 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,18 +1,18 @@
-[[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 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]].
 
 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]]. It also has some [[bugs]], a [[TODO]] list,
+  and a [[RoadMap]].

 
 [[template id=note text="""
 
 [[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]]
 """]]
 If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
 Thanks! --[[Joey]]
 """]]


@@ -21,6 +21,9 @@ Thanks! --[[Joey]]
   the parameters and usage of the ikiwiki program. There are some
   [[examples]] of things you can do with ikiwiki.
 
   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
   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.