Merge branch 'master' of flubber:~hurd-web/hurd-web

5 files changed, 8 insertions, 228 deletions

diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index f3f66420..ca99393a 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -13,10 +13,8 @@ is included in the section entitled
 
 # Upcoming
 
-  * [[25C3]]
-  * [[Self-organised_2008]]
+  * [[Self-organised]]
   * [[EuroSys_2009]]
-  * [[FOSDEM_2009]]
 
 # Past
 
diff --git a/community/meetings/25c3.mdwn b/community/meetings/25c3.mdwn
deleted file mode 100644
index 59e7b22a..00000000
--- a/community/meetings/25c3.mdwn
+++ /dev/null
@@ -1,60 +0,0 @@
-[[meta copyright="Copyright © 2006, 2007, 2008 Free Software Foundation,
-Inc."]]
-
-[[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled
-[[GNU_Free_Documentation_License|/fdl]]."]]"""]]
-
-[[meta title=25C3]]
-
-<http://events.ccc.de/congress/2008/>
-
-The 25th Chaos Communication Congress will take place from Dezember 27th to
-30th at the bcc (Berliner Congress Center) in Berlin, Germany.
-
-
-# Who and When
-
-[[table class="table_style_1" data="""
-"Name","Attending","Arrival","Return","Share room with us"
-"Jeroen Dekkers","yes","?","?","?"
-"Marcus Brinkmann","yes","?","?","?"
-"Michael Banck","intends to go","?","?","?"
-"Neal Walfield","no","?","?","?"
-"Olaf Buddenhagen","yes","?","?","?"
-"[[Thomas_Schwinge|tschwinge]]","no","?","?","?"
-"Wouter van Heyst","yes","?","?","?"
-"""]]
-
-
-<!--
-# Accommodation
--->
-
-<!--
-(Large) evening counts:
-
-[[table class="table_style_1" data="""
-      , Bas, Gianluca, Marcus, Michael, Neal, Olaf, Samuel, Soeren, Thomas, Total
-Thu 21,    , 1?      , *<strike>1</strike>*, , ,  , 1     ,       , *<strike>1</strike>*, *<strike>4</strike>* 2
-Fri 22, 2  , 1       , 1     , 1      , 1   , 1   , 1     , 1     , 1     ,10
-Sat 23, 2  , 1       , 1     , 1      , 1   , 1   , 1     , 1     , 1     ,10
-Sun 24, 2  , 1       , 1     , 1      , 1   , 1   , 1     , *<strike>1</strike>*, 1 , *<strike>10</strike>* 9
-"""]]
--->
-
-
-<!--
-# What
--->
-
-
-<!--
-# Photos
-
-Put links to your photos here.
--->
diff --git a/community/meetings/eurosys_2009.mdwn b/community/meetings/eurosys_2009.mdwn
index 30230a26..069f6889 100644
--- a/community/meetings/eurosys_2009.mdwn
+++ b/community/meetings/eurosys_2009.mdwn
@@ -1,4 +1,4 @@
-[[meta copyright="Copyright © 2006, 2007, 2008 Free Software Foundation,
+[[meta copyright="Copyright © 2006, 2007, 2008, 2009 Free Software Foundation,
 Inc."]]
 
 [[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable
@@ -16,40 +16,10 @@ is included in the section entitled
 EuroSys will take place on March 30th to April 3rd in Nuremberg, Germany.
 
 
-# Who And When
+# Who and When
 
 [[table class="table_style_1" data="""
-"Name","Attending","Arrival","Return","Share room with us"
-"Neal Walfield","intends to go","?","?","?"
-"[[Samuel_Thibault|SamuelThibault]]","intends to go","?","?","?"
-"[[Thomas_Schwinge|tschwinge]]","intends to go","?","?","?"
+"Name","Attending","Arrival","Return"
+"Neal Walfield","yes","Monday evening","Friday"
+"[[Thomas_Schwinge|tschwinge]]","yes","Monday evening","Friday"
 """]]
-
-
-<!--
-# Accommodation
--->
-
-<!--
-(Large) evening counts:
-
-[[table class="table_style_1" data="""
-      , Bas, Gianluca, Marcus, Michael, Neal, Olaf, Samuel, Soeren, Thomas, Total
-Thu 21,    , 1?      , *<strike>1</strike>*, , ,  , 1     ,       , *<strike>1</strike>*, *<strike>4</strike>* 2
-Fri 22, 2  , 1       , 1     , 1      , 1   , 1   , 1     , 1     , 1     ,10
-Sat 23, 2  , 1       , 1     , 1      , 1   , 1   , 1     , 1     , 1     ,10
-Sun 24, 2  , 1       , 1     , 1      , 1   , 1   , 1     , *<strike>1</strike>*, 1 , *<strike>10</strike>* 9
-"""]]
--->
-
-
-<!--
-# What
--->
-
-
-<!--
-# Photos
-
-Put links to your photos here.
--->
diff --git a/community/meetings/fosdem_2009.mdwn b/community/meetings/fosdem_2009.mdwn
deleted file mode 100644
index abeb74db..00000000
--- a/community/meetings/fosdem_2009.mdwn
+++ /dev/null
@@ -1,128 +0,0 @@
-[[meta copyright="Copyright © 2006, 2007, 2008 Free Software Foundation,
-Inc."]]
-
-[[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled
-[[GNU_Free_Documentation_License|/fdl]]."]]"""]]
-
-[[meta title="FOSDEM 2009"]]
-
-<http://fosdem.org/2009>
-
-FOSDEM will take place on February 7th/8th at the Université Libre de
-Bruxelles.
-
-
-# Who And When
-
-[[table class="table_style_1" data="""
-"Name","Attending","Arrival","Return","Share room with us"
-"Neal Walfield","no","n/a","n/a","n/a"
-"[[Thomas_Schwinge|tschwinge]]","no","n/a","n/a","n/a"
-"""]]
-
-
-# Accommodation
-
-<!--
-(Large) evening counts:
-
-[[table class="table_style_1" data="""
-      , Bas, Gianluca, Marcus, Michael, Neal, Olaf, Samuel, Soeren, Thomas, Total
-Thu 21,    , 1?      , *<strike>1</strike>*, , ,  , 1     ,       , *<strike>1</strike>*, *<strike>4</strike>* 2
-Fri 22, 2  , 1       , 1     , 1      , 1   , 1   , 1     , 1     , 1     ,10
-Sat 23, 2  , 1       , 1     , 1      , 1   , 1   , 1     , 1     , 1     ,10
-Sun 24, 2  , 1       , 1     , 1      , 1   , 1   , 1     , *<strike>1</strike>*, 1 , *<strike>10</strike>* 9
-"""]]
--->
-
-
-## The Moon Hotel
-
-Rue de la Montagne 4B.
-
-EUR 33.5 per night.
-
-Breakfast is included, there is hotspot wifi
-
-check-in can be between 13:00 and 00:00, departure is before 11:00
-
-Been there in 2008.  It was okay.
-
-
-## A-XL flathotel
-
-<http://www.axlflathotel.be/fr/tarifs.html>
-
-
-## Youth hostel _Bruegel_
-
-<http://www.vjh.be/jeugdherbergen/brussel/mainE.htm>
-
-Heilige Geeststraat 2  
-1000 Brussels  
-Phone: +32(0)2 511 04 36  
-Fax: +32(0)2 512 07 11  
-<brussel@vjh.be>
-
-[Map via Google maps](http://maps.google.com/maps?f=q&hl=en&q=Heilige+Geeststraat+2,+1000+Brussels,+Belgium&sll=50.846056,4.344578&sspn=0.022599,0.086517&ie=UTF8&om=1&z=15&ll=50.843942,4.351444&spn=0.0113,0.043259&iwloc=cent).
-[Map via Map24](http://link2.map24.com/?street0=Heilige%20Geeststraat&zip0=1000&city0=Br%FCssel&state0=&country0=be&name0=&lid=43c26f81&ol=de-de).
-
-Been there in 2006 and 2007.  It was okay.
-
-Rooms at ~ 18.60&euro;
-
-We need someone to get the keys before
-20:00. Reservations last until 16:00, so either he gets the keys before 16:00,
-or we just need to call for confirming the reservation
-
-[[I|tschwinge]] seem to remember something that in 2007 the Madame at the
-reception wasn't really happy with us arriving later than 16:00 even with
-having had confirmed that via a phone call.
-
-
-## Sleep Well Youth Hostel
-
-<http://www.sleepwell.be/>
-
-
-## Youth Hostel Can Gogh
-
-<http://chab.be/>
-
-No under 18-ers and over 35-ers allowed.
-
-
-## Auberge de Jeunesse Jacques Brel
-
-<http://www.laj.be/html/fr/auberges/brel/aubergesbrel_01.htm>.
-
-Samuel knows that one and liked it. antrik too :-)
-
-
-<!--
-# What
--->
-
-<!--
-There will be a keysigning party, see <http://fosdem.org/2008/keysigning>.
--->
-
-<!--
-We don't have a Developers Room at FOSDEM.
--->
-
-<!--
-There is again a pre-FOSDEM meeting on Friday night, see <http://fosdem.org/2008/beerevent>.
--->
-
-
-<!--
-# Photos
-
-Put links to your photos here.
--->
diff --git a/community/meetings/self-organised_2008.mdwn b/community/meetings/self-organised.mdwn
index 10d746fc..ece96696 100644
--- a/community/meetings/self-organised_2008.mdwn
+++ b/community/meetings/self-organised.mdwn
@@ -1,4 +1,4 @@
-[[meta copyright="Copyright © 2008 Free Software Foundation, Inc."]]
+[[meta copyright="Copyright © 2008, 2009 Free Software Foundation, Inc."]]
 
 [[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable
 id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -8,7 +8,7 @@ Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
 is included in the section entitled
 [[GNU_Free_Documentation_License|/fdl]]."]]"""]]
 
-[[meta title="Self-organised meeting, somewhere in 2008"]]
+[[meta title="Self-organised meeting"]]
 
 This meeting will be held in a to-be-determined place, at a to-be-determined time.  This page hopes to help finding a good time and place, and finding out who wants to come.