===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.859
retrieving revision 1.860
diff -u -r1.859 -r1.860
--- www/events.html	2012/02/09 17:42:52	1.859
+++ www/events.html	2012/04/03 10:36:00	1.860
@@ -40,14 +40,45 @@
 
 <h3>2012</h3>
 <ul>
-Peter Hansteen will be giving PF tutorials at <a href="http://www.opensourcedays.org/2012/">Open Source Days</a> in Copenhagen, Denmark, March 8 and 9 (with the conference itself taking place on March 10 and 11). See <a href="http://www.opensourcedays.org/2012/courses">http://www.opensourcedays.org/2012/courses</a> for information.
+<li><strong><a name="bsdcan2012"></a>
+<a href="http://www.bsdcan.org/2012/">BSDCan 2012</a></strong>,
+May 09 - 12, 2012, Ottawa, Canada.<br>
+Henning Brauer will give a talk about the upcoming new queueing subsystem.
 <p>
 
+<li><strong><a name="eurobsdcon2012"></a>
+<a href="http://2012.eurobsdcon.org/">EuroBSDcon 2012</a></strong>,
+Oct 18 - 21, 2012, Warsaw, Poland.<br>
+Henning Brauer will give a talk.
+<p>
+
 </ul>
 <hr>
 
 <h2>Past events:</h2>
 
+<h3>2012</h3>
+<ul>
+
+<li><strong><a name="asiabsdcon2012"></a>
+<a href="http://2012.asiabsdcon.org/">AsiaBSDCon 2012</a></strong>,
+Mar 22 - 25, 2012, Tokyo, Japan.<br>
+<p>
+Henning Bauer and Ryan McBride gave a talk  to celebrate
+<a href="http://bulabula.org/papers/2011/pf10yrs/">OpenBSD PF's 10th
+Anniversary</a><br>
+Kristaps Dzonsons gave a talk about mandoc.<br>
+Peter N. M. Hansteen gave a tutorial on building networks with PF.<br>
+<p>
+
+<li><strong><a name="opensourcedayscopenhagen2012"></a></strong>
+<a href="http://www.opensourcedays.org/2012/">Open Source Days</a>,
+Mar 8 - 11, 2012, Copenhagen, Denmark.
+<p>
+Peter Hansteen gave PF tutorials. 
+<p>
+</ul>
+
 <h3>2011</h3>
 <ul>
 
@@ -2988,7 +3019,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.859 2012/02/09 17:42:52 deraadt Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.860 2012/04/03 10:36:00 henning Exp $</small>
 
 </body>
 </html>