===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.759
retrieving revision 1.760
diff -u -r1.759 -r1.760
--- www/events.html	2008/04/23 21:46:59	1.759
+++ www/events.html	2008/05/18 10:31:18	1.760
@@ -42,32 +42,7 @@
 
 <p>
 <ul>
-<li><strong><a name="bsdcan2008"></a>
-<a href="http://www.bsdcan.org/2008/">BSDCan 2008</a></strong>,
-May 14 - 17, 2008, Ottawa, Canada.<br>
-Several OpenBSD developers will be there.<br>
-Constantine A. Murenin will give an overview of the sensors framework,
-Matthieu Herrb will talk about the upcoming X.org plans and
-Ian Darwin will give a presentation about OpenMoko.<br>
-John Pertalion and Oscar Knight will present a case-study of
-their OpenVPN on OpenBSD deployment.
-<p>
 
-<li><strong><a name="vj08"></a>
-<a href="http://www.nluug.nl/events/vj08">NLUUG spring conference
-2008</a></strong>,
-May 15, 2008, Ede, Netherlands.<br>
-There will be an OpenBSD booth. As this years topic is security, we should
-have at least one <a href="http://www.nluug.nl/events/vj08/CfP-NL.html">talk</a>
-submitted.
-<p>
-
-<li><strong><a name="confidence2008"></a>
-<a href="http://2008.confidence.org.pl/">Confidence 2008</a></strong>,
-May 16 - 17, 2008, Krakow, Poland.<br>
-Felix is giving a presentation and there will be a OpenBSD booth.
-<p>
-
 <li><strong><a name="linuxdays2008"></a>
 <a href="http://www.linuxdays.ch/">LinuxDays 2008</a></strong>,
 May 21 - 22, 2008, Geneva, Switzerland.<br>
@@ -147,6 +122,31 @@
 
 <h3>2008</h3>
 <ul>
+<li><strong><a name="bsdcan2008"></a>
+<a href="http://www.bsdcan.org/2008/">BSDCan 2008</a></strong>,
+May 14 - 17, 2008, Ottawa, Canada.<br>
+Several OpenBSD developers were there.<br>
+Constantine A. Murenin gave an overview of the sensors framework,
+Matthieu Herrb  talked about the <a href="papers/bsdcan08-xorg.pdf">
+upcoming X.org plans</a> and
+Ian Darwin gave a presentation about OpenMoko.<br>
+John Pertalion and Oscar Knight presented a case-study of
+their OpenVPN on OpenBSD deployment.
+<p>
+
+<li><strong><a name="vj08"></a>
+<a href="http://www.nluug.nl/events/vj08">NLUUG spring conference
+2008</a></strong>,
+May 15, 2008, Ede, Netherlands.<br>
+There has been an OpenBSD booth.
+<p>
+
+<li><strong><a name="confidence2008"></a>
+<a href="http://2008.confidence.org.pl/">Confidence 2008</a></strong>,
+May 16 - 17, 2008, Krakow, Poland.<br>
+Felix has given a presentation and there was a OpenBSD booth.
+<p>
+
 <li><strong><a name="DORSCLUC2008"></a>
 <a href="http://www.open.hr/dc2008/en/">DORS / CLUC 2008</a></strong>,
 Apr 16 - Apr 18, 2008, Zagreb, Croatia.<br>
@@ -2677,7 +2677,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.759 2008/04/23 21:46:59 johan Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.760 2008/05/18 10:31:18 matthieu Exp $</small>
 
 </body>
 </html>