Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 336f625358b0b53a71be86d21d2a9cb0ace78f1d..e0e40165673a71f5d906a349157e4d7426d6f489 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,3 +1,5 @@
+[[!template id=links]]
+
 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]].
@@ -8,7 +10,7 @@ array of [[plugins]].
 Alternatively, think of ikiwiki as a particularly flexible static
 site generator with some dynamic features.
 
-[[!template id=links]]
+
 
 ## using ikiwiki
 
@@ -30,4 +32,6 @@ The [[RoadMap]] describes where the project is going.
 can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]]. asdf
+and is [[FreeSoftware]].
+
+