===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -r1.914 -r1.915
--- www/events.html	2014/02/21 09:52:27	1.914
+++ www/events.html	2014/02/22 23:51:30	1.915
@@ -41,13 +41,22 @@
 <h3>2014</h3>
 <ul>
 
-<li><strong><a name="asiabsdcon2013"></a>
+<li><strong><a name="asiabsdcon2014"></a>
 <a href="http://2014.asiabsdcon.org/">AsiaBSDCon 2014</a></strong>,
 Mar 13 - 16, 2014, Tokyo, Japan.<br>
 Henning Brauer will give a talk on &quot;OpenBGPD turns 10 years - Design, Implementation, Lessons learned&quot;.<br>
 Reyk Floeter will give a talk on &quot;VXLAN(4) and Cloud-based networking with OpenBSD&quot;.
 <p>
 
+<li><strong><a name="bsdcan2014"></a>
+<a href="http://www.bsdcan.org/2014/">BSDCan 2014</a></strong>,
+May 14 - 17, 2014, Ottawa, Canada.<br>
+Paul Irofti will give a talk on &quot;Porting OpenBSD on the MIPS64-based Octeon Platforms&quot;.<br>
+Peter Hessler will give a talk on &quot;Using BGP for realtime import and export of spam whitelist/blacklist entries: a year in the life&quot;.<br>
+Henning Brauer will give a talk on &quot;OpenBGPD turns 10 years: Design, Implementation, Lessons learned&quot;.<br>
+Ingo Schwarze will give a talk on &quot;New trends in mandoc: enhancing the modern toolbox for the classic documentation formats&quot;.
+<p>
+
 </ul>
 <hr>
 
@@ -3176,7 +3185,7 @@
 <hr>
 <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
 <a href="mailto:www@openbsd.org">www@openbsd.org</a>
-<br><small>$OpenBSD: events.html,v 1.914 2014/02/21 09:52:27 zhuk Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.915 2014/02/22 23:51:30 jturner Exp $</small>
 
 </body>
 </html>