===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.509
retrieving revision 1.510
diff -c -r1.509 -r1.510
*** www/events.html	2006/07/01 18:33:36	1.509
--- www/events.html	2006/07/08 12:35:06	1.510
***************
*** 41,54 ****
  <h3>2006</h3>
  
  <ul>
  
! <li><strong><a name="lsm2006"></a>
! <a href="http://www.rmll.info">Libre Software Meeting 2006</a></strong>,
! Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.<br>
! There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
! suspects, with the help of Alexandre and Serge Basterot.
  <p>
  
  <li><strong><a name="opencon2006"</a>
  <a href="http://www.opencon.org/">OpenCON 2006</a></strong>
  Dec 2 - 3, 2006, Venice Gateway for Science and Technology (VEGA),
--- 41,98 ----
  <h3>2006</h3>
  
  <ul>
+ <li><strong><a name=coimbra2006></a>
+ <a href="http://www.openbsd-pt.com/eventos/coimbra06/">Portuguese OpenBSD Usergroup Meeting</a></strong>,
+ Jul 22 - 23, 2005, Coimbra, Portugal.<br>
+ 6th Meeting of the Portuguese OpenBSD Usergroup. 
+ <p>
  
! <li><strong><a name=ChaosdaysDarmstadt2006></a>
! <a href="http://www.chaos-darmstadt.de/">Chaosdays in Darmstadt 2006</a>
! </strong>,
! Sep 2 - 3, 2006, Darmstadt, Germany.<br>
! There will be an OpenBSD and OpenSSH booth.
  <p>
  
+ <li><strong><a name=LinuxKongress2006></a>
+ <a href="http://www.linux-kongress.org/2006">Linux Kongress 2006</a></strong>,
+ Sep 5 - 8, 2006, Nürnberg, Germany.<br>
+ There will be an OpenBSD and OpenSSH booth.
+ <p>
+ 
+ <li><strong><a name=come2linux2006></a>
+ <a href="http://www.come2linux.org/psp/">Come 2 Linux 2006</a></strong>,
+ Sep 9 - 10, 2006, Duisburg-Essen, Germany.<br>
+ There will be an OpenBSD and OpenSSH booth.
+ <p>
+ 
+ <li><strong><a name=aldil2006></a>
+ <a href="http://www.aldil.org/">Les Journ&eacute;es Du Logiciel Libre
+ 2006</a></strong>,
+ Oct 13 - 14, 2005, Lyon, France.<br>
+ There will OpenBSD and OpenSSH booth, run by Alexandre Anriot with the
+ help of Thierry Thomas and some more potential guests.
+ <p>
+ 
+ <li><strong><a name=systems2006></a>
+ <a href="http://www.systems.de/">Systems</a></strong>, 
+ Oct 23 - 27, 2006, Munich, Germany <br>
+ There will be an OpenBSD and OpenSSH booth, volunteers needed.
+ <p>
+ 
+ <li><strong><a name=linuxworlduk2006></a>
+ <a href="http://www.linuxworldexpo.co.uk/">LinuxWorld Expo UK 2006</a></strong>,
+ Oct 25 - 26, 2005, Olympia, London, UK.<br>
+ There will be an OpenBSD and OpenSSH booth, run by Wim.
+ <p>
+ 
+ <li><strong><a name=linuxworldexpogermany2006></a>
+ <a href="http://www.linuxworldexpo.de/">Linux World Expo Germany</a></strong>,
+ Nov 14 - 16, 2005, Köln, Germany.<br>
+ There will be an OpenBSD and OpenSSH booth, run by
+ <a href="mailto:wim@openbsd.org">Wim</a> and usual suspects.
+ <p>
+ 
  <li><strong><a name="opencon2006"</a>
  <a href="http://www.opencon.org/">OpenCON 2006</a></strong>
  Dec 2 - 3, 2006, Venice Gateway for Science and Technology (VEGA),
***************
*** 58,63 ****
--- 102,115 ----
  Wim and the usual suspects.
  <p>
  
+ <li><strong><a name=23c3></a>
+ <a href="http://www.ccc.de/congress/2006/">23C3 Chaos Communication Congress in
+ Berlin</a></strong>,
+ December 27 - 30, 2005, Berlin, Germany.<br>
+ Who can you trust? Wel, us. OpenBSD will be there, of course, for our annual
+ closing event.
+ <p>
+ 
  </ul>
  
  <hr>
***************
*** 67,72 ****
--- 119,131 ----
  <h3>2006</h3>
  <ul>
  
+ <li><strong><a name="lsm2006"></a>
+ <a href="http://www.rmll.info">Libre Software Meeting 2006</a></strong>,
+ Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.<br>
+ There was an OpenBSD and OpenSSH booth, run by Wim, Alexandre, Matthieu and
+ Serge Basterot.
+ <p>
+ 
  <li><strong><a name=FrOSCon></a>
  <a href="http://www.froscon.de/">
  FrOSCon 2006 - Free and Open Source Software Conference</a></strong>,
***************
*** 1978,1984 ****
  <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.509 2006/07/01 18:33:36 aanriot Exp $</small>
  
  </body>
  </html>
--- 2037,2043 ----
  <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.510 2006/07/08 12:35:06 wvdputte Exp $</small>
  
  </body>
  </html>