Merge remote-tracking branch 'smcv/ready/trail'

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 29d82463d83e92c4078b896fd641a5988a00f622..4c22ce0e0997977ebc168a0b3e8a2856e0d69ac8 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,34 +1,29 @@
-Ikiwiki is a **wiki compiler**. It converts wiki pages
-into HTML pages suitable for publishing on a website. Ikiwiki stores
-pages and hostory in a revision control system such as [[Subversion]]
-or [[Git]]. There are many other [[features]], including support for
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages and history in a
+[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
+There are many other [[features]], including support for

 [[blogging|blog]], as well as a large array of [[plugins]].
 
 [[blogging|blog]], as well as a large array of [[plugins]].
 

-[[template id=note text="""
-[[ikiwiki_logo|logo/ikiwiki.png]]  
-Quick links:  
-[[News]]  
-[[Download]]  
-[[Setup]]  
-[[Usage]]  
-[[Security]]  
-[[IkiWikiUsers]]  
-[[Contact]]  
-"""]]
+[[!template id=links]]

 
 

-### using ikiwiki
+## using ikiwiki

 
 

-[[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, and some [[tips]].
+[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
+[[man_page|usage]]. There are some [[examples]] of things you can do
+with ikiwiki, and some [[tips]].  Basic documentation for ikiwiki plugins
+and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
+discussions.

 
 

-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.

 
 

-### developer resources
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
+
+## developer resources

 
 The [[RoadMap]] describes where the project is going.
 
 The [[RoadMap]] describes where the project is going.

-[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches]]
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]

 can be submitted and tracked using this wiki.
 
 can be submitted and tracked using this wiki.
 

-ikiwiki is developed by [[Joey]] and many contributors,
+Ikiwiki is developed by [[Joey]] and many contributors,

 and is [[FreeSoftware]].
 and is [[FreeSoftware]].