[BACK]Return to events.html CVS log [TXT][DIR] Up to [local] / www

Diff for /www/events.html between version 1.256 and 1.257

version 1.256, 2004/07/12 19:12:30 version 1.257, 2004/07/14 02:34:30
Line 26 
Line 26 
   
 <ul>  <ul>
   
 <li><strong><a name=LinuxTag2004></a>  
 <a href="http://www.linuxtag.org">LinuxTag 2004</a></strong>,  
 June 23 - 26, 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>,  
 July 6 - 10, 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=auug2004></a>  <li><strong><a name=auug2004></a>
 <a href="http://www.auug.org.au/events/2004/auug2004/">Auug 2004</a></strong>,  <a href="http://www.auug.org.au/events/2004/auug2004/">Auug 2004</a></strong>,
 Aug 29 - Sep 3, 2004, Melbourne, Australia.<br>  Aug 29 - Sep 3, 2004, Melbourne, Australia.<br>
Line 117 
Line 103 
   
 <ul>  <ul>
   
   <li><strong><a name=LSM2004></a>
   <a href="http://lsm.abul.org">Libre Software Meeting</a></strong>,
   July 6 - 10, 2004, Bordeaux, France.<br>
   There was an OpenBSD and OpenSSH booth, run by
   <a href="mailto:wim@openbsd.org">Wim Vandeputte</a>.
   <p>
   
   <li><strong><a name=LinuxTag2004></a>
   <a href="http://www.linuxtag.org">LinuxTag 2004</a></strong>,
   June 23 - 26, 2004, Karlsruhe, Germany.<br>
   There was an OpenBSD and OpenSSH booth, run by
   <a href="mailto:wim@openbsd.org">Wim Vandeputte</a>.
   <p>
   
 <li><strong>OpenBSD c2k4 "Hackathon"</strong>,  <li><strong>OpenBSD c2k4 "Hackathon"</strong>,
 June 19 - 27, 2004, Calgary, Canada<br>  June 19 - 27, 2004, Calgary, Canada<br>
 Over 45 developers congregated in Calgary for a 9 day long development  Over 45 developers congregated in Calgary for a 9 day long development
Line 126 
Line 126 
 <li><strong><a name=LinuxwochenVienna2004></a>  <li><strong><a name=LinuxwochenVienna2004></a>
 <a href="http://www.linuxwochen.at/">Linuxwochen Vienna 2004</a></strong>,  <a href="http://www.linuxwochen.at/">Linuxwochen Vienna 2004</a></strong>,
 May 26 - 29, 2004, Vienna, Austria.<br>  May 26 - 29, 2004, Vienna, Austria.<br>
   
 The Linuxwochen 2004 tour stopped in the MuseumsQuartier, Vienna.  The Linuxwochen 2004 tour stopped in the MuseumsQuartier, Vienna.
 Wim Vandeputte and Reinhard Sammer ran the OpenBSD booth. Michael Bauer  Wim Vandeputte and Reinhard Sammer ran the OpenBSD booth. Michael Bauer
 and Teemu Schaabl from the <a href="http://www.cngw.org/">CNGW</a> gave  and Teemu Schaabl from the <a href="http://www.cngw.org/">CNGW</a> gave
Line 136 
Line 135 
 <li><strong><a name=BSDCan2004></a>  <li><strong><a name=BSDCan2004></a>
 <a href="http://www.bsdcan.org/">BSDCan 2004</a></strong>,  <a href="http://www.bsdcan.org/">BSDCan 2004</a></strong>,
 May 13 - 16, 2004, Ottawa, Canada.<br>  May 13 - 16, 2004, Ottawa, Canada.<br>
   
 BSDCan was held at the University of Ottawa.  Ryan McBride gave a talk  BSDCan was held at the University of Ottawa.  Ryan McBride gave a talk
 about newer features in pf, focusing on the redundancy provided by CARP  about newer features in pf, focusing on the redundancy provided by CARP
 and pfsync.  Theo de Raadt presented a revised version of his talk on  and pfsync.  Theo de Raadt presented a revised version of his talk on
Legend:
Removed from v.1.256  
changed lines
  Added in v.1.257