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

4 files changed, 64 insertions, 1 deletions

diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index 6c15d144..4ae52a1a 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -13,15 +13,17 @@ License|/fdl]]."]]"""]]
 
 # Upcoming
 
-  * [[GNU Hackers Meeting, 2011, Paris|ghm2011]]
 
 ## In the Future
 
+  * [[FOSDEM_2012]]
   * [[Self-organised]]
 
 
 # Past
 
+  * [[FrOSCon_2011]]
+  * [[GNU Hackers Meeting, 2011, Paris|ghm2011]]
   * [[FOSDEM_2011]]
   * [[DebConf10]]
   * [[GNU Hackers Meeting, 2010, Den Haag|ghm2010]]
diff --git a/community/meetings/fosdem_2012.mdwn b/community/meetings/fosdem_2012.mdwn
new file mode 100644
index 00000000..c8ee511b
--- /dev/null
+++ b/community/meetings/fosdem_2012.mdwn
@@ -0,0 +1,32 @@
+[[!meta copyright="Copyright © 2006, 2007, 2008, 2009, 2010, 2011 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 2012"]]
+
+<http://fosdem.org/2012>
+
+FOSDEM will take place on February 4th/5th at the Université Libre de
+Bruxelles.
+
+
+# Who and When
+
+[[!table class="table_style_1" data="""
+"Name","Attending","Arrival","Return","Share room with us"
+"[[Maksym Planeta]]","no"
+"Olaf Buddenhagen","most likely","","","yes"
+"[[Thomas Schwinge|tschwinge]]","will try to","","","yes"
+"""]]
+
+
+# Multiserver, Microkernel-Based Operating Systems Devroom
+
+[Announcement](http://lists.gnu.org/archive/html/bug-hurd/2011-11/msg00137.html).
diff --git a/community/meetings/froscon_2011.mdwn b/community/meetings/froscon_2011.mdwn
new file mode 100644
index 00000000..b15140d6
--- /dev/null
+++ b/community/meetings/froscon_2011.mdwn
@@ -0,0 +1,15 @@
+[[!meta copyright="Copyright © 2011 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="FrOSCon, 2011, Sankt Augustin, Germany"]]
+
+<http://www.froscon.de/>
+
+  * [Arch Hurd booth](http://www.froscon.de/en/exhibitors/projekte.html#c1413)
diff --git a/community/meetings/ghm2011.mdwn b/community/meetings/ghm2011.mdwn
index 7a2df8a0..8e77d500 100644
--- a/community/meetings/ghm2011.mdwn
+++ b/community/meetings/ghm2011.mdwn
@@ -11,3 +11,17 @@ License|/fdl]]."]]"""]]
 [[!meta title="GNU Hackers Meeting, 2011, Paris"]]
 
 <http://www.gnu.org/ghm/2011/paris/>
+
+  * {{$thibault_hurd}}
+
+
+[[!ymlfront data="""
+
+thibault_hurd:
+
+  "presentation by Samuel Thibault: [*GNU/Hurd, aka. Extensibility from the
+  Ground*](http://www.gnu.org/ghm/2011/paris/#outline-container-2-5)
+  ([slides](http://www.gnu.org/ghm/2011/paris/slides/samuel-thibault-hurd.pdf),
+  [video](http://audio-video.gnu.org/video/ghm2011/Samuel_Thibault-GNU_Hurd.ogv))"
+
+"""]]