Merge branch 'master' of /home/hurd-web/hurd-web

3 files changed, 44 insertions, 5 deletions

diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index 0c680ddb..6bb188c5 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
-Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+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
@@ -13,16 +13,18 @@ License|/fdl]]."]]"""]]
 
 # Upcoming
 
+  * [[FOSDEM_2014]]
+
 
 ## In the Future
 
-  * [[FOSDEM_2013]]
   * [[Self-organised]]
 
 
 # Past
 
   * [[GNU Hackers Meeting, 2013, Paris|ghm2013]]
+  * [[FOSDEM_2013]]
   * [[GNU Hackers Meeting, 2012, Düsseldorf|ghm2012]]
   * [[FOSDEM_2012]]
   * [[FrOSCon_2011]]
diff --git a/community/meetings/fosdem_2013.mdwn b/community/meetings/fosdem_2013.mdwn
index 30860cb6..2d55e76b 100644
--- a/community/meetings/fosdem_2013.mdwn
+++ b/community/meetings/fosdem_2013.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2012, 2013 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2012, 2013, 2014 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
@@ -12,7 +13,7 @@ License|/fdl]]."]]"""]]
 
 <http://fosdem.org/2013>
 
-FOSDEM will take place on February 2th/3th at the Université Libre de
+FOSDEM will take place on February 2nd/3rd at the Université Libre de
 Bruxelles.
 
 
diff --git a/community/meetings/fosdem_2014.mdwn b/community/meetings/fosdem_2014.mdwn
new file mode 100644
index 00000000..60afeab4
--- /dev/null
+++ b/community/meetings/fosdem_2014.mdwn
@@ -0,0 +1,36 @@
+[[!meta copyright="Copyright © 2012, 2013, 2014 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 2014"]]
+
+<http://fosdem.org/2014>
+
+FOSDEM will take place on February 1st/2nd at the Université Libre de
+Bruxelles.
+
+
+# Who and When
+
+[[!table class="table_style_1" data="""
+"Name","Attending","Arrival","Return"
+"Samuel Thibault","yes","Saturday morning",""
+"Thomas Schwinge","yes","Friday, 16:20, BRU","Sunday, 20:15, BRU"
+"""]]
+
+
+# Microkernel-based operating systems devroom
+
+<https://fosdem.org/2014/schedule/track/microkernel_based_operating_systems/>
+
+
+## GNU/Hurd DDE userland device drivers (Samuel Thibault)
+
+<https://fosdem.org/2014/schedule/event/07_uk_dde_on_hurd/>