Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index f38ba6615919278ee351d2009c431a07bb964f04..32dda57eb1ddedb514d23197fe80cfbfabe97d59 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,31 +1,23 @@
-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
-[[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]]  
-"""]]
-### using ikiwiki
+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]].

 
 

-[[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]].
+[[template id=links]]
+
+## using ikiwiki
+
+[[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]].

 
 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
+## 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.
 
 ikiwiki is developed by [[Joey]] and many contributors,
 can be submitted and tracked using this wiki.
 
 ikiwiki is developed by [[Joey]] and many contributors,