===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.567
retrieving revision 1.568
diff -c -r1.567 -r1.568
*** www/events.html	2006/11/10 20:16:49	1.567
--- www/events.html	2006/11/19 19:00:03	1.568
***************
*** 45,53 ****
  <li><strong><a name="opencon2006"></a>
  <a href="http://www.opencon.org/">OpenCON 2006</a></strong>,
  Dec 2 - 3, 2006, CourtYard Venice Airport, Tessera/Venice - Italy<br>
! OpenCON is the only conference dedicated solely to OpenBSD.  There will
! be an OpenBSD and OpenSSH booth run by Wim and the usual suspects.
! Several developers will be speaking:
   <ul>
   <li>Claudio Jeker: <i>Network changes in OpenBSD</i>
   <li>Marc Balmer: <i>Support for Time Signal Station Receivers and GPS in OpenBSD</i>
--- 45,55 ----
  <li><strong><a name="opencon2006"></a>
  <a href="http://www.opencon.org/">OpenCON 2006</a></strong>,
  Dec 2 - 3, 2006, CourtYard Venice Airport, Tessera/Venice - Italy<br>
! OpenCON is the only conference dedicated solely to OpenBSD.
! Most talks are by OpenBSD developers, but there will also be an impressive
! number of our developers just attending the conference.  Talks by OpenBSD
! developers are:
! <p>
   <ul>
   <li>Claudio Jeker: <i>Network changes in OpenBSD</i>
   <li>Marc Balmer: <i>Support for Time Signal Station Receivers and GPS in OpenBSD</i>
***************
*** 59,64 ****
--- 61,71 ----
   <li>Michele Marchetto: <i>OpenRIPD</i>
   </ul>
  <p>
+ Also present will be jcs, krw, mglocker, robert, wvdputte, martin, reyk, grunk,
+ dhartmei, aanriot, sturm, and bernd.  Of course there will be an OpenBSD booth
+ run by the usual suspects and you can buy our CD-ROMS, the audio CD and other
+ stuff.
+ <p>
  
  <li><strong><a name=23c3></a>
  <a href="https://events.ccc.de/congress/2006/">23C3 Chaos Communication Congress in
***************
*** 2104,2110 ****
  <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.567 2006/11/10 20:16:49 pedro Exp $</small>
  
  </body>
  </html>
--- 2111,2117 ----
  <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.568 2006/11/19 19:00:03 mbalmer Exp $</small>
  
  </body>
  </html>