===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.449
retrieving revision 1.450
diff -c -r1.449 -r1.450
*** www/events.html	2006/01/16 22:26:14	1.449
--- www/events.html	2006/01/17 08:02:56	1.450
***************
*** 57,66 ****
  
  <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<br>
  Reyk Fl&ouml;ter will talk about the latest wireless support in
  OpenBSD at the annual spring meeting of the
! <a href="http://www.ukuug.org/">UK's Unix and Open Systems User Group</a>.
  <p>
  
  <li><strong><a name=LinuxTag2006></a>
--- 57,68 ----
  
  <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>
  Reyk Fl&ouml;ter will talk about the latest wireless support in
  OpenBSD at the annual spring meeting of the
! <a href="http://www.ukuug.org/">UK's Unix and Open Systems User Group</a>.<br>
! <a href="mailto:peter@bgnett.no">Peter N. M. Hansteen</a>
! will give a PF tutorial.
  <p>
  
  <li><strong><a name=LinuxTag2006></a>
***************
*** 70,75 ****
--- 72,84 ----
  Boothslaves volunteer at the normal address.
  <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>
+ <a href="mailto:peter@bgnett.no">Peter N. M. Hansteen</a>
+ will give a PF tutorial.
+ <p>
+ 
  <li><strong><a name=LinuxwochenVienna2006></a>
  <a href="http://www.linuxwochen.at/">Linuxwochen Vienna 2006</a></strong>,
  To be announced, 2006, Vienna, Austria.<br>
***************
*** 81,87 ****
  <a href="http://2006.rencontresmondiales.org/home/?lang=en_GB">Libre Software Meeting 2006</a></strong>,
  Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.<br>
  There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
! suspects, with the help of Serge Basterot & Alexandre Anriot.
  <p>
  </ul>
  
--- 90,96 ----
  <a href="http://2006.rencontresmondiales.org/home/?lang=en_GB">Libre Software Meeting 2006</a></strong>,
  Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.<br>
  There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
! suspects, with the help of Serge Basterot and Alexandre Anriot.
  <p>
  </ul>
  
***************
*** 1771,1777 ****
  <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.449 2006/01/16 22:26:14 reyk Exp $</small>
  
  </body>
  </html>
--- 1780,1786 ----
  <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.450 2006/01/17 08:02:56 grunk Exp $</small>
  
  </body>
  </html>