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 51c99742e67b8db415ab1391e4fd5290fc481ef6..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]].
@@ -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]].
 
-[[!template id=links]]
+Alternatively, think of ikiwiki as a particularly flexible static
+site generator with some dynamic features.
+
+
 
 ## using ikiwiki
 
@@ -13,7 +18,7 @@ array of [[plugins]].
 [[man_page|usage]]. There are some [[examples]] of things you can do
 with ikiwiki, and some [[tips]].  Basic documentation for ikiwiki plugins
 and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
-discussions. 
+discussions.
 
 All wikis are supposed to have a [[sandbox]], so this one does too.
 
@@ -24,8 +29,9 @@ ikiwiki [[!version ]].
 
 The [[RoadMap]] describes where the project is going.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
-can be submitted and tracked using this wiki.  [Übersetzung Deutsch Englisch](http://www.profi-fachuebersetzungen.com)
+can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].  [Übersetzung Englisch Deutsch](http://www.portedeurope.org)
+and is [[FreeSoftware]].
+