===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.147
retrieving revision 1.148
diff -c -r1.147 -r1.148
*** www/events.html	2001/07/12 14:53:43	1.147
--- www/events.html	2001/07/31 14:42:45	1.148
***************
*** 27,46 ****
  <h3>2001</h3>
  
  <li><strong>
! <a href="http://www.defcon.org">DEF CON Nine, July 13-15, Las Vegas, USA</a>
  </strong><br>
! OpenBSD developers and users make it a point to attend every year,
! and will have a table selling CD's, shirts, etc.
  <p>
- 
- <li><strong>
- <a href="http://conferences.oreilly.com/oscon/">O'Reilly Open Source Conference,
- July 23-27, San Diego, California, USA</a>
- </strong><br>
- OpenBSD will have a booth selling CD's, as was done last year.
- Ian Darwin will present his "Firewalls and Secure Internet Servers
- with OpenBSD" tutorial.
- <p>
  </dl>
  
  <hr>
--- 27,38 ----
  <h3>2001</h3>
  
  <li><strong>
! <a href="http://www.BSDConEurope.org">BSDCon Europe, November 2-4, Brighton, UK</a>
  </strong><br>
! The inaugural conference for European BSD users, this event will provide
! a focal point for the many European users and developers of all the BSD
! operating systems. 
  <p>
  </dl>
  
  <hr>
***************
*** 59,64 ****
--- 51,72 ----
  <h3>2001</h3>
  
  <li><strong>
+ <a href="http://conferences.oreilly.com/oscon/">O'Reilly Open Source Conference,
+ July 23-27, San Diego, California, USA</a>
+ </strong><br>
+ OpenBSD had a booth selling CD's, T-shirts, etc.
+ Ian Darwin presented his "Firewalls and Secure Internet Servers
+ with OpenBSD" tutorial.
+ <p>
+ 
+ <li><strong>
+ <a href="http://www.defcon.org">DEF CON Nine, July 13-15, Las Vegas, USA</a>
+ </strong><br>
+ OpenBSD developers and users make it a point to attend every year,
+ and had a table selling CD's, shirts, etc.
+ <p>
+ 
+ <li><strong>
  <a href="http://www.sek.co.kr/sek2001/sek_html/main.htm">Software
  Exhibition of Korea, June 26-29, 2001, Seoul, Korea.</a>
  </strong><br>
***************
*** 668,674 ****
  <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.147 2001/07/12 14:53:43 jason Exp $</small>
  
  </body>
  </html>
--- 676,682 ----
  <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.148 2001/07/31 14:42:45 brian Exp $</small>
  
  </body>
  </html>