diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-11-11 17:52:32 -0500 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-11-11 17:52:32 -0500 |
commit | 2a56ec664402e21625e9251dcbb3b53490e7ed0d (patch) | |
tree | a3b8ca059cd5b671721b071f4d30786a389d7196 /doc/users | |
parent | f6db9205369d1197bbd05f3e07ed79393b5fe220 (diff) | |
parent | d1b22b252481134815b1d02d564b6b9622fe7b4b (diff) |
Merge branch 'master' into po
Diffstat (limited to 'doc/users')
-rw-r--r-- | doc/users/Edward_Betts.mdwn | 4 | ||||
-rw-r--r-- | doc/users/jondowland.mdwn | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn index 0d4483fa8..b32927a1c 100644 --- a/doc/users/Edward_Betts.mdwn +++ b/doc/users/Edward_Betts.mdwn @@ -3,5 +3,7 @@ My watchlist: [[!inline archive="yes" sort="mtime" atom="yes" pages=" todo/allow_wiki_syntax_in_commit_messages* todo/shortcut_with_different_link_text* -todo/structured_page_data* "]] +todo/structured_page_data* +tips/convert_mediawiki_to_ikiwiki* +"]] diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn index c6302616f..8bfa3dd76 100644 --- a/doc/users/jondowland.mdwn +++ b/doc/users/jondowland.mdwn @@ -1,5 +1,13 @@ -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. +I'm looking at ikiwiki both for my personal site but also as a +team-documentation management system for a small-sized group of UNIX +sysadmins. * 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. +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 +system administrator documentation. Roughly a third of this talk was +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/>. |