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 e08e5ce58964de2438ed7df036500f91aded993c..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]].
 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]].


@@ -5,7 +7,10 @@ There are many other [[features]], including support for
 [[blogging|blog]] and [[podcasting|podcast]], as well as a large
 array of [[plugins]].
 
 [[blogging|blog]] and [[podcasting|podcast]], as well as a large
 array of [[plugins]].
 

-[[!template id=links]]
+Alternatively, think of ikiwiki as a particularly flexible static
+site generator with some dynamic features.
+
+

 
 ## using ikiwiki
 
 
 ## using ikiwiki
 


@@ -18,7 +23,7 @@ discussions.
 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
 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 ]]. [[portedeurope.org|http://www.portedeurope.org]]
+ikiwiki [[!version ]].

 
 ## developer resources
 
 
 ## developer resources
 


@@ -28,3 +33,5 @@ can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
 
 Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].

+
+