===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- www/events.html	2004/05/26 18:17:11	1.247
+++ www/events.html	2004/06/12 18:11:40	1.248
@@ -25,17 +25,8 @@
 <h3>2004</h3>
 
 <ul>
-<li><strong><a name=BSDCan2004></a>
-<a href="http://www.bsdcan.org/">BSDCan 2004</a></strong>,
-May 13 - 16, 2004, Ottawa, Canada.<br>
-BSDCan is a developers conference with a strong focus on emerging 
-technologies, research projects, and works in progress. It also 
-features userland infrastructure projects and invites contribution 
-from both free software developers and those from commercial vendors.
-BSDCan will be held at the University of Ottawa.
-<p>
+<li>None known..
 </ul>
-
 <hr>
 
 <!-- STYLE NOTES:
@@ -56,6 +47,17 @@
 <h3>2004</h3>
 
 <ul>
+
+<li><strong><a name=BSDCan2004></a>
+<a href="http://www.bsdcan.org/">BSDCan 2004</a></strong>,
+May 13 - 16, 2004, Ottawa, Canada.<br>
+
+BSDCan was held at the University of Ottawa.  Ryan McBride gave a talk
+about newer features in pf, focusing on the redundancy provided by CARP
+and pfsync.  Theo de Raadt presented a revised version of his talk on
+<a href="papers/bsdcan04">Exploit Mitigation Techniques</a>.
+<p>
+
 <li><strong><a name="LOSFAnkara2004"></a>
 <a href="http://senlik.linux.org.tr">3rd Linux and Open Source Festival</a></strong>,
 May 13 - 16, 2004, Ankara, Turkey.<br>
@@ -1049,7 +1051,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.247 2004/05/26 18:17:11 canacar Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.248 2004/06/12 18:11:40 deraadt Exp $</small>
 
 </body>
 </html>