===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.468
retrieving revision 1.469
diff -c -r1.468 -r1.469
*** www/events.html	2006/03/24 10:57:40	1.468
--- www/events.html	2006/03/24 12:03:55	1.469
***************
*** 28,46 ****
  
  <ul>
  
- <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>
- Peter N. M. Hansteen
- will give a PF tutorial, Tom Cosgrove will present "Exploit
- Mitigation Techniques" and Constantine Murenin will give a
- presentation on "Hardware temperature monitoring device
- drivers for OpenBSD".
- <p>
- 
  <li><strong><a name=cansecwest06></a>
  <a href="http://www.cansecwest.com">Cansecwest/core06</a></strong>,
  April 3 - 7, 2006, Vancouver.<br>
--- 28,33 ----
***************
*** 125,130 ****
--- 112,131 ----
  
  <h3>2006</h3>
  <ul>
+ <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 gave a 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>.
+ Peter N. M. Hansteen
+ gave a PF tutorial, Tom Cosgrove presented "Exploit
+ Mitigation Techniques" and Constantine Murenin gave a
+ presentation on "Hardware temperature monitoring device
+ drivers for OpenBSD".
+ These were all part of a new, well-attended, BSD stream at the event.
+ <p>
+ 
  <li><strong><a name=Copenhagen2006></a>
  <a href="http://www.linuxforum.dk/2006/en/">LinuxForum 2006</a></strong>,
  Mar 3 - 4, 2006, Copenhagen, Denmark<br>
***************
*** 1843,1849 ****
  <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.468 2006/03/24 10:57:40 mbalmer Exp $</small>
  
  </body>
  </html>
--- 1844,1850 ----
  <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.469 2006/03/24 12:03:55 tom Exp $</small>
  
  </body>
  </html>