merge change from doc to basewiki

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index c79aa8f8a62e579e7059fd13226c27a213b83dd7..22709f88d436635903a6ce80f5efab2b4113cfe6 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,22 +1,25 @@
 [[ikiwiki_logo|logo/ikiwiki.png]]  
 ikiwiki is a **wiki compiler**. It converts 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.
-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]].
 

-* 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]].
+* 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. 

 
 

-[[template type=note text="""
-If you use ikiwiki, please list your wiki in [[IkiWikiUsers]]. Thanks!
+* Feel free to post your questions and thoughts about ikiwiki to [[Discussion]].
+
+[[template id=note text="""
+If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
+Thanks! --[[Joey]]

 """]]
 
 * [[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents
 """]]
 
 * [[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.

 
 * [[Security]] lists potential security problems. ikiwiki is still being
   developed, and is being written with security as a priority, so don't
 
 * [[Security]] lists potential security problems. ikiwiki is still being
   developed, and is being written with security as a priority, so don't