Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / users / Simon_Michael.mdwn

diff --git a/doc/users/Simon_Michael.mdwn b/doc/users/Simon_Michael.mdwn
index 3fe11aaad5c497d12847f40c32699ed2a0987e32..d18a4044739860df9e9fd232b83af675edebd9d1 100644 (file)
--- a/doc/users/Simon_Michael.mdwn
+++ b/doc/users/Simon_Michael.mdwn
@@ -1,8 +1,4 @@
-Simon Michael (<simon@joyful.com>, sm on freenode) is a free software developer and consultant. 
-His site is at <http://joyful.com>. 
-He is the lead developer of the [Zwiki](http://zwiki.org) zope-based wiki engine, and also an ikiwiki fan. 
+I'm Simon Michael (<simon@joyful.com>, sm on freenode, <http://joyful.com>), a free software developer and consultant. 

 
 

-Favourite ikiwiki features: efficient/robust static html and rcs integration. 
-Least favourite ikiwiki features: unstable hierarchical urls and setup complexity.
-He is [interested](http://ikiwiki.info/rcs/details/#index3h2) in getting a 
-robust [darcs](http://ikiwiki.info/todo/darcs/) back end working.
+I developed the [Zwiki](http://zwiki.org) wiki engine (and more recently [hledger](http://hledger.org)), and am an ikiwiki fan. 
+I'd like to see [[todo/rewrite ikiwiki in haskell]] happen.