diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-07-16 18:09:44 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-07-16 18:09:44 +0200 |
| commit | 856c182cd0d76db0ec2444cec96e9c53714ec930 (patch) | |
| tree | 70eb5719020b548fb722c3ad6f6e253aabc89312 /community/meetings | |
| parent | 5d5d6f01b3e0e700a33de02f9ece38557bb2af13 (diff) | |
| parent | 89f33677640b8a6ff0bb2b7b4cb2b6c24670bde9 (diff) | |
Merge branch 'master' of flubber:~hurd-web/hurd-web
Diffstat (limited to 'community/meetings')
| -rw-r--r-- | community/meetings/ghm2010.mdwn | 4 | ||||
| -rw-r--r-- | community/meetings/ghm2011.mdwn | 13 |
2 files changed, 15 insertions, 2 deletions
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/> |