===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.364
retrieving revision 1.365
diff -c -r1.364 -r1.365
*** www/events.html	2005/05/21 00:31:06	1.364
--- www/events.html	2005/05/26 22:26:29	1.365
***************
*** 26,51 ****
  
  <ul>
  
- <li><strong><a name=cuug2005></a>
- <a href="http://www.cuug.ab.ca/">Calgary Unix Users Group</a></strong>,
- May 24, 2005, Calgary, Canada.<br>
- Ryan McBride will speak about OpenBSD's packet filter, PF.
- A broad overview of PF's features will be presented, with special attention
- paid to newer and more unique features and how these can be used together
- effectively for DoS mitigation, high availability, and load balancing.
- <br>
- The other major PF developers will also be in attendance and available to answer
- questions: Bob Beck (Edmonton) who did spamd, Mike Frantzen (USA) who did the
- state engine, Daniel Hartmeier (Switzerland) who started it all, Markus Friedl
- (Germany) who helped develop the grammar, and Henning Brauer (Germany) who
- integrated PF with ALTQ bandwidth shaping and pushed us to fix some early load
- problems, and Theo de Raadt who deleted that non-free Australian junk and
- created the opportunity for this crazy bunch of people to get together.
- <br>
- There will be brand new OpenBSD 3.7 CDs and tshirts and posters for sale
- at this event.....
- <p>
- 
  <li><strong><a name=LinuxwochenVienna2005></a>
  <a href="http://www.linuxwochen.at/">Linuxwochen Vienna 2005</a></strong>,
  May 24 - 27, 2005, Vienna, Austria.<br>
--- 26,31 ----
***************
*** 109,114 ****
--- 89,106 ----
  
  <ul>
  
+ <li><strong><a name=cuug2005></a>
+ <a href="http://www.cuug.ab.ca/">Calgary Unix Users Group</a></strong>,
+ May 24, 2005, Calgary, Canada.<br>
+ Ryan McBride spoke about OpenBSD's packet filter, PF.
+ A broad overview of PF's features were presented, with special attention
+ paid to newer and more unique features and how these can be used together
+ effectively for DoS mitigation, high availability, and load balancing.
+ <br>
+ Approximately 60 OpenBSD developers attended to heckle and participate
+ in a free-for-all question period after the talk.
+ <p>
+ 
  <li><strong><a name=bsdcan2005></a>
  <a href="http://www.bsdcan.org/2005/">BSDCan 2005</a></strong>,
  May 13 - 14, 2005, Ottawa, Canada.<br>
***************
*** 1501,1507 ****
  <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.364 2005/05/21 00:31:06 martin Exp $</small>
  
  </body>
  </html>
--- 1493,1499 ----
  <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.365 2005/05/26 22:26:29 mcbride Exp $</small>
  
  </body>
  </html>