===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.842
retrieving revision 1.843
diff -c -r1.842 -r1.843
*** www/events.html	2011/04/17 19:13:50	1.842
--- www/events.html	2011/05/17 00:19:15	1.843
***************
*** 41,57 ****
  <h3>2011</h3>
  <ul>
  
- <li><strong><a name="bsdcan2011"></a>
- <a href="http://www.bsdcan.org/2011/">BSDCan 2011</a></strong>,
- May 11 - 14, 2011, Ottawa, Canada.<br>
- Peter N. M. Hansteen will give a tutorial on building networks with PF.<br>
- Kristaps Dzonsons will give a talk about the roff tradition and mandoc.<br>
- Ingo Schwarze will give a talk about mandoc in OpenBSD.<br>
- Claudio Jeker will give a talk about vscsi(4) and iscsid - iSCSI initiator
- the OpenBSD way.<br>
- Henning Brauer and Ryan McBride will give a talk about ten years of PF.<br>
- <p>
- 
  <li><strong><a name="eurobsdcon2011"></a>
  <a href="http://2011.eurobsdcon.org/">EuroBSDCon 2011</a></strong>,
  October 6 - 9, 2011, somewhere in The Netherlands.<br>
--- 41,46 ----
***************
*** 66,71 ****
--- 55,71 ----
  <h3>2011</h3>
  <ul>
  
+ <li><strong><a name="bsdcan2011"></a>
+ <a href="http://www.bsdcan.org/2011/">BSDCan 2011</a></strong>,
+ May 11 - 14, 2011, Ottawa, Canada.<br>
+ Peter N. M. Hansteen gave a tutorial on building networks with PF.<br>
+ Kristaps Dzonsons gave a talk about the roff tradition and mandoc.<br>
+ Ingo Schwarze gave a talk about mandoc in OpenBSD.<br>
+ Claudio Jeker gave a talk about vscsi(4) and iscsid - iSCSI initiator
+ the OpenBSD way.<br>
+ Henning Brauer and Ryan McBride gave a talk to celebrate 10 years of PF.<br>
+ <p>
+ 
  <li><strong><a name="asiabsdcon2011"></a>
  <a href="http://2011.asiabsdcon.org/">AsiaBSDCon 2011</a></strong>,
  Mar 17 - 20, 2011, Tokyo, Japan.<br>
***************
*** 2944,2950 ****
  <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.842 2011/04/17 19:13:50 schwarze Exp $</small>
  
  </body>
  </html>
--- 2944,2950 ----
  <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.843 2011/05/17 00:19:15 henning Exp $</small>
  
  </body>
  </html>