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 2109a4d328ead9875e7f1e178587460a6b53fa97..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
-[[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
 
@@ -29,23 +35,3 @@ Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
 
 
-Source :
-[[http://yawan.blogdetik.com/ blogdetik]]
-[[http://lucubanget.inilahkita.com/ lucubanget]]
-[[http://deyong.dagdigdug.com/ dagdigdug]]
-[[http://id4download.blog.com/ downloadblog]]
-[[http://kanduyung.wordpress.com/ wordpress]]
-[[dai lama tooz]]
-[[http://katamutiarabijak.netai.net/ netai]]
-[[http://bentor.pressku.com/ pressyou]]
-[[http://infonews.site90.net/ infonews]]
-[[http://mutiarabijak.wordpress.com/ mutiarabijak]]
-[[http://lucubro.blogspot.com/ blogspot]]
-[[part off]]
-[[http://deyong.abatasa.com/ abatasa]]
-[[http://kandu.webnode.com/ webnode]]
-[[http://wockee.weebly.com/index.html wockee]]
-[[http://deyong.posterous.com/ posterous]]
-[[http://deyongbp.bravejournal.com/index.php bravenet]]
-[[http://kandu.webs.com/ websin]]
-[[http://deyong.livejournal.com/ uberjournal]]