===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.106
retrieving revision 1.107
diff -c -r1.106 -r1.107
*** www/events.html	2000/07/17 17:13:36	1.106
--- www/events.html	2000/07/24 20:18:22	1.107
***************
*** 25,41 ****
  
  <p>
  <li><strong>
! <a href="http://conferences.oreilly.com/oscon2000/">
! O'Reilly Open Source Conference 2000,
! July 17-20, 2000. Monterey, California, USA.</a></strong><p>
! Theo de Raadt will be speaking on 
! <a href="http://www.oreillynet.com/pub/w/bsd_presentations.html">
! Secure By Default.</A>
! Ian Darwin will be presenting a tutorial on
! <a href="http://www.oreillynet.com/pub/w/bsd_tutorials.html">
! Secure Internet Servers/Firewalls with OpenBSD</a>.
! 
  <p>
  <li><strong><a name=sec2000></a>
  <a href="http://www.usenix.org/events/sec2000/">
  Usenix Security. August 14-17, 2000. Denver, Colorado, USA.</a></strong><p>
--- 25,38 ----
  
  <p>
  <li><strong>
! <a href="http://www.defcon.org">
! Defcon 2000. July 28-30, 2000. Las Vegas, Nevada, USA.</a></strong><p>
! Some OpenBSD people will have a table there, and will be selling OpenBSD
! CDROMs and tshirts.  Come stop by the booth.<br>
! At least Theo, Kjell Wooding, some of the Monkeys, and James from
! <a href="http://www.deadly.org">deadly.org</a> will be there.
  <p>
+ 
  <li><strong><a name=sec2000></a>
  <a href="http://www.usenix.org/events/sec2000/">
  Usenix Security. August 14-17, 2000. Denver, Colorado, USA.</a></strong><p>
***************
*** 522,534 ****
  on BSD</a>.
  
  <p>
  
  </dl>
  
  <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.106 2000/07/17 17:13:36 jufi Exp $</small>
  
  </body>
  </html>
--- 519,543 ----
  on BSD</a>.
  
  <p>
+ <li><strong>
+ <a href="http://conferences.oreilly.com/oscon2000/">
+ O'Reilly Open Source Conference 2000,
+ July 17-20, 2000. Monterey, California, USA.</a></strong><p>
+ Kjell Wooding spoke about
+ <a href="http://www.oreillynet.com/pub/w/bsd_presentations.html">
+ Secure By Default.</A>
+ Ian Darwin presented a tutorial on
+ <a href="http://www.oreillynet.com/pub/w/bsd_tutorials.html">
+ Secure Internet Servers/Firewalls with OpenBSD</a>.
  
+ <p>
+ 
  </dl>
  
  <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.107 2000/07/24 20:18:22 deraadt Exp $</small>
  
  </body>
  </html>