===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.417
retrieving revision 1.418
diff -c -r1.417 -r1.418
*** www/events.html	2005/10/20 02:49:04	1.417
--- www/events.html	2005/10/27 12:18:32	1.418
***************
*** 48,65 ****
  mechanism.
  <p>
  
- <li><strong><a name=auug2005></a>
- <a href="http://www.auug.org.au/events/2005/auug2005/">AUUG 2005</a></strong>,
- October 16 - 21, 2005, Sydney, Australia.<br>
- Mark Uemura will give a tutorial on setting up CARP/PF and a talk on wireless
- with authpf.  Peter Hansteen will give a
- <a href="http://www.bgnett.no/~peter/pf/">Firewalling with PF</a> tutorial.
- Damien Miller will talk about writing secure and portable
- programs, Reyk Flöter will talk about the current state of wireless
- support in OpenBSD and David Purdue will give a talk on spamd.
- Many other OpenBSD developers and users are likely to be present.
- <p>
- 
  <li><strong><a name=systems2005></a>
  <a href="http://www.systems.de/">Systems</a></strong>, 
  Oct 24 - 28, 2005, Munich, Germany <br>
--- 48,53 ----
***************
*** 140,145 ****
--- 128,146 ----
  
  <ul>
  
+ <li><strong><a name=auug2005></a>
+ <a href="http://www.auug.org.au/events/2005/auug2005/">AUUG 2005</a></strong>,
+ October 16 - 21, 2005, Sydney, Australia.<br>
+ Mark Uemura presented a tutorial on setting up CARP/PF, a demonstration of 
+ 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
+ support in OpenBSD and David Purdue introduced OpenBSD's spamd tarpit.
+ Most of the Australian OpenBSD developers and many users were present.
+ <p>
+ 
  <li><strong><a name=aldil2005></a>
  <a href="http://www.aldil.org/">Les Journ&eacute;es Du Logiciel Libre
  2005</a></strong>,
***************
*** 1697,1703 ****
  <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.417 2005/10/20 02:49:04 kevlo Exp $</small>
  
  </body>
  </html>
--- 1698,1704 ----
  <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.418 2005/10/27 12:18:32 djm Exp $</small>
  
  </body>
  </html>