===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.82
retrieving revision 1.83
diff -c -r1.82 -r1.83
*** www/events.html	2000/02/29 22:12:38	1.82
--- www/events.html	2000/04/08 22:56:29	1.83
***************
*** 40,45 ****
--- 40,57 ----
  We have a vendor booth, as well as a number of papers being presented.
  (More information on the papers at a later time).
  
+ <p>
+ <li><strong>
+ <a href="http://conferences.oreilly.com/oscon2000/">
+ O'Reilly Open Source Conference 2000,
+ July 17-20, 2000. Monterrey, California, USA.</a></strong><p>
+ Theo de Raadt will be speaking on 
+ <a href="http://conferences.oreilly.com/oscon2000/sessions/bsd.html#459">
+ Security By Default.</A>
+ Ian Darwin will be presenting a tutorial on
+ <a href="http://conferences.oreilly.com/oscon2000/tutorials/bsd.html#264">
+ Secure Internet Servers/Firewalls with OpenBSD</a>.
+ 
  </dl>
  
  <hr>
***************
*** 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>
--- 438,444 ----
  <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.83 2000/04/08 22:56:29 ian Exp $</small>
  
  </body>
  </html>