===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.214
retrieving revision 1.215
diff -c -r1.214 -r1.215
*** www/events.html	2003/08/20 13:48:00	1.214
--- www/events.html	2003/08/23 20:23:40	1.215
***************
*** 192,198 ****
  <p>
  
  <li><strong><a href="http://www.softwarelivre.rs.gov.br/forum">
! The Annual International Free Software Forum</a></strong>
  May 2-4, Porto Alegre-RS, Brazil<br>
  Mainly a Linux/GNU event, but this year the BSD Operating Systems 
  had a chance to prove their value. 
--- 192,198 ----
  <p>
  
  <li><strong><a href="http://www.softwarelivre.rs.gov.br/forum">
! The Annual International Free Software Forum</a></strong>,
  May 2-4, Porto Alegre-RS, Brazil<br>
  Mainly a Linux/GNU event, but this year the BSD Operating Systems 
  had a chance to prove their value. 
***************
*** 255,261 ****
  <p>
  
  <li><strong>
! <a href=http://www.hal2001.org>HAL 2001</a></strong>,
  Aug, Twente, Netherlands<br>
  Quite a lot of developers were there, we even had our own tent.
  Niels, Rees and Dugsong held talks, more info on the main website
--- 255,261 ----
  <p>
  
  <li><strong>
! <a href="http://www.hal2001.org">HAL 2001</a></strong>,
  Aug, Twente, Netherlands<br>
  Quite a lot of developers were there, we even had our own tent.
  Niels, Rees and Dugsong held talks, more info on the main website
***************
*** 285,291 ****
  <p>
  
  <li><strong>
! <a href="http://www.usenix.org/events/usenix01/">2001 USENIX Annual Technical Conference.</a></strong>,
  Jun 25-30, Boston, USA<br>
  OpenBSD developers were there, selling CD's, T-shirts, etc.
  <p>
--- 285,291 ----
  <p>
  
  <li><strong>
! <a href="http://www.usenix.org/events/usenix01/">2001 USENIX Annual Technical Conference</a></strong>,
  Jun 25-30, Boston, USA<br>
  OpenBSD developers were there, selling CD's, T-shirts, etc.
  <p>
***************
*** 321,327 ****
  <p>
  
  <li><strong>
! <a href="http://www.disc2000.unam.mx/disc/index-ing.html">DISC 2000.</a></strong>,
  Nov 26 - Dec 1, Mexico City, Mexico<br>
  Theo de Raadt explained the security auditing process and subsequent secure
  configuration choices made in OpenBSD, in a talk entitled "Secure by Default".
--- 321,327 ----
  <p>
  
  <li><strong>
! <a href="http://www.disc2000.unam.mx/disc/index-ing.html">DISC 2000</a></strong>,
  Nov 26 - Dec 1, Mexico City, Mexico<br>
  Theo de Raadt explained the security auditing process and subsequent secure
  configuration choices made in OpenBSD, in a talk entitled "Secure by Default".
***************
*** 348,355 ****
  
  <ul>
  <li>The IPsec Architecture in OpenBSD</a><br>
!     <a href="#ipsec2000">IPsec 2000 Global Summit</a>
!     by Niels Provos.<br>
      <a href="papers/ipsec-slides.ps">slides</a>.
  </ul>
  <p>
--- 348,354 ----
  
  <ul>
  <li>The IPsec Architecture in OpenBSD</a><br>
!     <a href="#ipsec2000">IPsec 2000 Global Summit</a> by Niels Provos.<br>
      <a href="papers/ipsec-slides.ps">slides</a>.
  </ul>
  <p>
***************
*** 888,894 ****
  <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.214 2003/08/20 13:48:00 henning Exp $</small>
  
  </body>
  </html>
--- 887,893 ----
  <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.215 2003/08/23 20:23:40 nick Exp $</small>
  
  </body>
  </html>