===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.830
retrieving revision 1.831
diff -c -r1.830 -r1.831
*** www/events.html	2010/05/03 14:51:05	1.830
--- www/events.html	2010/05/30 11:37:56	1.831
***************
*** 40,57 ****
  
  <h3>2010</h3>
  <ul>
  <li><strong><a name="securitydate"></a>
  <a href="http://www.securitydate.org/programma.html">SecurityDate 2010</a></strong>,
  May 7, 2010, Camerino, Italy.<br>
! Giovanni Bechis will give a quick update on recent developments in OpenBSD.
  <p>
  
  <li><strong><a name="bsdcan2010"></a>
  <a href="http://www.bsdcan.org/2010/">BSDCan 2010</a></strong>,
  May 11 - 14, 2010, Ottawa, Canada.<br>
! Peter N. M. Hansteen will give a tutorial on building networks with PF.<br>
! Henning Brauer and Sven Dehmlow will give a talk about Puffy At Work -- Getting Code Right And Secure.<br>
! Jean-Philippe Dionne will give a talk about ECDYSIS OPEN-SOURCE NAT64 Implementation in OpenBSD PF.
  <p>
  
  <li><strong><a name="eurobsdcon2010"></a>
--- 40,68 ----
  
  <h3>2010</h3>
  <ul>
+ -
+ </ul>
+ 
+ <p>
+ <hr>
+ 
+ <h2>Past events:</h2>
+ 
+ <h3>2010</h3>
+ <ul>
+ 
  <li><strong><a name="securitydate"></a>
  <a href="http://www.securitydate.org/programma.html">SecurityDate 2010</a></strong>,
  May 7, 2010, Camerino, Italy.<br>
! Giovanni Bechis gave a quick update on recent developments in OpenBSD.
  <p>
  
  <li><strong><a name="bsdcan2010"></a>
  <a href="http://www.bsdcan.org/2010/">BSDCan 2010</a></strong>,
  May 11 - 14, 2010, Ottawa, Canada.<br>
! Peter N. M. Hansteen gave a tutorial on building networks with PF.<br>
! Henning Brauer and Sven Dehmlow gave a talk about Puffy At Work -- Getting Code Right And Secure.<br>
! Jean-Philippe Dionne gave a talk about ECDYSIS OPEN-SOURCE NAT64 Implementation in OpenBSD PF.
  <p>
  
  <li><strong><a name="eurobsdcon2010"></a>
***************
*** 59,74 ****
  Oct 8 - 10, 2010, Karlsruhe, Germany.<br>
  <p>
  
- </ul>
- 
- <p>
- <hr>
- 
- <h2>Past events:</h2>
- 
- <h3>2010</h3>
- <ul>
- 
  <li><strong><a name="asiabsdcon2010"></a>
  <a href="http://2010.asiabsdcon.org/index.html">AsiaBSDCon 2010</a></strong>,
  Mar 11 - 14, 2009, Tokyo, Japan.<br>
--- 70,75 ----
***************
*** 2884,2890 ****
  <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.830 2010/05/03 14:51:05 stephan Exp $</small>
  
  </body>
  </html>
--- 2885,2891 ----
  <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.831 2010/05/30 11:37:56 jasper Exp $</small>
  
  </body>
  </html>