X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=0f528259d83d6862155c4fc5a7003c0b75690b7a;hb=2d5108ca00b1378b6a3f0169f83c0d44ed7debcb;hp=f955d5ffc9e64d76ab727be2a0721855b204d282;hpb=7c74a57cd95cfc0358fdd5980d9170ea16751dfb;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index f955d5f..0f52825 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -2,11 +2,22 @@
 
 Here you can find events and articles that are related to tinc. If
 you are holding a meeting or writing an article about VPNs and also
-mention tinc, please [tell us](contact). If you know of any we have
+mention tinc, please [[tell us|contact]]. If you know of any we have
 not listed here, we would also like to hear about it.
 
 ### Past events
 
+* [Chaos Communication Camp](http://events.ccc.de/camp/2011/),
+  August 10-14, 2011, in Finowfurt, Germany.
+  We are present in the [Milliways village](http://events.ccc.de/camp/2011/wiki/Milliways).
+* [FOSDEM](http://fosdem.org/2011/),
+  February 5 and 6, 2011, in Brussels, Belgium.
+  We were present as part of the devroom [New challenges in Virtualization](http://nciv2011.v2.cs.unibo.it/).
+* [FOSDEM](http://fosdem.org/2010/),
+  February 6, 2010, at 15:20 CET.
+  At this event, Guus Sliepen gave a lightning talk titled
+  ["tinc: the difficulties of a peer-to-peer VPN on the hostile Internet"](http://fosdem.org/2010/schedule/events/tinc).
+  You can look at the [slides](/presentations/fosdem-2010/tinc_fosdem2010_slides.pdf).
 * [Online tutorial](),
   November 8, 2003,
   on [irc.debian.org #tinc]() at 18:00 GMT.  
@@ -34,11 +45,11 @@ not listed here, we would also like to hear about it.
   January 23-24, 2001 In Amsterdam.  
   We held a presentation about Virtual Private Networks,
   and of course especially tinc. You can find some information in the
-  [abstract](presentations/linuxexpo/abstract).
+  [abstract](/presentations/linuxexpo/abstract).
   You can have a look at the
   [slides](/presentations/linuxexpo-20010123/),
   or download the
-  [presentation](presentations/linuxexpo/slides.tgz).
+  [presentation](/presentations/linuxexpo/slides.tgz).
 * [NLLGG](http://www.nllgg.nl/) meeting,
   October 7th, 2000.  
   You can look at a copy of the
@@ -57,6 +68,7 @@ References to tinc that can be found in other articles:
 
 * [c't magazin](http://www.heise.de/ct/), 2009, issue 19:
   *"[Maschen-VPN](http://www.heise.de/ct/inhalt/2009/19/176/)"* (German).
+  The full article can be read [online at heise.de](http://www.heise.de/netze/Dezentrales-VPN-mit-Tinc--/artikel/145795).
 * [Linux Magazin](http://www.linux-magazin.de), October 2003:
   *"[Einfache Verbindung: VPN-Daemon im Userspace: Tinc](http://www.linux-magazin.de/Heft-Abo/Ausgaben/2003/10/Einfache-Verbindung)"* (German).
 * [Building Linux Virtual Private Networks](http://www.buildinglinuxvpns.net/contents/),