===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** www/events.html	1998/11/02 09:12:27	1.24
--- www/events.html	1998/11/10 17:55:51	1.25
***************
*** 21,33 ****
  
  <p>
  <li><strong>
- <a href=http://www.asc.unam.mx/disc98>
- DISC - Seguridad en C'omputo 98:
- December 2-7, 1998. Mexico City.</a></strong><br>
- Theo de Raadt will be giving a talk on security auditing.
- 
- <p>
- <li><strong>
  <a href=http://usenix.org/events/lisa98>
  LISA '98: 12th Systems Administration Conference
  December 6-11, 1998. Boston, Massachusetts.</a></strong><br>
--- 21,26 ----
***************
*** 172,187 ****
  At this conference, entirely devoted to IP, Niklas Hallqvist from the
  OpenBSD team held a talk on the IKE (a.k.a ISAKMP/Oakley) key management
  protocol and experiences from the implementation of <strong>isakmpd</strong>,
! an IKE implementation funded by Ericsson Radio Systems developped primarily
! for the OpenBSD IPSEC stack.  Isakmpd will be shipped with OpenBSD after
! 2.4 is released.
  
  </ul>
  
  <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.24 1998/11/02 09:12:27 niklas Exp $</small>
  
  </body>
  </html>
--- 165,187 ----
  At this conference, entirely devoted to IP, Niklas Hallqvist from the
  OpenBSD team held a talk on the IKE (a.k.a ISAKMP/Oakley) key management
  protocol and experiences from the implementation of <strong>isakmpd</strong>,
! an IKE implementation funded by Ericsson Radio Systems and developed
! primarily for the OpenBSD IPSEC stack.  Isakmpd will be shipped with
! OpenBSD after 2.4 is released.
  
+ <p>
+ <li><strong>
+ <a href=http://www.asc.unam.mx/disc98>
+ DISC - Seguridad en C'omputo 98:
+ December 2-7, 1998. Mexico City.</a></strong><br>
+ Theo de Raadt gave a talk about security auditing.
+ 
  </ul>
  
  <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.25 1998/11/10 17:55:51 deraadt Exp $</small>
  
  </body>
  </html>