diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-15 19:36:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-15 19:36:48 -0400 |
| commit | 1f7f5d5e0e21920c5f15290cd34594ad91077071 (patch) | |
| tree | a19302c57ed6ea46c4bf05a1ed8d840725643069 /doc/users | |
| parent | 917f54a777d152ee5963acd81bf8a2800a0507b1 (diff) | |
| parent | 20e691fe20ead76d826ab77501c6e9cbc7b487e8 (diff) | |
Merge branch 'master' into darcs
Diffstat (limited to 'doc/users')
| -rw-r--r-- | doc/users/bstpierre.mdwn | 1 | ||||
| -rw-r--r-- | doc/users/donmarti.mdwn | 2 | ||||
| -rw-r--r-- | doc/users/jondowland.mdwn | 5 | ||||
| -rw-r--r-- | doc/users/josephturian.mdwn | 6 |
4 files changed, 10 insertions, 4 deletions
diff --git a/doc/users/bstpierre.mdwn b/doc/users/bstpierre.mdwn new file mode 100644 index 000000000..327d25016 --- /dev/null +++ b/doc/users/bstpierre.mdwn @@ -0,0 +1 @@ +Brian St. Pierre is **<brian@bstpierre.org>** diff --git a/doc/users/donmarti.mdwn b/doc/users/donmarti.mdwn new file mode 100644 index 000000000..bafec7170 --- /dev/null +++ b/doc/users/donmarti.mdwn @@ -0,0 +1,2 @@ +Don Marti home page: <http://zgp.org/~dmarti/> email: <dmarti@zgp.org> + diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn index d5aa6d0be..c6302616f 100644 --- a/doc/users/jondowland.mdwn +++ b/doc/users/jondowland.mdwn @@ -1,4 +1,5 @@ A new ikiwiki user, looking at ikiwiki both for his personal site but also as a team-documentation management system for a small-sized group of UNIX sysadmins. -* (currently non-ikiwiki) Homepage: <http://alcopop.org/> -* potential future (ikiwiki) Homepage: <http://jmtd.net/> +* My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts) + +I am giving a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual [Linux conference](http://www.ukuug.org/events/linux2008/) about organising system administrator documentation which will feature IkiWiki. diff --git a/doc/users/josephturian.mdwn b/doc/users/josephturian.mdwn index f055f951c..5ad68290d 100644 --- a/doc/users/josephturian.mdwn +++ b/doc/users/josephturian.mdwn @@ -1,8 +1,10 @@ -Joseph Turian is a scientist. +Joseph Turian is a scientist. You can email him at + lastname at gmail dot com * Academic: <http://www-etud.iro.umontreal.ca/~turian/> He hopes to set up ikiwiki and organize his thoughts. -In more distant dreams, he hopes that ikiwiki is someday ported to python. He also imagines adding wacky NLP and machine learning to ikiwiki. + +In more hazy dreams, he hopes that ikiwiki is someday ported to python. |