diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2010-09-09 14:44:52 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2010-09-09 14:44:52 +0200 |
| commit | 61eeed47c83b34181ac1a4baf623982683985707 (patch) | |
| tree | f505b130d09cb21c9345777e9e045b79b6585957 /community | |
| parent | db4a5f7981c130a6ba9ba082040d8b65f6b0231c (diff) | |
| parent | 9be9e209e2958dcbc0c7d5cf6ee203bf10326640 (diff) | |
Merge branch 'fields'
Diffstat (limited to 'community')
| -rw-r--r-- | community/meetings.mdwn | 3 | ||||
| -rw-r--r-- | community/meetings/debconf10.mdwn | 20 | ||||
| -rw-r--r-- | community/meetings/ghm2010.mdwn | 20 |
3 files changed, 42 insertions, 1 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index ba4fc2bd..ecd0e465 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -17,7 +17,8 @@ is included in the section entitled # Past - * [GNU Hackers Meeting in the Hague 2010](http://www.gnu.org/ghm/2010/denhaag/) + * [[DebConf10]] + * [[GNU Hackers Meeting in the Hague 2010|ghm2010]] * [[FOSDEM 2010]] * [[EuroSys_2009]] * [[FOSDEM_2008]] diff --git a/community/meetings/debconf10.mdwn b/community/meetings/debconf10.mdwn new file mode 100644 index 00000000..bafd7de0 --- /dev/null +++ b/community/meetings/debconf10.mdwn @@ -0,0 +1,20 @@ +[[!meta copyright="Copyright © 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="DebConf10"]] + +<http://debconf10.debconf.org/> + + * {{$banck_hurd}} + + +[[!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))" +"""]] diff --git a/community/meetings/ghm2010.mdwn b/community/meetings/ghm2010.mdwn new file mode 100644 index 00000000..b5cb7311 --- /dev/null +++ b/community/meetings/ghm2010.mdwn @@ -0,0 +1,20 @@ +[[!meta copyright="Copyright © 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="GNU Hackers Meeting in the Hague 2010"]] + +<http://www.gnu.org/ghm/2010/denhaag/> + + * {{$walfield_hurd}} + + +[[!ymlfront data=""" +walfield_hurd: "video of 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)" +"""]] |