===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.460
retrieving revision 1.461
diff -c -r1.460 -r1.461
*** www/events.html	2006/03/08 19:27:48	1.460
--- www/events.html	2006/03/08 20:15:41	1.461
***************
*** 28,43 ****
  
  <ul>
  
- <li><strong><a name=bsdcan2006></a> <a
- href="http://www.bsdcan.org/2006/">BSDCan 2006</a></strong>,
- May 12 - 13, 2006, Ottawa, Canada.<br>
- David Gwynne will give a talk about hardware monitoring with bio and
- sensors in OpenBSD and Reyk Fl&ouml;ter will talk about the latest
- wireless support and the incredible plans for the future.  A number of
- OpenBSD hackers will attend the conference as well, like the committee
- members Bob Beck and Todd Miller.
- <p>
- 
  <li><strong><a name=ukuug2006></a>
  <a href="http://www.ukuug.org/events/spring2006/">UKUUG Spring Conference 2006</a></strong>,
  Mar 22 - 23, 2006, Durham, United Kingdom<br>
--- 28,33 ----
***************
*** 58,63 ****
--- 48,63 ----
  Boothslaves volunteer at the normal address.
  <p>
  
+ <li><strong><a name=bsdcan2006></a> <a
+ href="http://www.bsdcan.org/2006/">BSDCan 2006</a></strong>,
+ May 12 - 13, 2006, Ottawa, Canada.<br>
+ David Gwynne will give a talk about hardware monitoring with bio and
+ sensors in OpenBSD and Reyk Fl&ouml;ter will talk about the latest
+ wireless support and the incredible plans for the future.  A number of
+ OpenBSD hackers will attend the conference as well, like the committee
+ members Bob Beck and Todd Miller.
+ <p>
+ 
  <li><strong><a name="SANE2006"></a>
  <a href="http://www.sane.nl/sane2006/">SANE 2006</a></strong>,
  May 15 - 19, 2006, Delft, The Netherlands.<br>
***************
*** 1818,1824 ****
  <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.460 2006/03/08 19:27:48 reyk Exp $</small>
  
  </body>
  </html>
--- 1818,1824 ----
  <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.461 2006/03/08 20:15:41 reyk Exp $</small>
  
  </body>
  </html>