===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- www/events.html	2001/12/02 15:33:41	1.157
+++ www/events.html	2001/12/05 10:34:25	1.158
@@ -27,7 +27,8 @@
 <h3>2001</h3>
 
 <li><strong><a href="http://www.usenix.org/events/lisa01/">USENIX LISA 2001, December 2-7, San Diego, California, USA</a></strong><br>
-Niels Provos will be giving a presentation.
+Niels Provos will be giving a presentation, and there will be a booth selling
+tshirts and 3.0 CDs.
 <p>
 
 <li><strong><a href="http://www.ietf.org/meetings/IETF-52.html">52nd IETF, December 9-14, Salt Lake City, Utah, USA</a></strong><br>
@@ -42,8 +43,6 @@
     Place past events in most-recent-first order.
     Make sure you change the tense from future to past when you move an item.
     Use <br> tags instead of <p> to avoid gaps within an item.
-    Thanks
-    louis@openbsd.org
 -->
 
 <h2>Past events:</h2>
@@ -51,6 +50,14 @@
 
 <h3>2001</h3>
 
+<li><strong>
+<a href="http://www.disc2000.unam.mx/disc/index-ing.html">
+DISC 2001. November 26 - 29, 2001. Mexico City, Mexico.</a></strong><br>
+Once again, Theo de Raadt explained the security auditing process and
+subsequent secure configuration choices made in OpenBSD, in a talk
+entitled "Updated thoughts on writing a secure Operating System".
+<p>
+
 <li><strong><a href="http://www.linux.org.hk">LinuxCafe, September 15 2001, Hong Kong, China</a></strong><br>
 Shell Hung gave an introduction for BSD and demonstration of OpenBSD to HKLUG.
 <p>
@@ -58,6 +65,7 @@
 <li><strong>VPN Bakeoff, Finland, August 13-18 2001</strong><br>
 Jakob and Itojun were there.
 <p>
+
 <li><strong>
 <a href=http://www.hal2001.org>HAL 2001. August 2001. Twente, Netherlands</a>
 </strong><br>
@@ -692,7 +700,7 @@
 <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.157 2001/12/02 15:33:41 jakob Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.158 2001/12/05 10:34:25 deraadt Exp $</small>
 
 </body>
 </html>