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 254f51a700e3144fab87f6cafd773fcbc98d4536..e0e40165673a71f5d906a349157e4d7426d6f489 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,10 +1,16 @@
+[[!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]].
 There are many other [[features]], including support for
 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]].
+[[blogging|blog]] and [[podcasting|podcast]], as well as a large
+array of [[plugins]].
+
+Alternatively, think of ikiwiki as a particularly flexible static
+site generator with some dynamic features.
+

 
 

-[[!template id=links]]

 
 ## using ikiwiki
 
 
 ## using ikiwiki
 


@@ -29,4 +35,3 @@ Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
 
 
 and is [[FreeSoftware]].
 
 

-[[!img College_of_New_Brunswick.jpg align="right" size="" alt=""]]