===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.838
retrieving revision 1.839
diff -c -r1.838 -r1.839
*** www/events.html	2010/10/10 20:13:57	1.838
--- www/events.html	2011/03/09 03:14:52	1.839
***************
*** 38,59 ****
  
  <h2>Future events:</h2>
  
! <h3>2010</h3>
  <ul>
  
! <li><strong><a name="bsdday2010"></a>
! <a href="http://www.bsdday.org.ar/">BSDday Argentina 2010</a></strong>,
! Nov 5 - 6, 2010, Faculty of Natural Sciences, University of Buenos Aires.<br>
  <p>
  
! <li><strong><a name="nycbsdcon2010"></a>
! <a href="http://www.nycbsdcon.org/2010/">NYCBSDCon 2010</a></strong>,
! Nov 12 - 14, 2010, New York, New York.<br>
  <p>
  
! </ul>
! 
  <p>
  <hr>
  
  <h2>Past events:</h2>
--- 38,82 ----
  
  <h2>Future events:</h2>
  
! <h3>2011</h3>
  <ul>
  
! <li><strong><a name="asiabsdcon2011"></a>
! <a href="http://2011.asiabsdcon.org/">AsiaBSDCon 2011</a></strong>,
! Mar 17 - 20, 2011, Tokyo, Japan.<br>
! Peter N. M. Hansteen will give a tutorial on building networks with PF.<br>
! Damien Miller will give a talk abouts what's new in OpenSSH.<br>
! Eric Faurot will give a talk about ASR, an asynchronous resolver
! implementation.<br>
! Mark Kettenis will give a talk on porting OpenBSD to Sun's UltraSPARC
! T1 and T2 processors (OpenBSD/sun4v).<br>
! Paul Irofti will give a talk about OpenBSD's new suspend and resume
! framework.<br>
! Henning Brauer and Ryan McBride will give a talk about ten years of PF.<br>
! Nicholas Marriott will give a talk about the tmux terminal multiplexer.<br>
! David Gwynne and Ken Westerback will give a talk about OpenBSD SCSI
! evolution.<br>
! Claudio Jeker will give a talk about the MPLS framework in OpenBSD.<br>
  <p>
  
! <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>
! Call for proposals open until May 15.<br>
  <p>
+ 
+ </ul>
  <hr>
  
  <h2>Past events:</h2>
***************
*** 61,69 ****
--- 84,112 ----
  <h3>2010</h3>
  <ul>
  
+ <li><strong><a name="nycbsdcon2010"></a>
+ <a href="http://www.nycbsdcon.org/2010/">NYCBSDCon 2010</a></strong>,
+ Nov 12 - 14, 2010, New York, New York.<br>
+ <p>
+ 
+ <li><strong><a name="bsdday2010"></a>
+ <a href="http://www.bsdday.org.ar/">BSDday Argentina 2010</a></strong>,
+ Nov 5 - 6, 2010, Faculty of Natural Sciences, University of Buenos Aires.<br>
+ Martin Coco gave a talk about OpenBSD in production.<br>
+ <p>
+ 
  <li><strong><a name="eurobsdcon2010"></a>
  <a href="http://2010.eurobsdcon.org/">EuroBSDCon 2010</a></strong>,
  Oct 8 - 10, 2010, Karlsruhe, Germany.<br>
+ Peter N. M. Hansteen gave a tutorial on building networks with PF.<br>
+ Thordur Bjornsson and Owain Ainsworth talked about bouncing of the other
+ kind - OpenBSD for large memory systems.<br>
+ Reyk Floeter gave a talk about iked(8) - Internet Key Exchange
+ version 2 (IKEv2) in OpenBSD.<br>
+ Henning Brauer talked about something OpenBSD networking related.<br>
+ Marc Espie gave two talks: about package updates and about efficient
+ distributed package builds in OpenBSD.<br>
+ Theo de Raadt gave a brief overview what happened in OpenBSD during 2010.<br>
  <p>
  
  <li><strong><a name="OSCON2010"></a>
***************
*** 2907,2913 ****
  <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.838 2010/10/10 20:13:57 espie Exp $</small>
  
  </body>
  </html>
--- 2950,2956 ----
  <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.839 2011/03/09 03:14:52 schwarze Exp $</small>
  
  </body>
  </html>