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

3 files changed, 46 insertions, 2 deletions

diff --git a/community/meetings/debconf10.mdwn b/community/meetings/debconf10.mdwn
index bafd7de0..3b83a8cc 100644
--- a/community/meetings/debconf10.mdwn
+++ b/community/meetings/debconf10.mdwn
@@ -16,5 +16,12 @@ License|/fdl]]."]]"""]]
 
 
 [[!ymlfront data="""
-banck_hurd: "presentation (including video) by Michael Banck: [*Debian GNU/Hurd -- Past.  Present.  And Future?*](http://penta.debconf.org/dc10_schedule/events/595.en.html) ([slides](http://people.debian.org/~mbanck/debian-hurd.pdf))"
+
+banck_hurd:
+
+  "presentation (including video) by Michael Banck: [*Debian GNU/Hurd -- Past.
+  Present.  And
+  Future?*](http://penta.debconf.org/dc10_schedule/events/595.en.html)
+  ([slides](http://people.debian.org/~mbanck/debian-hurd.pdf))"
+
 """]]
diff --git a/community/meetings/fosdem_2011.mdwn b/community/meetings/fosdem_2011.mdwn
new file mode 100644
index 00000000..76a02c0a
--- /dev/null
+++ b/community/meetings/fosdem_2011.mdwn
@@ -0,0 +1,31 @@
+[[!meta copyright="Copyright © 2006, 2007, 2008, 2009, 2010 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 2011"]]
+
+<http://fosdem.org/2011>
+
+FOSDEM will take place on February 5th/6th 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","yes","Friday noon","Monday noon","yes"
+"[[Thomas Schwinge|tschwinge]]","no","n/a","n/a","n/a"
+"""]]
+
+
+# What
+
+<http://lists.gnu.org/archive/html/bug-hurd/2010-12/msg00019.html>
diff --git a/community/meetings/ghm2010.mdwn b/community/meetings/ghm2010.mdwn
index e216bfe4..b7d7e880 100644
--- a/community/meetings/ghm2010.mdwn
+++ b/community/meetings/ghm2010.mdwn
@@ -16,5 +16,11 @@ License|/fdl]]."]]"""]]
 
 
 [[!ymlfront data="""
-walfield_hurd: "video of the presentation by Neal Walfield: [*GNU/Hurd: It's About Freedom (Or: Why you should care)*](http://audio-video.gnu.org/video/ghm2010/GNU-Hurd_-_Its_About_Freedom,_Or_Why_you_should_care.ogv)"
+
+walfield_hurd:
+
+  "video of the presentation by Neal Walfield: [*GNU/Hurd: It's About Freedom
+  (Or: Why you should
+  care)*](http://audio-video.gnu.org/video/ghm2010/GNU-Hurd_-_Its_About_Freedom,_Or_Why_you_should_care.ogv)"
+
 """]]