===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- www/hackathons.html	2013/11/27 01:19:30	1.59
+++ www/hackathons.html	2013/11/27 23:49:09	1.60
@@ -43,15 +43,16 @@
 events.
 <p>
 
-The event space and accommodation is typically funded by the project
-itself (out of direct <a href="donations.html">donations</a>), or the
-<a href="http://www.openbsdfoundation.org">OpenBSD Foundation</a>, but
-most developers pay for their own travel.  The facilities are always
-chosen to be highly economical; generally near Universities or in
-cheaper locales.  If anyone wants to help us <b>FUND ONE OF THESE
-EVENTS</b>, please contact Theo de Raadt (who generally has the most
-knowledge about upcoming options).  Generally finances are more
-interesting, but we will entertain offers for free locations as well.
+The event space and accommodation is typically funded by
+<a href="donations.html">donations to the OpenBSD project</a>, or
+by the <a href="http://www.openbsdfoundation.org">OpenBSD Foundation</a>,
+however most developers pay for their own travel.  The facilities
+are always chosen to be highly economical; generally near Universities
+or in cheaper locales.  If anyone wants to help us <b>FUND ONE OF THESE
+EVENTS OR A DEVELOPER'S TRAVEL</b>, please contact Theo de Raadt (who
+generally has the most knowledge about upcoming options).  General
+financing is more interesting, but we will entertain offers for free
+locations as well.
 <p>
 
 Here are some details about past and future events, also showing
@@ -63,7 +64,7 @@
 
 <table>
 <tr><td bgcolor="#000000" colspan="3"></td>
-<tr valign="bottom">
+<tr valign="top">
 <td>
     <a id="c99"/>
     <font color="#e00000">[No shirt was made for this event]</font><br>
@@ -72,7 +73,6 @@
     Calgary, Alberta<br>
     10 developers<br>
     Funded by Theo de Raadt.
-    <br>
 </td>
 <td>
     <a id="c2k"/>
@@ -93,7 +93,7 @@
     Funded by DARPA.
 </td>
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="c2k1-2"/>
     <font color="#e00000">[No shirt was made for this event]</font><br>
@@ -118,10 +118,10 @@
     May 8 - 20, 2003<br>
     Calgary, Alberta<br>
     51 developers<br>
-    Funded by <a href="https://www.nlnetlabs.nl">NLnet</a>
+    Funded by <a href="https://www.nlnetlabs.nl">NLnet</a>.
 </td>
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="pf2k4" href="images/hackathons/pf2k4.gif">
     <img src="images/hackathons/pf2k4-s.gif"></a><br>
@@ -129,7 +129,7 @@
     Apr 24 - 28, 2004<br>
     Sechelt, BC<br>
     12 developers<br>
-    Funded by <a href=http://www.openbsd.org>OpenBSD</a>.
+    Funded by Ryan McBride.
 </td>
 <td>
     <a id="c2k4" href="images/hackathons/c2k4.gif">
@@ -150,7 +150,7 @@
     Funded by <a href=http://www.openbsd.org>OpenBSD</a>.
 </td>
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="v2k5" href="images/hackathons/v2k5.gif">
     <img src="images/hackathons/v2k5-s.gif"></a><br>
@@ -176,10 +176,10 @@
     Jun 14 - 18, 2006<br>
     Hamburg, Germany<br>
     6 developers<br>
-    <br>
+    Funded by Henning Brauer.
 </td>
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="k2k6" href="images/hackathons/k2k6.gif">
     <img src="images/hackathons/k2k6-s.gif"></a><br>
@@ -187,7 +187,6 @@
     Aug 28 - Sep 1, 2006<br>
     Schloss Kransberg, Germany<br>
     14 developers<br>
-    <br>
 </td>
 <td>
     <a id="p2k6" href="images/hackathons/p2k6.gif">
@@ -205,9 +204,10 @@
     Nov 25 - 30, 2006<br>
     Coimbra, Portugal<br>
     14 developers<br>
-    Funded by <a href=http://www.openbsd.org>OpenBSD</a>.
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a><br>
+    with support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="f2k7" href="images/hackathons/f2k7.gif">
     <img src="images/hackathons/f2k7-s.gif"></a><br>
@@ -235,7 +235,7 @@
     13 developers<br>
     Funded by <a href=http://www.openbsd.org>OpenBSD</a>.
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="h2k7" href="images/hackathons/h2k7.gif">
     <img src="images/hackathons/h2k7-s.gif"></a><br>
@@ -243,7 +243,8 @@
     Nov 22 - 29, 2007<br>
     Coimbra, Portugal<br>
     11 developers<br>
-    Funded by <a href=http://www.openbsd.org>OpenBSD</a>.
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a><br>
+    with support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </td>
 <td>
     <a id="n2k8" href="images/hackathons/n2k8.gif">
@@ -252,7 +253,7 @@
     May 5-10, 2008<br>
     Ito, Japan<br>
     18 developers<br>
-    <br>
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a> and Mark Uemura.
 </td>
 <td>
     <a id="c2k8" href="images/hackathons/c2k8.gif">
@@ -263,7 +264,7 @@
     55 developers<br>
     Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="p2k8" href="images/hackathons/p2k8.gif">
     <img src="images/hackathons/p2k8-s.gif"></a><br>
@@ -271,6 +272,7 @@
     Oct 24 - 31, 2008<br>
     Budapest, Hungary<br>
     13 developers<br>
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a>.
 </td>
 <td>
     <a id="h2k8" href="images/hackathons/h2k8.gif">
@@ -279,6 +281,8 @@
     Nov 20 - 27, 2008<br>
     Coimbra, Portugal<br>
     18 developers<br>
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a>,<br>
+    with support of <a href="http://www.uc.pt">University of Coimbra</a>.
 <td>
     <a id="n2k9" href="images/hackathons/n2k9.gif">
     <img src="images/hackathons/n2k9-s.gif"></a><br>
@@ -287,7 +291,7 @@
     Basel, Switzerland<br>
     19 developers<br>
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="c2k9" href="images/hackathons/c2k9.gif">
     <img src="images/hackathons/c2k9-s.gif"></a><br>
@@ -295,6 +299,7 @@
     May 30 - Jun 7, 2009<br>
     Edmonton, Alberta<br>
     46 developers<br>
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a>.
 </td>
 <td>
     <a id="f2k9" href="images/hackathons/f2k9.gif">
@@ -303,6 +308,7 @@
     Aug 7 - 14, 2009<br>
     Stockholm, Sweden<br>
     14 developers<br>
+    Funded by <a href="https://www.iis.se/english/">.se Foundation</a>.
 </td>
 <td>
     <a id="p2k9" href="images/hackathons/p2k9.gif">
@@ -311,8 +317,9 @@
     Oct 9 - 16, 2009<br>
     Budapest, Hungary<br>
     14 developers<br>
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a><br>.
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="h2k9" href="images/hackathons/h2k9.gif">
     <img src="images/hackathons/h2k9-s.gif"></a><br>
@@ -320,14 +327,20 @@
     Nov 21 - 27, 2009<br>
     Coimbra, Portugal<br>
     15 developers<br>
+    With support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </td>
 <td>
     <a id="n2k10" href="images/hackathons/n2k10.gif">
     <img src="images/hackathons/n2k10-s.gif"></a><br>
+    <br>
+    <br>
+    <br>
+    <br>
     n2k10: Network hackathon<br>
     Jan 9 - 15, 2010<br>
     Melbourne, Australia<br>
     17 developers<br>
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
 </td>
 <td>
     <a id="c2k10" href="images/hackathons/c2k10.gif">
@@ -336,8 +349,9 @@
     Jun 25 - Jul 3, 2010<br>
     Edmonton, Alberta<br>
     46 developers<br>
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>.
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="j2k10" href="images/hackathons/j2k10.gif">
     <img src="images/hackathons/j2k10-s.gif"></a><br>
@@ -353,6 +367,7 @@
     Oct 23 - 29, 2010<br>
     Budapest, Hungary<br>
     19 developers<br>
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a><br>.
 </td>
 <td>
     <a id="k2k11" href="images/hackathons/k2k11.jpg">
@@ -361,8 +376,9 @@
     Apr 1 - 7, 2011<br>
     Hafnarfjordur, Iceland<br>
     15 developers<br>
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>.
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="c2k11" href="images/hackathons/c2k11.gif">
     <img src="images/hackathons/c2k11-s.gif"></a><br>
@@ -370,6 +386,7 @@
     Jul 2 - 9, 2011<br>
     Edmonton, Alberta, Canada<br>
     36 developers<br>
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>.
 </td>
 <td>
     <a id="s2k11" href="images/hackathons/s2k11.jpg">
@@ -378,6 +395,8 @@
     Sep 16 - 23, 2011<br>
     Ljubljana, Slovenia<br>
     25 developers<br>
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>
+    with support from Mitja Muzenic.
 </td>
 <td>
     <a id="a2k11" href="images/hackathons/a2k11.gif">
@@ -386,9 +405,11 @@
     Nov 5 - 12, 2011<br>
     Coimbra, Portugal<br>
     8 developers<br>
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>
+    with support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </td>
 </td></tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="p2k11" href="images/hackathons/p2k11.gif">
     <img src="images/hackathons/p2k11-s.gif"></a><br>
@@ -396,7 +417,6 @@
     Nov 12 - 18, 2011<br>
     Budapest, Hungary<br>
     15 developers<br>
-    <br>
 </td>
 <td>
     <a id="r2k12" href="images/hackathons/r2k12.gif">
@@ -405,7 +425,9 @@
     Apr 10 - 14, 2012<br>
     Paris, France<br>
     16 developers<br>
-    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>
+    and support of <a href="http://www.ihp.fr">Institute Henri Poincaré</a> and<br>
+    <a href="http://www.u-psud.fr"</a>Paris-Sud University</a>.
 </td>
 <td>
     <a id="g2k12" href="images/hackathons/g2k12.gif">
@@ -417,7 +439,7 @@
     Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
 </td>
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="n2k12" href="images/hackathons/n2k12.gif">
     <img src="images/hackathons/n2k12-s.gif"></a><br>
@@ -425,7 +447,7 @@
     Sep 17 - 21, 2012<br>
     Starnberg, Germany,<br>
     23 developers<br>
-    Funded by <a href=http://www.genua.de>Genua</a>.
+    Funded by <a href=http://www.genua.de>GeNUA</a>.
 </td>
 <td>
     <a id="p2k12" href="images/hackathons/p2k12.gif">
@@ -443,10 +465,11 @@
     Nov 14 - 20, 2012<br>
     Coimbra, Portugal<br>
     10 developers<br>
-    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>
+    with support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </td>
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="bottom">
+</tr><tr valign="top">
 <td>
     <a id="n2k13" href="images/hackathons/n2k13.gif">
     <img src="images/hackathons/n2k13-s.gif"></a><br>
@@ -454,7 +477,8 @@
     Jan 13 - 19, 2013<br>
     Dunedin, New Zealand<br>
     17 developers<br>
-    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>
+    with support of <a href="http://www.otago.ac.nz">University of Otago</a>.
 </td>
 <td>
     <a id="t2k13" href="images/hackathons/t2k13.jpg">
@@ -463,7 +487,8 @@
     May 29 - Jun 5, 2013<br>
     Toronto, Canada<br>
     43 developers<br>
-    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a>.
+    Funded by <a href=http://www.openbsdfoundation.org>The OpenBSD Foundation</a><br>
+    with support of <a href="http://www.utoronto.ca">University of Toronto</a>.
 </td>
 <td>
     <a id="b2k13" href="images/hackathons/b2k13.gif">
@@ -472,7 +497,8 @@
     Oct 17 - 21, 2013<br>
     Berlin, Germany<br>
     21 developers<br>
-    Funded by <a href=http://www.openbsd.org>OpenBSD</a>.
+    Funded by <a href=http://www.openbsd.org>OpenBSD</a><br>
+    with support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
 </td>
 </tr><tr><td bgcolor="#000000" colspan="3"></td>
 </tr></table>
@@ -493,7 +519,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: hackathons.html,v 1.59 2013/11/27 01:19:30 deraadt Exp $</small>
+<br><small>$OpenBSD: hackathons.html,v 1.60 2013/11/27 23:49:09 deraadt Exp $</small>
 
 </body>
 </html>