Merge commit 'upstream/master'

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 02992572293cc0b6f48b70f05dbd9fcb96b6587f..93526c42ce5ced330645b4096e81185c025ba063 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,19 +1,22 @@
 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]].
 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]].
+There are many other [[features]], including support for
+[[blogging|blog]], as well as a large array of [[plugins]].

 
 

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

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

 ## developer resources
 
 The [[RoadMap]] describes where the project is going.
 ## developer resources
 
 The [[RoadMap]] describes where the project is going.