Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn
index 733d69db0564b672979b27d351d2825053936cd9..01910a97cbebbe428dfef8c9f9b481025f363ccb 100644 (file)
--- a/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn
+++ b/doc/todo/rewrite_ikiwiki_in_haskell/discussion.mdwn
@@ -49,3 +49,7 @@ href="http://jaspervdj.be/hakyll">Hakyll</a>?
 > that are wiki compilers. Since we know from experience that dealing
 > with static compilation turns out to be one of the trickiest parts of
 > ikiwiki, I'm doubtful about trying to bolt that into one. --[[Joey]] 
+
+>> Haykll isn't a wiki but it does do static compilation. The missing
+>> parts are: the web interface, the wiki link processing, and page
+>> dependency stuff. -- [[tychoish]]