===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- www/events.html	2005/10/27 12:20:02	1.419
+++ www/events.html	2005/10/27 18:50:17	1.420
@@ -28,26 +28,6 @@
 
 <ul>
 
-<li><strong><a name=cafeconf2005></a>
-<a href="http://www.cafeconf.org/">CaFeConf 2005,
-4tas Jornadas Abiertas de GNU/Linux y Software Libre</a></strong>,
-Oct 13 - 15, 2005, Buenos Aires, Argentina<br>
-CaFeConf 2005 is the anual event of CaFeLUG - Free Software Users
-Group of Capital Federal, Argentina. This year the event will feature
-116 presentations consisting of talks, tutorials, and workshops. The
-event will also be broadcasted on the Internet. Entrance is free, but
-registration is mandatory.<br>
-Fernando Gont will be giving a talk on
-<a href="http://www.cafeconf.org/modules/myconference/viewspeech.php?sid=147&cid=20">
-ICMP attacks against TCP</a>,
-in which he will give an overview of the attacks, the possible
-counter-measures, and the politics of vulnerabilities, and a talk on
-<a href="http://www.cafeconf.org/modules/myconference/viewspeech.php?sid=173&cid=20">
-Fixing the vulnerability of the Path-MTU Discovery mechanism</a>,
-in which he will explain how OpenBSD fixed the vulnerability of the PMTUD
-mechanism.
-<p>
-
 <li><strong><a name=systems2005></a>
 <a href="http://www.systems.de/">Systems</a></strong>, 
 Oct 24 - 28, 2005, Munich, Germany <br>
@@ -135,8 +115,9 @@
 stateful failover with CARP and pfsync and a talk on wireless security in 
 a corporate environment using authpf and isakmpd.  Peter Hansteen gave a
 <a href="http://www.bgnett.no/~peter/pf/">Firewalling with PF</a> tutorial.
-Damien Miller presented on the approach to secure software portability used
-by portable OpenSSH, Reyk Flöter gave a talk on the current state of wireless
+Damien Miller presented on the approach to
+<a href="papers/auug2005-portability">secure software portability used
+by portable OpenSSH</a>, Reyk Flöter gave a talk on the current state of wireless
 support in OpenBSD and David Purdue introduced OpenBSD's spamd tarpit.
 Most of the Australian OpenBSD developers and many users were present.
 <p>
@@ -149,6 +130,26 @@
 help of Thierry Thomas.
 <p>
 
+<li><strong><a name=cafeconf2005></a>
+<a href="http://www.cafeconf.org/">CaFeConf 2005,
+4tas Jornadas Abiertas de GNU/Linux y Software Libre</a></strong>,
+Oct 13 - 15, 2005, Buenos Aires, Argentina<br>
+CaFeConf 2005 is the anual event of CaFeLUG - Free Software Users
+Group of Capital Federal, Argentina. This year the event featured
+116 presentations consisting of talks, tutorials, and workshops. The
+event was also broadcasted on the Internet. Entrance was free, but
+registration was mandatory.<br>
+Fernando Gont gave a talk on
+<a href="http://www.cafeconf.org/modules/myconference/viewspeech.php?sid=147&cid=20">
+ICMP attacks against TCP</a>,
+in which he gave an overview of the attacks, the possible
+counter-measures, and the politics of vulnerabilities, and a talk on
+<a href="http://www.cafeconf.org/modules/myconference/viewspeech.php?sid=173&cid=20">
+Fixing the vulnerability of the Path-MTU Discovery mechanism</a>,
+in which explained how OpenBSD fixed the vulnerability of the PMTUD
+mechanism.
+<p>
+
 <li><strong><a name=linuxkongress2005></a>
 <a href="http://www.linux-kongress.org/">12th International Linux System 
 Technology Conference</a></strong>,
@@ -1698,7 +1699,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.419 2005/10/27 12:20:02 djm Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.420 2005/10/27 18:50:17 deraadt Exp $</small>
 
 </body>
 </html>