===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.576
retrieving revision 1.577
diff -c -r1.576 -r1.577
*** www/events.html	2006/12/02 14:27:01	1.576
--- www/events.html	2006/12/04 11:12:49	1.577
***************
*** 42,54 ****
  
  <ul>
  
  <li><strong><a name="opencon2006"></a>
  <a href="http://www.opencon.org/">OpenCON 2006</a></strong>,
  Dec 2 - 3, 2006, <a href="http://www.riminiturismo.com/metha/scheda.asp?idHotel=16&lang=uk">CourtYard Venice</a> 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>
--- 42,73 ----
  
  <ul>
  
+ <li><strong><a name=23c3></a>
+ <a href="https://events.ccc.de/congress/2006/">23C3 Chaos Communication Congress in
+ Berlin</a></strong>,
+ December 27 - 30, 2006, Berlin, Germany.<br>
+ Who can you trust? Well, us. OpenBSD will be there, of course, for our annual
+ closing event.  fkr, grunk, jsg, mbalmer, mickey, reyk, sturm, uwe, and
+ wvdputte will be
+ there to chat with you and discuss OpenBSD stuff.  More OpenBSD developers will
+ likely step in.
+ <p>
+ </ul>
+ 
+ <hr>
+ 
+ <h2>Past events:</h2>
+ 
+ <h3>2006</h3>
+ <ul>
+ 
  <li><strong><a name="opencon2006"></a>
  <a href="http://www.opencon.org/">OpenCON 2006</a></strong>,
  Dec 2 - 3, 2006, <a href="http://www.riminiturismo.com/metha/scheda.asp?idHotel=16&lang=uk">CourtYard Venice</a> Airport, Tessera/Venice - Italy<br>
  OpenCON is the only conference dedicated solely to OpenBSD.
! Most talks were by OpenBSD developers, but there was also an impressive
  number of our developers just attending the conference.  Talks by OpenBSD
! developers were:
  <p>
   <ul>
   <li>Claudio Jeker: <i>Network changes in OpenBSD</i>
***************
*** 61,91 ****
   <li>Reyk Floeter: <i>IPsec demystified</i>
   </ul>
  <p>
! Also present will be jcs, krw, mglocker, robert, wvdputte, martin, 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
- Berlin</a></strong>,
- December 27 - 30, 2006, Berlin, Germany.<br>
- Who can you trust? Well, us. OpenBSD will be there, of course, for our annual
- closing event.  fkr, grunk, jsg, mbalmer, mickey, reyk, sturm, uwe, and
- wvdputte will be
- there to chat with you and discuss OpenBSD stuff.  More OpenBSD developers will
- likely step in.
- <p>
- </ul>
- 
- <hr>
- 
- <h2>Past events:</h2>
- 
- <h3>2006</h3>
- <ul>
- 
  <li><strong><a name=opensourcetag2006></a>
  <a href="http://www.opensourcetag.de/2006/">OpenSourceTag 2006</a></strong>,
  Nov 30, 2006, Hannover, Germany.<br>
--- 80,91 ----
   <li>Reyk Floeter: <i>IPsec demystified</i>
   </ul>
  <p>
! Also present were jcs, krw, mglocker, robert, wvdputte, martin, grunk,
! dhartmei, aanriot, sturm, and bernd.  Of course there was an OpenBSD booth
! run by the usual suspects and you could buy our CD-ROMS, the audio CD and other
  stuff.
  <p>
  
  <li><strong><a name=opensourcetag2006></a>
  <a href="http://www.opensourcetag.de/2006/">OpenSourceTag 2006</a></strong>,
  Nov 30, 2006, Hannover, Germany.<br>
***************
*** 2121,2127 ****
  <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.576 2006/12/02 14:27:01 mbalmer Exp $</small>
  
  </body>
  </html>
--- 2121,2127 ----
  <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.577 2006/12/04 11:12:49 mbalmer Exp $</small>
  
  </body>
  </html>