===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- www/events.html 2005/05/10 15:39:52 1.361
+++ www/events.html 2005/05/15 18:43:51 1.362
@@ -26,16 +26,6 @@
--
-BSDCan 2005,
-May 13 - 14, 2005, Ottawa, Canada.
-A number of OpenBSD developers will be presenting: Bob Beck on
-Spam Reduction with PF and Spamd, Henning Brauer on OpenBGPD,
-Ryan McBride on Network Stack Randomness and Reyk Flöter
-on WLAN in OpenBSD and the free ath(4) HAL.
-Expect to find other OpenBSD developers in attendance as well.
-
-
-
Calgary Unix Users Group,
May 24, 2005, Calgary, Canada.
@@ -97,6 +87,18 @@
+-
+BSDCan 2005,
+May 13 - 14, 2005, Ottawa, Canada.
+A number of OpenBSD developers presented: Bob Beck on
+Spam Reduction with PF and Spamd, Henning Brauer on OpenBGPD,
+Ryan McBride on Network Stack Randomness and Reyk Flöter
+on WLAN in OpenBSD and the free ath(4) HAL. The
+Spamd and
+WLAN slides are available.
+Mathieu Sauve-Frankel has been there in attendance as well.
+
+
-
cansecwest/core05,
May 4-6, 2005, Vancouver, Canada.
@@ -1477,7 +1479,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.361 2005/05/10 15:39:52 deraadt Exp $
+
$OpenBSD: events.html,v 1.362 2005/05/15 18:43:51 reyk Exp $