===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.81
retrieving revision 1.82
diff -c -r1.81 -r1.82
*** www/events.html	2000/02/28 11:58:06	1.81
--- www/events.html	2000/02/29 22:12:38	1.82
***************
*** 23,28 ****
--- 23,45 ----
  <h2>Future events:</h2>
  <dl>
  
+ <p>
+ <li><strong>
+ <a href="http://www.converge2000.com">
+ CONVERGENCE 2000.
+ May 18, 2000. Convention Centre, Calgary, Alberta, Canada.</a></strong><p>
+ Theo de Raadt will be participating in a panel discussion about
+ the pros and cons to using Open Source software in various business
+ environments.
+ 
+ <p>
+ <li><strong>
+ <a href="http://www.usenix.org/events/usenix2000/">
+ Usenix Annual Technical Conference.
+ June 18-23, 2000. San Diego, California, USA.</a></strong><p>
+ We have a vendor booth, as well as a number of papers being presented.
+ (More information on the papers at a later time).
+ 
  </dl>
  
  <hr>
***************
*** 358,364 ****
  November 7-12, 1999 Seattle, Washington, USA</a></strong><p>
  Bob Beck presented a paper about the U of A's nifty OpenBSD based
  solution to the problem of public Ethernet jacks in the techincal sessions
! starting at 11:00 AM on the 11th. There were many other OpenBSD
  people at this conference as well, as well as a booth selling CDROMs and
  t-shirts.  His paper is available at:<p>
  
--- 375,382 ----
  November 7-12, 1999 Seattle, Washington, USA</a></strong><p>
  Bob Beck presented a paper about the U of A's nifty OpenBSD based
  solution to the problem of public Ethernet jacks in the techincal sessions
! starting at 11:00 AM on the 11th.<br>
! There were many other OpenBSD
  people at this conference as well, as well as a booth selling CDROMs and
  t-shirts.  His paper is available at:<p>
  
***************
*** 388,396 ****
  </a></strong><p>
  Representatives from OpenBSD, BSDi, and FreeBSD hosted a
  &quot;Birds Of a Feather&quot; session at the <a
! href="http://www.linuxworldexpo.com/">New York LinuxWorld Expo</a>.
  There were installation CD-ROMs, free food, and even free Daemon Horns!
  
  <li><strong>
  <a href=http://www.nordu.org/NordU2000/>
  NordU 2000 -- The second EurOpen/USENIX Conference.
--- 406,415 ----
  </a></strong><p>
  Representatives from OpenBSD, BSDi, and FreeBSD hosted a
  &quot;Birds Of a Feather&quot; session at the <a
! href="http://www.linuxworldexpo.com/">New York LinuxWorld Expo</a>.<br>
  There were installation CD-ROMs, free food, and even free Daemon Horns!
  
+ <p>
  <li><strong>
  <a href=http://www.nordu.org/NordU2000/>
  NordU 2000 -- The second EurOpen/USENIX Conference.
***************
*** 407,413 ****
  <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.81 2000/02/28 11:58:06 art Exp $</small>
  
  </body>
  </html>
--- 426,432 ----
  <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.82 2000/02/29 22:12:38 deraadt Exp $</small>
  
  </body>
  </html>