===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.327
retrieving revision 1.328
diff -c -r1.327 -r1.328
*** www/events.html	2005/03/17 16:34:02	1.327
--- www/events.html	2005/03/20 17:58:01	1.328
***************
*** 60,65 ****
--- 60,81 ----
  Ryan McBride on Network Stack Randomness and Reyk Flöter
  on WLAN in OpenBSD and the free ath(4) HAL.
  Expect to find other OpenBSD developers in attendance as well.
+ <p>
+ 
+ <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.
+ <p>
+ The other major PF developers will also be in attendance and available to answer
+ questiongs: 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.
  </ul>
  
  <hr>
***************
*** 1376,1382 ****
  <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.327 2005/03/17 16:34:02 henning Exp $</small>
  
  </body>
  </html>
--- 1392,1398 ----
  <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.328 2005/03/20 17:58:01 mcbride Exp $</small>
  
  </body>
  </html>