===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.238
retrieving revision 1.239
diff -c -r1.238 -r1.239
*** www/events.html 2004/01/15 21:32:42 1.238
--- www/events.html 2004/02/07 03:45:08 1.239
***************
*** 50,55 ****
--- 50,65 ----
Gernler will be giving talks. On Saturday evening, we will have the traditional
BSD dinner.
+
+
+ BSDCan 2004,
+ May 13 - 15, 2004, Ottawa, Canada.
+ BSDCan is a developers conference with a strong focus on emerging
+ technologies, research projects, and works in progress. It also
+ features userland infrastructure projects and invites contribution
+ from both free software developers and those from commercial vendors.
+ BSDCan will be held at the University of Ottawa.
+
***************
*** 1015,1021 ****
www@openbsd.org
!
$OpenBSD: events.html,v 1.238 2004/01/15 21:32:42 jose Exp $