===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.100
retrieving revision 1.101
diff -c -r1.100 -r1.101
*** www/events.html	2000/06/19 19:36:38	1.100
--- www/events.html	2000/06/25 15:59:58	1.101
***************
*** 25,64 ****
  
  <p>
  <li><strong>
! <a href="reprints/crypto2000.html">
! OpenBSD Crypto 2000 conference.
! June 15 - 20, 2000, Calgary, AB, Canada.</a></strong><p>
! Repeat the tradition of a similar meeting held last year, many
! OpenBSD developers from around the world converge on Calgary
! for a weekend long hack-and-drink session.  Invitation only, sorry.
  
  <p>
  <li><strong>
- <a name=usenix2000>
- <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.
- 
- <ul>
- <p>
- <li>Implementing Internet Key Exchange, IKE.<br>
-     <a href="#usenix2000">Usenix 2000</a>
-     by <a href="mailto:angelos@openbsd.org">Angelos D. Keromytis</a>,
-     <a href="mailto:niklas@openbsd.org">Niklas Hallqvist</a>.
- <p>
- <li>Transparent Network Security Policy Enforcement.<br>
-     <a href="#usenix2000">Usenix 2000</a>
-     by <a href="mailto:angelos@openbsd.org">Angelos D. Keromytis</a>,
-     <a href="mailto:jason@openbsd.org">Jason L. Wright</a>.
- <p>
- <li>Safety Checking of Kernel Extensions.<br>
-     <a href="#usenix2000">Usenix 2000</a>
-     by <a href="mailto:cmetz@openbsd.org">Craig Metz</a>.
- </ul>
- 
- <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>
--- 25,42 ----
  
  <p>
  <li><strong>
! <a href="http://www.linuxtag.de/2000/english/">
! LinuxTag 2000,
! June 29-July 2, 2000. Stuttgart, Germany.</a></strong><p>
! There will be a BSD booth where we'll have the first <a href="27.html">OpenBSD 2.7 CDs</a> for Europe
! and the new blue stitchwork <a href="tshirts.html#11">Blowfish Polo</a> shirt.
! <br>
! Christian Weisgerber will give a
! <a href="http://www.linuxtag.de/2000/english/conference/talks.php3?ID=3">talk
! 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>
***************
*** 504,515 ****
  OpenSSH 2.1.
  <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.100 2000/06/19 19:36:38 reinhard Exp $</small>
  
  </body>
  </html>
--- 482,527 ----
  OpenSSH 2.1.
  <p>
  
+ <li><strong>
+ <a href="reprints/crypto2000.html">
+ OpenBSD Crypto 2000 conference.
+ June 15 - 20, 2000, Calgary, AB, Canada.</a></strong><p>
+ Repeat the tradition of a similar meeting held last year, many
+ OpenBSD developers from around the world converge on Calgary
+ for a weekend long hack-and-drink session.  Invitation only, sorry.
+ 
+ <p>
+ <li><strong>
+ <a name=usenix2000>
+ <a href="http://www.usenix.org/events/usenix2000/">
+ Usenix Annual Technical Conference.
+ June 18-23, 2000. San Diego, California, USA.</a></strong><p>
+ We had a vendor booth, as well as a number of papers being presented.
+ 
+ <ul>
+ <p>
+ <li>Implementing Internet Key Exchange, IKE.<br>
+     <a href="#usenix2000">Usenix 2000</a>
+     by <a href="mailto:angelos@openbsd.org">Angelos D. Keromytis</a>,
+     <a href="mailto:niklas@openbsd.org">Niklas Hallqvist</a>.
+ <p>
+ <li>Transparent Network Security Policy Enforcement.<br>
+     <a href="#usenix2000">Usenix 2000</a>
+     by <a href="mailto:angelos@openbsd.org">Angelos D. Keromytis</a>,
+     <a href="mailto:jason@openbsd.org">Jason L. Wright</a>.
+ <p>
+ <li>Safety Checking of Kernel Extensions.<br>
+     <a href="#usenix2000">Usenix 2000</a>
+     by <a href="mailto:cmetz@openbsd.org">Craig Metz</a>.
+ </ul>
+ <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.101 2000/06/25 15:59:58 wvdputte Exp $</small>
  
  </body>
  </html>