===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -r1.830 -r1.831
--- www/events.html 2010/05/03 14:51:05 1.830
+++ www/events.html 2010/05/30 11:37:56 1.831
@@ -40,18 +40,29 @@
2010
+
+
+
+
+Past events:
+
+2010
+
+
-
SecurityDate 2010,
May 7, 2010, Camerino, Italy.
-Giovanni Bechis will give a quick update on recent developments in OpenBSD.
+Giovanni Bechis gave a quick update on recent developments in OpenBSD.
-
BSDCan 2010,
May 11 - 14, 2010, Ottawa, Canada.
-Peter N. M. Hansteen will give a tutorial on building networks with PF.
-Henning Brauer and Sven Dehmlow will give a talk about Puffy At Work -- Getting Code Right And Secure.
-Jean-Philippe Dionne will give a talk about ECDYSIS OPEN-SOURCE NAT64 Implementation in OpenBSD PF.
+Peter N. M. Hansteen gave a tutorial on building networks with PF.
+Henning Brauer and Sven Dehmlow gave a talk about Puffy At Work -- Getting Code Right And Secure.
+Jean-Philippe Dionne gave a talk about ECDYSIS OPEN-SOURCE NAT64 Implementation in OpenBSD PF.
-
@@ -59,16 +70,6 @@
Oct 8 - 10, 2010, Karlsruhe, Germany.
-
-
-
-
-
-Past events:
-
-2010
-
-
-
AsiaBSDCon 2010,
Mar 11 - 14, 2009, Tokyo, Japan.
@@ -2884,7 +2885,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.830 2010/05/03 14:51:05 stephan Exp $
+
$OpenBSD: events.html,v 1.831 2010/05/30 11:37:56 jasper Exp $