===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- www/events.html	2005/09/26 22:28:19	1.409
+++ www/events.html	2005/09/28 20:37:28	1.410
@@ -28,27 +28,6 @@
 
 <ul>
 
-
-<li><strong><a name="gubuginstallfest2005"></a>
-<a href="http://gubug.org/meetings.php">Greater Utah BSD Group 
-Installfest 2005</a></strong>,
-Sept 24, 2005, Sandy, UT, USA.<br/>
-The Greater Utah BSD User Group (http://www.gubug.org/) is pleased to
-announce their first annual BSD Installfest, sponsored by Utah ISP ArosNet.
-There will be handouts, CD-ROMs, technical presentations, and
-fun, plus a chance to get OpenBSD or a related open source BSD operating system
-installed on your computer.
-Admission is free (computers not included in cost of admission).
-Featured speakers will include Dan Langille, organizer of BSDCan.
-<p>
-
-<li><strong><a name=opensourcetag2005></a>
-<a href="http://www.opensourcetag.de/">OpenSourceTag 2005</a></strong>,
-Sept 27, 2005, Hannover, Germany.<br>
-There will be an OpenBSD and OpenSSH booth and Reyk gives a 
-<a href=http://www.opensourcetag.de/agenda/>talk</a> about IT security.
-<p>
-
 <li><strong><a name=linuxworlduk2005></a>
 <a href="http://www.linuxworldexpo.co.uk/">LinuxWorld Expo UK 2005</a></strong>,
 Oct 5 - 6, 2005, Olympia, London, UK.<br>
@@ -90,7 +69,7 @@
 
 <li><strong><a name=opencon2005></a>
 <a href="http://www.opencon.org/">OpenCON 2005</a></strong>,
-November 4 - 6, 2005, San Servolo Island, Venice, Italy.<br>
+Nov 4 - 6, 2005, San Servolo Island, Venice, Italy.<br>
 The only unique conference entirely dedicated to OpenBSD! Check out their
 <a href=http://www.opencon.org/cfp.php>call for papers</a>
 <p>
@@ -104,7 +83,7 @@
 
 <li><strong><a name=eurobsdcon2005></a>
 <a href="http://2005.eurobsdcon.org/">EuroBSDCon 2005</a></strong>,
-November 25 - 27, 2005, Basel, Switzerland.<br>
+Nov 25 - 27, 2005, Basel, Switzerland.<br>
 The EuroBSDCon will be held every year now, so we are looking for
 people who want to help out during the event.<br>
 The program has been published now and includes a 
@@ -154,9 +133,29 @@
 
 <ul>
 
+<li><strong><a name=opensourcetag2005></a>
+<a href="http://www.opensourcetag.de/">OpenSourceTag 2005</a></strong>,
+Sep 27, 2005, Hannover, Germany.<br>
+There was an OpenBSD and OpenSSH booth and Reyk gave a 
+<a href=http://www.opensourcetag.de/agenda/>talk</a> about IT security.
+<p>
+
+<li><strong><a name="gubuginstallfest2005"></a>
+<a href="http://gubug.org/meetings.php">Greater Utah BSD Group 
+Installfest 2005</a></strong>,
+Sep 24, 2005, Sandy, UT, USA.<br/>
+<a href=http://www.gubug.org/>The Greater Utah BSD User Group</a> organised
+their first annual BSD Installfest, sponsored by Utah ISP ArosNet.
+There were handouts, CD-ROMs, technical presentations, and
+fun, plus a chance to get OpenBSD or a related open source BSD operating system
+installed on your computer.
+Admission was free (computers not included in cost of admission).
+Featured speakers will include Dan Langille, organizer of BSDCan.
+<p>
+
 <li><strong><a name="NYCBSDCon2005"></a>
 <a href="http://nycbsdcon.org/">New York City BSD Conference 2005</a></strong>,
-September 17, 2005, NYC, USA.<br>
+Sep 17, 2005, NYC, USA.<br>
 NYCBSDCon was a one day technical conference hosted by the New York
 City *BSD User Group and was held at Columbia University.
 The all day conference included a variety of speakers representing the
@@ -176,7 +175,7 @@
 
 <li><strong><a name=decix160905></a> <a
 href="http://www.de-cix.org/">DE-CIX Technical Meeting</a></strong>,
-September 16, 2005, Schloss Kransberg, near Usingen, Germany.<br>
+Sep 16, 2005, Schloss Kransberg, near Usingen, Germany.<br>
 Henning Brauer, Reyk Fl&ouml;ter and Maxim Salomon had been invited to the
 technical meeting of the Deutsche Commercial Internet Exchange (DE-CIX) again.
 Henning gave an update on OpenBGPD, Reyk talked about a route server project
@@ -188,13 +187,13 @@
 <li><strong><a name="ukuug2005"></a>
 <a href="http://www.ukuug.org/events/linux2005/">UKUUG Linux Technical
 Conference 2005</a></strong>,
-August 4 - 7, 2005, University of Wales, Swansea, UK<br>
+Aug 4 - 7, 2005, University of Wales, Swansea, UK<br>
 Tom Cosgrove gave Theo's presentation about Exploit Mitigation Techniques.
 <p>
 
 <li><strong><a name=wth2005></a>
 <a href="http://www.whatthehack.org/">What the Hack 2005</a></strong>,
-July 28 - 31, 2005, Den Bosch, The Netherlands.<br>
+Jul 28 - 31, 2005, Den Bosch, The Netherlands.<br>
 As every 4 years, Wim organized the
 <a href="http://eurobsd.org/2005-WhatTheHack/">BSD village</a> at this huge
 open air event. There were some talks, Reyk spoke about
@@ -208,7 +207,7 @@
 
 <li><strong><a name=coimbra2005></a>
 <a href="http://www.openbsd-pt.org/eventos/coimbra05/">Portuguese OpenBSD Usergroup Meeting</a></strong>,
-July 23 - 24, 2005, Coimbra, Portugal.<br>
+Jul 23 - 24, 2005, Coimbra, Portugal.<br>
 5th Meeting of the Portuguese OpenBSD Usergroup. Pedro Martelletto gave a talk,
 <a href="http://ambientworks.net/~pedro/coimbra-html/">slides</a>, in
 Portuguese, are available.
@@ -216,7 +215,7 @@
 
 <li><strong><a name="lsm2005"></a>
 <a href="http://2005.rencontresmondiales.org/sections/index_html/switchLanguage/en">Libre Software Meeting 2005</a></strong>,
-July 5 - 9, 2005, Dijon, France.<br>
+Jul 5 - 9, 2005, Dijon, France.<br>
 There was an OpenBSD and OpenSSH booth, run by Wim and the usual
 suspects, with the help of Serge Basterot. It was a nice place to meet
 some of our French, German and Swiss developers, including Marc Balmer,
@@ -225,14 +224,14 @@
 
 <li><strong><a name=LinuxTag2005></a>
 <a href="http://www.linuxtag.org">LinuxTag 2005</a></strong>,
-June 22 - 25, 2005, Karlsruhe, Germany.<br>
+Jun 22 - 25, 2005, Karlsruhe, Germany.<br>
 There was an OpenBSD and OpenSSH booth ran by Wim, Christian Weisgerber, 
 Marc Balmer, Wilhelm Buehler, Robert Nagy, Bernd Ahlers and Phil Schulz.
 <p>
 
 <li><strong><a name="uofa-cc2005"></a>
 <a href="http://www.ualberta.ca/CC2005"> University of Alberta, Campus
-Computing 2005</a></strong>, June 21, 2005, Edmonton, Canada.<br>
+Computing 2005</a></strong>, Jun 21, 2005, Edmonton, Canada.<br>
 Ryan McBride spoke about OpenBSD's packet filter, PF, with CARP and
 failover examples. Local color and examples at the U of A shown by Bob
 Beck. Bob Beck spoke about PF and Spamd, as well as several other
@@ -242,7 +241,7 @@
 
 <li><strong><a name=uemera2005></a>
 <a href="http://www.tokyopc.net">Tokyo PC Users Group</a></strong>,
-Tokyo Union Church in Omotesando at 19:00-21:00, June 2, 2005, Tokyo, Japan.<br>
+Jun 2, 2005, Tokyo Union Church in Omotesando, Tokyo, Japan.<br>
 Mark T. Uemura spoke to Japan's largest English speaking
 personal computer club.  The talk was entitled
 <a href="http://www.openbsd-support.com/jp/en/htm/mgp/index.shtml">
@@ -304,7 +303,7 @@
 
 <li><strong><a name=libreast2005></a>
 <a href="http://idile.org/libreast/">Libr'east 2005</a></strong>,
-April 22-24, Marne La Vallée, near Paris, France<br>
+Apr 22-24, Marne La Vallée, near Paris, France<br>
 There was an OpenBSD booth (Wim + Miod + Marc)
 Marc Espie did talk about recent OpenBSD advances, and his ports and
 packages work in front of about 30 people.
@@ -312,7 +311,7 @@
 
 <li><strong><a name=decix150405></a> <a
 href="http://www.de-cix.org/">DE-CIX Technical Meeting</a></strong>,
-April 15, 2005, near Usingen, Germany.<br>
+Apr 15, 2005, near Usingen, Germany.<br>
 Henning Brauer and Reyk Fl&ouml;ter had been invited to the technical
 meeting of the Deutsche Commercial Internet Exchange (DE-CIX). Henning
 presented his talk on OpenBGPD, about 60 people, mostly operators from
@@ -322,7 +321,7 @@
 
 <li><strong><a name=nuug140405></a>
 <a href="http://www.nuug.no/aktiviteter/20050414-pf-brannmur/">Firewalling with PF at NUUG</a></strong>,
-April 14, 2005, Oslo, Norway.<br>
+Apr 14, 2005, Oslo, Norway.<br>
 Peter N. M. Hansteen gave a firewalling with PF talk - which hopefully
 gave you some ideas about how to control your network traffic the
 way you want - keeping some things outside your network, directing
@@ -338,7 +337,7 @@
 <li><strong><a name=usenix2005></a>
 
 <a href="http://www.usenix.org/events/usenix05/">Usenix Annual
-Technical Conference</a></strong>, April 10-15, 2005, Anaheim,
+Technical Conference</a></strong>, Apr 10-15, 2005, Anaheim,
 California, USA.<br> Marius Eriksen gave the OpenBSD update at the BSD
 super BoF.  The update was well received and people were quite
 sympathetic towards the ongoing efforts of the OpenBSD project to
@@ -349,13 +348,13 @@
 
 <li><strong><a name=fhwedel130405></a>
 <a href="http://www.fh-wedel.de/">FH Wedel invited talk</a></strong>,
-April 13, 2005, 17:00, H&ouml;rsaal 5, FH Wedel, Hamburg, Germany.<br>
+Apr 13, 2005, 17:00, H&ouml;rsaal 5, FH Wedel, Hamburg, Germany.<br>
 Henning Brauer spoke on OpenBGPD. More than 40 people were in attendance.
 <p>
 
 <li><strong><a name=plug080405></a>
 <a href="http://www.plugfr.org/">Provence Linux User Group</a></strong>,
-April 08, 2005, 20:00, PLUG, "La Vie de Quartier", 1, rue Antoine PONS
+Apr 08, 2005, 20:00, PLUG, "La Vie de Quartier", 1, rue Antoine PONS
 13004, Marseille, France.<br>
 Alexandre Anriot from the OpenBSD french translation team spoke 
 about OpenBSD and associated projects (OpenBGPD etc.) during a
@@ -365,7 +364,7 @@
 
 <li><strong><a name=bcs2005></a>
 <a href="http://www.bellua.com/bcs2005/asia05.index.html">Bellua Cyber Security Asia 2005</a></strong>,
-March 21-24, 2005, Jakarta, Indonesia.<br>
+Mar 21-24, 2005, Jakarta, Indonesia.<br>
 Ryan McBride presented an overview of PF which
 discussed how its advanced features work together in some important
 applications and compared PF with the other major commercial and open
@@ -584,14 +583,14 @@
 
 <li><strong><a name=SANE2004></a>
 <a href="http://www.nluug.nl/events/sane2004/bazaar.html">SANE 2004</a></strong>
-, Sept 29, 2004, Amsterdam, Netherlands.<br>
+, Sep 29, 2004, Amsterdam, Netherlands.<br>
 There was an OpenBSD and OpenSSH booth, run by
 <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>
+Sep 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
@@ -608,7 +607,7 @@
 
 <li><strong><a name=Sucon2004></a>
 <a href="http://www.suug.ch/sucon/04/">SUCON 2004</a></strong>,
-Sept 2 - 4, 2004, Zurich, Switzerland.<br>
+Sep 2 - 4, 2004, Zurich, Switzerland.<br>
 There was an OpenBSD and OpenSSH booth. Very nice conference.
 Henning's slides from his talks about
 <a href="http://bulabula.org/papers/sucon04/bgpd">bgpd</a> and
@@ -630,20 +629,20 @@
 
 <li><strong><a name=LSM2004></a>
 <a href="http://lsm.abul.org">Libre Software Meeting</a></strong>,
-July 6 - 10, 2004, Bordeaux, France.<br>
+Jul 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>
+Jun 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>,
-June 19 - 27, 2004, Calgary, Canada<br>
+Jun 19 - 27, 2004, Calgary, Canada<br>
 Over 45 developers congregated in Calgary for a 9 day long development
 session.
 <p>
@@ -758,7 +757,7 @@
 
 <li><strong><a name=Pacsec2003></a>
 <a href="http://pacsec.jp/">Pacsec 2003</a></strong>,
-November 6 - 7, 2003, Tokyo, Japan.<br>
+Nov 6 - 7, 2003, Tokyo, Japan.<br>
 Three OpenBSD developers presented on various topics. Theo de Raadt
 gave a presentation on Exploit Mitigation Techniques
 <a href="papers/pacsec03/e/index.html">(English)</a>
@@ -1670,7 +1669,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.409 2005/09/26 22:28:19 niallo Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.410 2005/09/28 20:37:28 wvdputte Exp $</small>
 
 </body>
 </html>