diff options
| author | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
| commit | 4558457402a4ab6bc795589a2e400fa66144f76e (patch) | |
| tree | 8368320617a8febc3c9c9708f688b6591801f4c0 /doc/users | |
| parent | 9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e (diff) | |
| parent | 2cc3f5d057c5882e08d16746985c49a7dd1a4c01 (diff) | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'doc/users')
| -rw-r--r-- | doc/users/jon.mdwn | 8 | ||||
| -rw-r--r-- | doc/users/seanh.mdwn | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn index 3e22ded1d..1cda23999 100644 --- a/doc/users/jon.mdwn +++ b/doc/users/jon.mdwn @@ -4,8 +4,9 @@ team-documentation management system for a small-sized group of UNIX sysadmins. * my edits should appear either as 'Jon' (if I've used - [[tips/untrusted_git_push]]) or 'alcopop.org/me/openid/'. -* My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts) + [[tips/untrusted_git_push]]) or 'jmtd.net' (or once upon a time + 'alcopop.org/me/openid/' or 'jondowland'). +* My [homepage](http://jmtd.net/) is powered by ikiwiki I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual [Linux conference](http://www.ukuug.org/events/linux2008/) about organising @@ -14,3 +15,6 @@ discussing IkiWiki in some technical detail and suggesting it as a good piece of software for this task. * slides at <http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/>. + +I am also working on some ikiwiki hacks: an alternative approach to +[[plugins/comments]]; a system for [[forum/managing_todo_lists]]. diff --git a/doc/users/seanh.mdwn b/doc/users/seanh.mdwn new file mode 100644 index 000000000..d093c2f32 --- /dev/null +++ b/doc/users/seanh.mdwn @@ -0,0 +1 @@ +seanh is an ikiwiki user. |