===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.952
retrieving revision 1.953
diff -c -r1.952 -r1.953
*** www/events.html	2015/02/19 08:04:42	1.952
--- www/events.html	2015/02/25 17:42:43	1.953
***************
*** 40,45 ****
--- 40,67 ----
  <h3>2015</h3>
  <ul>
  
+ <li><strong><a name="bsdcan2015"></a>
+ <a href="http://www.bsdcan.org/2015/">BSDCan 2015</a></strong>,
+ June 10 - 13, 2015, Ottawa, Canada.<br>
+ <ul>
+ <li>Reyk Fl&ouml;ter:
+ Introducing OpenBSD's new
+ <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=httpd">httpd(8)</a>
+ <li>Ingo Schwarze:
+ <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mandoc">mandoc(1)</a>:
+ Becoming the main BSD manual toolbox
+ <li>Peter Hansteen:
+ <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf">pf(4)</a>:
+ The OpenBSD Packet Filter: Building The Network You Need (tutorial)
+ <li>Peter Hessler:
+ Using <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=rdomain">routing
+ domains</a> and routing tables in a production network
+ <li>Ted Unangst:
+ <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=signify">signify(1)</a>:
+ Securing OpenBSD From Us To You
+ </ul>
+ <p>
+  
  <li><strong><a name="cebit2015"></a>
  <a href="http://www.cebit.de/">CeBIT 2015</a></strong>,
  Mar 17, 2015, Hannover, Germany.<br>