Merge commit 'upstream/master'

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index b69e71580cccc3183d9b24a7334d934379144496..93526c42ce5ced330645b4096e81185c025ba063 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,28 +1,23 @@
-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 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]]  
-[[News]]  
-[[Download]]  
-[[Setup]]  
-[[Security]]  
-[[Users|IkiWikiUsers]]  
-[[Contact]]  
-"""]]
+[[!template id=links]]

 
 

-### using ikiwiki
+## 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
 
 [[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]].
+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
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
+
+## developer resources

 
 The [[RoadMap]] describes where the project is going.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 
 The [[RoadMap]] describes where the project is going.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]