summaryrefslogtreecommitdiff
path: root/doc/users
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-09-04 17:15:11 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-09-04 17:15:11 -0400
commitfc2bd0afe17a235a0ddfad0a5656c3683d8d180a (patch)
treefe870015a89c3720d54921aa942e24b89c6eaa25 /doc/users
parentde7c3aa16ba46adbc3d26e4a5a06e1dcc321fa6c (diff)
parent127ed4d6c7a7d2cc518102757b7b4be49d20fce8 (diff)
Merge branch 'master' into cvs
Diffstat (limited to 'doc/users')
-rw-r--r--doc/users/tychoish.mdwn11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/users/tychoish.mdwn b/doc/users/tychoish.mdwn
index 3439afdb3..75b285e4a 100644
--- a/doc/users/tychoish.mdwn
+++ b/doc/users/tychoish.mdwn
@@ -1,5 +1,10 @@
-I'm [tycho](http://www.tychoish.com/).
+I'm Sam Kleinman ([tychoish](http://www.tychoish.com/)), and I use ikiwiki.
-I use ikiwiki *a lot* on my local machine to organize thoughts, stage writing projects, and collect information. It's a great thing for me. Someday I'll probably get around to using it to powersome sort of collaborative fiction project. Someday.
+I used to use ikiwiki a bunch, in a purely local setup, for various projects and personal note taking of various kinds. I've since switched to using [orgmode](http://www.orgmode.org) and a number of just regular old git repositories with some textfiles in them, which seems to work just as well for my particular use case.
-Talk to you soon.
+Currently, I'm using ikiwiki on the [cyborg institute wiki](http://www.cyborginstitute.com/wiki/) and I'm working on helping someone develop a collaborative fiction project at the [critical futures wiki](http://www.criticalfutures.com/wiki/)... and I'm thinking about other projects, but nothing that exists enough to mention here.
+
+I hang out in #ikiwiki on oftc, and I'm working on getting some of my templates in order to share with you all. Soon. For sure.
+
+Cheers,
+tychoish