===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.361
retrieving revision 1.362
diff -c -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,41 ****
  
  <ul>
  
- <li><strong><a name=bsdcan2005></a>
- <a href="http://www.bsdcan.org/2005/">BSDCan 2005</a></strong>,
- May 13 - 14, 2005, Ottawa, Canada.<br>
- 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&ouml;ter
- on WLAN in OpenBSD and the free ath(4) HAL.
- Expect to find other OpenBSD developers in attendance as well.
- <p>
- 
  <li><strong><a name=cuug2005></a>
  <a href="http://www.cuug.ab.ca/">Calgary Unix Users Group</a></strong>,
  May 24, 2005, Calgary, Canada.<br>
--- 26,31 ----
***************
*** 97,102 ****
--- 87,104 ----
  
  <ul>
  
+ <li><strong><a name=bsdcan2005></a>
+ <a href="http://www.bsdcan.org/2005/">BSDCan 2005</a></strong>,
+ May 13 - 14, 2005, Ottawa, Canada.<br>
+ 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&ouml;ter
+ on WLAN in OpenBSD and the free ath(4) HAL. The
+ <a href="papers/bsdcan05-spamd/">Spamd</a> and
+ <a href="papers/bsdcan05-wlan/">WLAN</a> slides are available.
+ Mathieu Sauve-Frankel has been there in attendance as well.
+ <p>
+ 
  <li><strong><a name=csw2005></a>
  <a href="http://www.cansecwest.com/">cansecwest/core05</a></strong>,
  May 4-6, 2005, Vancouver, Canada.<br>
***************
*** 1477,1483 ****
  <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.361 2005/05/10 15:39:52 deraadt Exp $</small>
  
  </body>
  </html>
--- 1479,1485 ----
  <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.362 2005/05/15 18:43:51 reyk Exp $</small>
  
  </body>
  </html>