===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.292
retrieving revision 1.293
diff -c -r1.292 -r1.293
*** www/events.html	2005/01/20 22:38:52	1.292
--- www/events.html	2005/02/04 21:49:02	1.293
***************
*** 25,38 ****
  <h3>2005</h3>
  
  <ul>
- <li><strong><a name=Paris2005></a>
- <a href="http://www.solutionslinux.fr/fr/index.php">Solutions Linux 2005</a></strong>,
- Feb 1 - 3, 2005, Paris, France.<br>
- An OpenBSD booth as well as an OpenSSH booth will be present. If you
- want to help, please send an email to
- <a href="mailto:saad@openbsd.org">Saad Kadhi</a>.
- <p>
- 
  <li><strong><a name=FFG2005></a>
  <a href="http://www.guug.de/veranstaltungen/ffg2005/">GUUG FFG 2005</a></strong>,
  Feb 22 - 25, 2005, Munich, Germany.<br>
--- 25,30 ----
***************
*** 72,77 ****
--- 64,82 ----
  <h3>2004</h3>
  
  <ul>
+ <li><strong><a name=Paris2005></a>
+ <a href="http://www.solutionslinux.fr/fr/index.php">Solutions Linux 2005</a></strong>,
+ Feb 1 - 3, 2005, Paris, France.<br>
+ An OpenBSD booth as well as an OpenSSH booth were present. These booths
+ were run by Marc Espie, Miod Vallat, Saad Kadhi and Wim with help from
+ Guillaume Arcas and Christophe Plasschaert, two members of the OpenBSD
+ french translation team. Marc Espie and Saad Kadhi gave a talk about the
+ OpenBSD project with a special focus on the ports collection and Packet
+ Filter. Slides will be available soon. several demonstrations of <a
+ href="http://soekris.kd85.com/">Soekris</a> machines running OpenBSD
+ were given by Saad Kadhi and Wim.
+ <p>
+ 
  <li><strong><a name=21C3></a>
  <a href="http://www.ccc.de/congress/2004/">21C3 - Chaos Communication Congress</a></strong>,
  Dec 27 - 29, 2004, Berlin, Germany</br>
***************
*** 1275,1281 ****
  <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.292 2005/01/20 22:38:52 saad Exp $</small>
  
  </body>
  </html>
--- 1280,1286 ----
  <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.293 2005/02/04 21:49:02 saad Exp $</small>
  
  </body>
  </html>