===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -r1.474 -r1.475
--- www/events.html	2006/04/08 16:16:22	1.474
+++ www/events.html	2006/04/08 23:57:55	1.475
@@ -28,29 +28,6 @@
 
 <ul>
 
-<li><strong><a name=linuxworld2006></a>
-<a href="http://www.linuxworldexpo.com/live/12/events/12BOS06A/">
-LinuxWorld/OpenSolutions World 2006</a></strong>,
-April 3 - 6, 2006, Boston, USA.<br>
-Jason Dixon will present
-<a href="http://www.linuxworldexpo.com/live/12/events/12BOS06A/conference/tracksessions/Security/QMONYA04Q1DK">Secure Network Architectures with OpenBSD</a>, 
-a new talk on OpenBSD that outlines the various technologies that make
-it a leader of secure networking platforms.
-<br>
-He will also be hanging out in the exposition BSD booth with giveaways 
-and possibly even OpenBSD 3.9 merchandise.
-<p>
-
-<li><strong><a name=cansecwest06></a>
-<a href="http://www.cansecwest.com">Cansecwest/core06</a></strong>,
-April 3 - 7, 2006, Vancouver.<br>
-A rather interesting OpenBSD-related talk will be happening at this event.
-<br>
-Some OpenBSD developers will be attending.  There is a slim chance that
-some of the OpenBSD 3.9 items might be available early.  Keep an eye out
-for Theo or Bob walking around with a box.
-<p>
-
 <li><strong><a name=DORSCLUC2006></a>
 <a href="http://www.open.hr/dc2006/"> DORS / CLUC 2006</a></strong>,
 April 19-21, 2006, Zagreb, Croatia.<br>
@@ -142,6 +119,30 @@
 
 <h3>2006</h3>
 <ul>
+
+<li><strong><a name=linuxworld2006></a>
+<a href="http://www.linuxworldexpo.com/live/12/events/12BOS06A/">
+LinuxWorld/OpenSolutions World 2006</a></strong>,
+April 3 - 6, 2006, Boston, USA.<br>
+Jason Dixon presented
+<a href="http://www.linuxworldexpo.com/live/12/events/12BOS06A/conference/tracksessions/Security/QMONYA04Q1DK">Secure Network Architectures with OpenBSD</a>, 
+a talk on OpenBSD that outlines the various technologies that make
+it a leader of secure networking platforms.
+<br>
+He spent time around the exposition BSD booth with giveaways
+and early release OpenBSD 3.9 CDs.
+<p>
+
+<li><strong><a name=cansecwest06></a>
+<a href="http://www.cansecwest.com">Cansecwest/core06</a></strong>,
+April 3 - 7, 2006, Vancouver.<br>
+A rather interesting OpenBSD-related talk happened at this event, regarding
+using SMI interrupts to break out of X into kernel mode.
+<br>
+Some OpenBSD developers attended.  Some early OpenBSD 3.9 items went
+on sale.
+<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>
@@ -1874,7 +1875,7 @@
 <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.474 2006/04/08 16:16:22 pedro Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.475 2006/04/08 23:57:55 deraadt Exp $</small>
 
 </body>
 </html>