===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.669
retrieving revision 1.670
diff -c -r1.669 -r1.670
*** www/events.html	2007/05/16 03:28:43	1.669
--- www/events.html	2007/05/19 20:50:46	1.670
***************
*** 43,54 ****
  <ul>
  <p>
  
- <li><strong><a name="bsdcan2007"></a>
- <a href="http://www.bsdcan.org/">BSDCan 2007</a></strong>,
- May 16 - 19, 2007, Ottawa, Canada.<br>
- Several OpenBSD developers will be there.  Peter Hansteen will give a "Packet filtering for fun and profit" tutorial and present a "Fighting malware and spam with free tools" talk.  Ray Lai will present a lecture on OpenCVS/OpenRCS and discuss why a secure CVS implementation is needed.  Jason Dixon is giving the closing session of BSDCan 2007.
- <p>
- 
  <li><strong><a name="linuxtag2007"></a>
  <a href="http://www.linuxtag.org/2007/en/">LinuxTag 2007</a>
  </strong>,
--- 43,48 ----
***************
*** 130,135 ****
--- 124,141 ----
  <h3>2007</h3>
  <ul>
  
+ <li><strong><a name="bsdcan2007"></a>
+ <a href="http://www.bsdcan.org/2007/">BSDCan 2007</a></strong>,
+ May 16 - 19, 2007, Ottawa, Canada.<br>
+ Several OpenBSD developers were there.<br>
+ Peter Hansteen gave a "Packet filtering for fun and profit" tutorial and
+ presented a "Fighting malware and spam with free tools" talk.<br>
+ Ray Lai presented OpenCVS/OpenRCS and
+ discussed why a secure CVS implementation is needed.
+ <a href="papers/bsdcan07-cvs/">Slides</a> are available.<br>
+ Jason Dixon gave the closing session of BSDCan 2007.
+ <p>
+ 
  <li><strong><a name="confidence2007"></a>
  <a href="http://2007.confidence.org.pl/">Confidence 2007</a></strong>,
  May 12 - 13, 2007, Krakow, Poland.<br>
***************
*** 2362,2368 ****
  <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.669 2007/05/16 03:28:43 fkr Exp $</small>
  
  </body>
  </html>
--- 2368,2374 ----
  <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.670 2007/05/19 20:50:46 ray Exp $</small>
  
  </body>
  </html>