===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- www/events.html	2004/06/12 18:11:40	1.248
+++ www/events.html	2004/06/22 14:51:31	1.249
@@ -25,7 +25,47 @@
 <h3>2004</h3>
 
 <ul>
-<li>None known..
+<li><strong><a name=LinuxTag2004></a>
+<a href="http://www.linuxtag.org">LinuxTag 2004</a></strong>, 23-26th of June 2004, Karlsruhe, Germany<br>
+There is an OpenBSD and OpenSSH booth, contact <a href="mailto:wim@openbsd.org">Wim</a>.
+<p>
+
+<li><strong><a name=LSM2004></a>
+<a href="http://lsm.abul.org">Libre Software Meeting</a></strong>, 6-10 July 2004, Bordeaux, France<br>
+There is an OpenBSD and OpenSSH booth, contact <a href="mailto:wim@openbsd.org">Wim</a>.
+<p>
+
+<li><strong><a name=Sucon2004></a>
+<a href="http://www.suug.ch/sucon/04/">SuCon 2004</a></strong>, 2-4 September 2004, Zurich, Switserland<br>
+There is an OpenBSD and OpenSSH booth, contact <a href="mailto:wim@openbsd.org">Wim</a>.
+<p>
+
+<li><strong><a name=LinuxKongress2004></a>
+<a href="http://www.linux-kongress.org/2004">Linux Kongress 2004</a></strong>,
+Sept 7 - 10, 2004, Erlangen, Germany.<br>
+From their website: "Linux-Kongress is still the premier event for European
+developers and one of the most important in the world. Each year hundreds of
+hard core Linux enthusiasts from all over the world gather for this important
+event."
+<br>
+Although this is a Linux developers' conference, we will be able to run a
+regular OpenBSD booth there, as known from other events.
+Because there is quite a user community in the Erlangen-Nuremberg area,
+cheap or low-budget accomodations for developers and OpenBSD staff should be
+possible to organize.
+<br>
+If you want to help us working at the booth in Erlangen, please contact
+<a href="mailto:grunk@pestilenz.org">Alexander von Gernler</a>.
+<p>
+
+<li><strong><a name=LinuxWorldExpoGermany2004></a>
+<a href="http://www.linuxworldexpo.de/">Linux World Expo</a></strong>, 26-28 October 2004, Frankfurt, Germany<br>
+There is an OpenBSD and OpenSSH booth, contact <a href="mailto:wim@openbsd.org">Wim</a>.
+<p>
+
+<li><strong><a name=EuroBSDCon2004></a>
+<a href="http://2004.eurobsdcon.org/">EuroBSD Con</a></strong>, 29-31 October 2004, Karlsruhe, Germany</br>
+There is an OpenBSD and OpenSSH booth, contact <a href="mailto:wim@openbsd.org">Wim</a>.
 </ul>
 <hr>
 
@@ -1051,7 +1091,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.248 2004/06/12 18:11:40 deraadt Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.249 2004/06/22 14:51:31 wvdputte Exp $</small>
 
 </body>
 </html>