===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- www/events.html	2000/05/12 07:18:00	1.95
+++ www/events.html	2000/05/19 02:14:51	1.96
@@ -25,12 +25,11 @@
 
 <p>
 <li><strong>
-<a href="http://www.converge2000.com">
-CONVERGENCE 2000.
-May 18, 2000. Convention Centre, Calgary, Alberta, Canada.</a></strong><p>
-Theo de Raadt will be participating in a panel discussion about
-the pros and cons to using Open Source software in various business
-environments.
+<a href="http://www.manlug.mcc.ac.uk/calendar.html">
+OpenBSD : The Open Source Secure Operating System.
+June 17, 2000, 14:00. Manchester, UK.</a></strong><p>
+Sam Smith will give a rundown of features coming in OpenBSD 2.7 and
+OpenSSH 2.1.
 
 <p>
 <li><strong>
@@ -483,13 +482,25 @@
 at this event.  (On a personal note; at this conference Theo realized that three
 leading Network Intrusion Detection System companies use OpenBSD as their
 base operating system: Hiverworld, Network Security Wizards, and NFR).
+<p>
 
+<li><strong>
+<a href="http://www.converge2000.com">
+CONVERGENCE 2000.
+May 18, 2000. Convention Centre, Calgary, Alberta, Canada.</a></strong><p>
+Theo de Raadt participated in a panel discussion about the pros and cons
+to using Open Source software in various business environments.  The local
+users also handed out OpenSSH and OpenBSD posters, and were absolutely
+surprised and amazed by the number of Calgary companies quietly using
+OpenBSD.
+<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.95 2000/05/12 07:18:00 deraadt Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.96 2000/05/19 02:14:51 deraadt Exp $</small>
 
 </body>
 </html>