===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.842
retrieving revision 1.843
diff -u -r1.842 -r1.843
--- www/events.html 2011/04/17 19:13:50 1.842
+++ www/events.html 2011/05/17 00:19:15 1.843
@@ -41,17 +41,6 @@
2011
--
-BSDCan 2011,
-May 11 - 14, 2011, Ottawa, Canada.
-Peter N. M. Hansteen will give a tutorial on building networks with PF.
-Kristaps Dzonsons will give a talk about the roff tradition and mandoc.
-Ingo Schwarze will give a talk about mandoc in OpenBSD.
-Claudio Jeker will give a talk about vscsi(4) and iscsid - iSCSI initiator
-the OpenBSD way.
-Henning Brauer and Ryan McBride will give a talk about ten years of PF.
-
-
-
EuroBSDCon 2011,
October 6 - 9, 2011, somewhere in The Netherlands.
@@ -66,6 +55,17 @@
2011
+-
+BSDCan 2011,
+May 11 - 14, 2011, Ottawa, Canada.
+Peter N. M. Hansteen gave a tutorial on building networks with PF.
+Kristaps Dzonsons gave a talk about the roff tradition and mandoc.
+Ingo Schwarze gave a talk about mandoc in OpenBSD.
+Claudio Jeker gave a talk about vscsi(4) and iscsid - iSCSI initiator
+the OpenBSD way.
+Henning Brauer and Ryan McBride gave a talk to celebrate 10 years of PF.
+
+
-
AsiaBSDCon 2011,
Mar 17 - 20, 2011, Tokyo, Japan.
@@ -2944,7 +2944,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.842 2011/04/17 19:13:50 schwarze Exp $
+
$OpenBSD: events.html,v 1.843 2011/05/17 00:19:15 henning Exp $