===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.373
retrieving revision 1.374
diff -c -r1.373 -r1.374
*** www/events.html	2005/06/27 22:10:41	1.373
--- www/events.html	2005/07/02 12:07:23	1.374
***************
*** 26,49 ****
  
  <ul>
  
- <li><strong><a name=recon2005></a>
- <a href="http://www.recon.cx/">REcon 2005</a></strong>,
- June 17 - 19, 2005, Montreal, Canada.<br>
- Ryan McBride will be giving a talk on Network Stack Randomness at this
- security conference; expect to find a number of other OpenBSD developers
- in attendance.
- <p>
- 
- <li><strong><a name=uofa-cc2005></a> <a
- href="http://www.ualberta.ca/CC2005"> University of Alberta, Campus
- Computing 2005</a></strong>, June 21, 2005, Edmonton, Canada<br> Ryan
- McBride will speak about OpenBSD's packet filter, PF, with CARP and
- failover examples. Local color and examples at the U of A shown by Bob
- Beck. Bob Beck will speak about PF and Spamd, as well as several other
- OpenBSD using and related talks at this event, which primarily focuses
- on activities centered at the University of Alberta.
- <p>
- 
  <li><strong><a name=lsm2005></a>
  <a href="http://2005.rencontresmondiales.org/sections/index_html/switchLanguage/en">Libre Software Meeting 2005</a></strong>,
  July 5 - 9, 2005, Dijon, France.<br>
--- 26,31 ----
***************
*** 99,104 ****
--- 81,104 ----
  
  <ul>
  
+ <li><strong><a name="uofa-cc2005"></a>
+ <a href="http://www.ualberta.ca/CC2005"> University of Alberta, Campus
+ Computing 2005</a></strong>, June 21, 2005, Edmonton, Canada.<br>
+ Ryan McBride spoke about OpenBSD's packet filter, PF, with CARP and
+ failover examples. Local color and examples at the U of A shown by Bob
+ Beck. Bob Beck spoke about PF and Spamd, as well as several other
+ OpenBSD using and related talks at this event, which primarily focuses
+ on activities centered at the University of Alberta.
+ <p>
+ 
+ <li><strong><a name="recon2005"></a>
+ <a href="http://www.recon.cx/">REcon 2005</a></strong>,
+ June 17 - 19, 2005, Montreal, Canada.<br>
+ Ryan McBride gave a talk on Network Stack Randomness at this
+ security conference; a number of other OpenBSD developers
+ were in attendance.
+ <p>
+ 
  <li><strong><a name=LinuxTag2005></a>
  <a href="http://www.linuxtag.org">LinuxTag 2005</a></strong>,
  June 22 - 25, 2005, Karlsruhe, Germany.<br>
***************
*** 1533,1539 ****
  <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.373 2005/06/27 22:10:41 wvdputte Exp $</small>
  
  </body>
  </html>
--- 1533,1539 ----
  <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.374 2005/07/02 12:07:23 grunk Exp $</small>
  
  </body>
  </html>