===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- www/events.html 2006/01/16 22:26:14 1.449
+++ www/events.html 2006/01/17 08:02:56 1.450
@@ -57,10 +57,12 @@
UKUUG Spring Conference 2006,
-Mar 22 - 23, 2006, Durham
+Mar 22 - 23, 2006, Durham, United Kingdom
Reyk Flöter will talk about the latest wireless support in
OpenBSD at the annual spring meeting of the
-UK's Unix and Open Systems User Group.
+UK's Unix and Open Systems User Group.
+Peter N. M. Hansteen
+will give a PF tutorial.
@@ -70,6 +72,13 @@
Boothslaves volunteer at the normal address.
+
+SANE 2006,
+May 15 - 19, 2006, Delft, The Netherlands.
+Peter N. M. Hansteen
+will give a PF tutorial.
+
+
Linuxwochen Vienna 2006,
To be announced, 2006, Vienna, Austria.
@@ -81,7 +90,7 @@
Libre Software Meeting 2006,
Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.
There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
-suspects, with the help of Serge Basterot & Alexandre Anriot.
+suspects, with the help of Serge Basterot and Alexandre Anriot.
@@ -1771,7 +1780,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.449 2006/01/16 22:26:14 reyk Exp $
+
$OpenBSD: events.html,v 1.450 2006/01/17 08:02:56 grunk Exp $