Merge branch 'master' into pedigree

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 32dda57eb1ddedb514d23197fe80cfbfabe97d59..1a416d79888d00cc9bb15b7bf4f724142cef871b 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,8 +1,8 @@
 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|ikiwiki/blog]], as well as a large array of [[plugins]].

 
 [[template id=links]]
 
 
 [[template id=links]]
 


@@ -14,6 +14,9 @@ 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.