===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.919
retrieving revision 1.920
diff -c -r1.919 -r1.920
*** www/events.html 2014/05/15 01:49:53 1.919
--- www/events.html 2014/05/17 18:38:48 1.920
***************
*** 40,54 ****
2014
! -
! BSDCan 2014,
! May 14 - 17, 2014, Ottawa, Canada.
! Paul Irofti will give a talk on "Porting OpenBSD on the MIPS64-based Octeon Platforms".
! Peter Hessler will give a talk on "Using BGP for realtime import and export of spam whitelist/blacklist entries: a year in the life".
! Henning Brauer will give a talk on "OpenBGPD turns 10 years: Design, Implementation, Lessons learned".
! Ingo Schwarze will give a talk on "New trends in mandoc: enhancing the modern toolbox for the classic documentation formats".
! Bob Beck will give a talk on "LibreSSL".
!
--- 40,48 ----
2014
***************
*** 57,62 ****
--- 51,68 ----
2014
+
+ -
+ BSDCan 2014,
+ May 14 - 17, 2014, Ottawa, Canada.
+ Paul Irofti gave a talk on "Porting OpenBSD on the MIPS64-based Octeon Platforms".
+ Peter Hessler gave a talk on "Using BGP for realtime import and export of spam whitelist/blacklist entries: a year in the life".
+ Henning Brauer gave a talk on "OpenBGPD turns 10 years: Design, Implementation, Lessons learned".
+ Ingo Schwarze gave a talk on New trends in
+ mandoc: enhancing the modern toolbox for the classic documentation formats
+ (groff/mm/gpresent source).
+ Bob Beck gave a talk on "LibreSSL".
+
-
AsiaBSDCon 2014,