===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.715
retrieving revision 1.716
diff -c -r1.715 -r1.716
*** www/events.html	2007/11/10 01:40:35	1.715
--- www/events.html	2007/11/11 10:10:30	1.716
***************
*** 42,47 ****
--- 42,54 ----
  
  <ul>
  <p>
+ <li><strong><a name="Paris2008"></a>
+ <a href="http://www.solutionslinux.fr/fr/index.php">Solutions Linux 2008</a>
+ </strong>,
+ Jan 29 - 31, 2008, Paris, France.<br>
+ There will be an OpenBSD booth (for real this year) run by Marc Espie, Saad 
+ Kadhi and Wim with help from many others.
+ <p>
  
  <li><strong><a name="scale6x"></a>
  <a href="http://www.socallinuxexpo.org/scale6x/">Southern California Linux
***************
*** 59,76 ****
  <ul>
  <p>
  
! <li><strong><a name="nluug2007"></a>
! <a href="http://www.nluug25.nl/en/index.php">NLUUG 25th anniversary</a></strong>,
! Nov 7, 2007, Amsterdam, Netherlands<br>
! There will be an OpenBSD and OpenSSH booth with Wim and Otto
  <p>
  
- <li><strong><a name="essen2007"></a>
- <a href="http://www.come2linux.org/psp/">Come 2 Linux 2007 Essen</a></strong>,
- Nov 10 - 11, 2007, Essen, Germany<br>
- The *BSD projects will have an OpenBSD and OpenSSH booth
- <p>
- 
  <li><strong><a name="opencon2007"></a>
  <a href="http://www.opencon.org/">OpenCON 2007</a></strong>
  Nov 30 - Dec 2, 2007, Venice, Italy.<br>
--- 66,78 ----
  <ul>
  <p>
  
! <li><strong><a name="dulug2007"></a>
! <a href="http://www.dulug.de/cgi-bin/dcms.cgi?action=lit">Duisburger Linux User Group</a></strong>,
! Nov 17, 2007, Duisburg, Germany<br>
! Richard Verwayen will give workshop on installing OpenBSD, CDs and documentation
! will be present
  <p>
  
  <li><strong><a name="opencon2007"></a>
  <a href="http://www.opencon.org/">OpenCON 2007</a></strong>
  Nov 30 - Dec 2, 2007, Venice, Italy.<br>
***************
*** 79,84 ****
--- 81,93 ----
  Three days entirely dedicated to OpenBSD with a lot of developers and users.
  <p>
  
+ <li><strong><a name=24c3></a>
+ <a href="http://www.ccc.de/congress/2007/">24C3 Chaos Communication Congress in
+ Berlin</a></strong>,
+ December 27 - 30, 2007, Berlin, Germany.<br>
+ This years motto is Volldampf voraus! (literally Full Steam Ahead)
+ <p>
+ 
  </ul>
  
  <hr>
***************
*** 87,93 ****
--- 96,113 ----
  
  <h3>2007</h3>
  <ul>
+ <li><strong><a name="essen2007"></a>
+ <a href="http://www.come2linux.org/psp/">Come 2 Linux 2007 Essen</a></strong>,
+ Nov 10 - 11, 2007, Essen, Germany<br>
+ The *BSD projects had an OpenBSD and OpenSSH booth
+ <p>
  
+ <li><strong><a name="nluug2007"></a>
+ <a href="http://www.nluug25.nl/en/index.php">NLUUG 25th anniversary</a></strong>,
+ Nov 7, 2007, Amsterdam, Netherlands<br>
+ There was an OpenBSD and OpenSSH booth with Wim, Otto, Floor and Kevin.
+ <p>
+ 
  <li><strong><a name="amsterdam2007"></a>
  <a href="http://undeadly.org/cgi?action=article&sid=20071017100734&mode=expanded&count=20">Amsterdam user meeting Cafe De Deugniet</a></strong>,
  Nov 2, 2007, Amsterdam, Netherlands<br>
***************
*** 2494,2500 ****
  <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.715 2007/11/10 01:40:35 jdixon Exp $</small>
  
  </body>
  </html>
--- 2514,2520 ----
  <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.716 2007/11/11 10:10:30 wvdputte Exp $</small>
  
  </body>
  </html>