Merge commit 'upstream/master'

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index bfbe4672459eaa8400a74856bff18b3e93e668f5..93526c42ce5ced330645b4096e81185c025ba063 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -2,9 +2,9 @@ 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|ikiwiki/blog]], as well as a large array of [[plugins]].
+[[blogging|blog]], as well as a large array of [[plugins]].
 
-[[template id=links]]
+[[!template id=links]]
 
 ## using ikiwiki
 
@@ -14,7 +14,8 @@ with ikiwiki, and some [[tips]].
 
 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 ]].
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
 
 ## developer resources