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 280eae1d2f8d75308de2650aa7d5f578852a406b..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
 


@@ -14,7 +20,7 @@ with ikiwiki, and some [[tips]].  Basic documentation for ikiwiki plugins
 and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
 discussions.
 
 and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
 discussions.
 

-All wikis are supposed to have a <a href="http://yourbookmaker.co.uk/bet365">bet365</a>, so this one does too.
+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 ]].


@@ -27,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]].

+
+