Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn
index 16cb390c41e0b5d8a93afcda579f7071856c3126..8e827b0da19697d252546396d66f08a123f8276f 100644 (file)
--- a/doc/users/KathrynAndersen.mdwn
+++ b/doc/users/KathrynAndersen.mdwn
@@ -1,8 +1,8 @@
 * aka [[rubykat]]
 * aka [[rubykat]]

-* Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need).

 * <http://kerravonsen.dreamwidth.org>
 * <http://kerravonsen.dreamwidth.org>

-* <http://www.katspace.org>
+* <http://www.katspace.org> (uses IkiWiki!)

 * <http://github.com/rubykat>
 * <http://github.com/rubykat>

+* Also an active [PmWiki](http://www.pmwiki.org) user, interested in having the best of both worlds.

 
 Has written the following plugins:
 [[!map pages="!*/Discussion and ((link(users/KathrynAndersen) or link(users/rubykat)) and plugins/*) "]]
 
 Has written the following plugins:
 [[!map pages="!*/Discussion and ((link(users/KathrynAndersen) or link(users/rubykat)) and plugins/*) "]]