summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2011-05-31 19:37:14 +0200
committerThomas Schwinge <thomas@schwinge.name>2011-05-31 19:37:14 +0200
commit8fba1a1ef076b60e10f03ccdf5d1e8714bd9c16a (patch)
tree9f63601f0d293a6e554b653bdf815218031a4d8b
parente0d173f99e59a969333e56ebbd30a2bebb771592 (diff)
community/meetings/ghm2011: New.
-rw-r--r--community/meetings.mdwn13
-rw-r--r--community/meetings/ghm2010.mdwn4
-rw-r--r--community/meetings/ghm2011.mdwn13
-rw-r--r--contributing/web_pages/news/moth_next.mdwn3
4 files changed, 27 insertions, 6 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index 939d5269..6c15d144 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2007, 2008, 2009, 2010 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 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
@@ -13,13 +13,18 @@ License|/fdl]]."]]"""]]
# Upcoming
- * [[FOSDEM_2011]]
+ * [[GNU Hackers Meeting, 2011, Paris|ghm2011]]
+
+## In the Future
+
* [[Self-organised]]
+
# Past
+ * [[FOSDEM_2011]]
* [[DebConf10]]
- * [[GNU Hackers Meeting in the Hague 2010|ghm2010]]
+ * [[GNU Hackers Meeting, 2010, Den Haag|ghm2010]]
* [[FOSDEM_2010]]
* [[EuroSys_2009]]
* [[FOSDEM_2008]]
diff --git a/community/meetings/ghm2010.mdwn b/community/meetings/ghm2010.mdwn
index b7d7e880..c8a9d8c3 100644
--- a/community/meetings/ghm2010.mdwn
+++ b/community/meetings/ghm2010.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2010 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 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
@@ -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="GNU Hackers Meeting in the Hague 2010"]]
+[[!meta title="GNU Hackers Meeting, 2010, Den Haag"]]
<http://www.gnu.org/ghm/2010/denhaag/>
diff --git a/community/meetings/ghm2011.mdwn b/community/meetings/ghm2011.mdwn
new file mode 100644
index 00000000..7a2df8a0
--- /dev/null
+++ b/community/meetings/ghm2011.mdwn
@@ -0,0 +1,13 @@
+[[!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="GNU Hackers Meeting, 2011, Paris"]]
+
+<http://www.gnu.org/ghm/2011/paris/>
diff --git a/contributing/web_pages/news/moth_next.mdwn b/contributing/web_pages/news/moth_next.mdwn
index 4c8b9969..dafb12b5 100644
--- a/contributing/web_pages/news/moth_next.mdwn
+++ b/contributing/web_pages/news/moth_next.mdwn
@@ -39,6 +39,9 @@ else="
* Plan for Debian GNU/Hurd: Get over XX% of packages ported and become a full Debian project till YYYY-MM.
+* [[community/meetings/ghm2011]]
+
+
This month [hurd hacker] [item]
Also …