Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn
index 6f43bc335a7212ca7e999c041ebced2790b29d7a..c6302616f52ec058de5a8f5956fc512149a2f1a3 100644 (file)
--- a/doc/users/jondowland.mdwn
+++ b/doc/users/jondowland.mdwn
@@ -2,4 +2,4 @@ A new ikiwiki user, looking at ikiwiki both for his personal site but also as a
 
 * 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.