===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- www/events.html	2004/12/20 01:18:35	1.286
+++ www/events.html	2005/01/01 17:49:12	1.287
@@ -22,17 +22,10 @@
 
 <h2>Future events:</h2>
 
-<h3>2004</h3>
+<h3>2005</h3>
 
 <ul>
-<li><strong><a name=21C3></a>
-<a href="http://www.ccc.de/congress/2004/">21C3 - Chaos Communication Congress in Berlin</a></strong>, 
-Dec 27 - 29, 2004, Berlin, Germany</br>
-"The Usual Suspects" will run the BSD corner, somebody will give a talk to
-entertain the crowds and the entire encrypted wifi backbone should run on
-OpenBSD access points. 
-
-
+<li>None yet.<p>
 </ul>
 <hr>
 
@@ -54,6 +47,22 @@
 <h3>2004</h3>
 
 <ul>
+<li><strong><a name=21C3></a>
+<a href="http://www.ccc.de/congress/2004/">21C3 - Chaos Communication Congress</a></strong>,
+Dec 27 - 29, 2004, Berlin, Germany</br>
+&quot;The Usual Suspects&quot; were there and ran the BSD corner, including
+<a href="mailto:wim@kd85.com">Wim</a>,
+Henning Brauer, Marc Balmer, Martin Reindl, Moritz Jodeit, Felix Kronlage,
+Uwe Stuehler, Bernd Ahlers, and Alexander von Gernler.<br>
+Henning gave a talk about OpenBGPD and OpenNTPD
+(<a href="http://bulabula.org/papers/21c3/">slides</a>).<br>
+The WiFi backbone ran on OpenBSD powered
+<a href="http://soekris.kd85.com">Soekris</a> machines as access points,
+work done by Reyk Fl&ouml;ter, Tim Kornau and others.
+This installation was a very successful test of the new
+<a href=http://www.openbsd.org/cgi-bin/man.cgi?query=ath">ath(4)</a>
+driver.
+<p>
 
 <li><strong><a name=icos2004></a>
 <a href="http://www.slat.org/icos/icos04/">ICOS 2004</a></strong>,
@@ -1241,7 +1250,7 @@
 <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.286 2004/12/20 01:18:35 kevlo Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.287 2005/01/01 17:49:12 henning Exp $</small>
 
 </body>
 </html>