Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 18018b22308fd1234522c16ecdf2f5a627181b8f..93526c42ce5ced330645b4096e81185c025ba063 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,36 +1,26 @@
-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]]
+[[!template id=links]]

 
 

-Quick links:
+## using ikiwiki

 
 

-* [[News]]
-* [[Download]]
-* [[Setup]]
-* [[Usage]]
-* [[Security]]
-* [[IkiWikiUsers]]
-* [[Contact]]
-
-"""]]
-
-### users
-
-[[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]].

 
 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.
 

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