X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=e69b02d38795ec7c6e5732f32c866580702485bf;hb=bd0e2a61687a09aea5464ebe00dbee3ca7d3ddc0;hp=14e6f3815b2661a595ee73f797018a4729feb09c;hpb=53565d11c069a0db503a7968e87b08bb6bf70f19;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index 14e6f38..e69b02d 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,15 +5,19 @@ 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
 not listed here, we would also like to hear about it.
 
-### Upcoming events
+### 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, I will give a lightning talk titled
-  "[http://fosdem.org/2010/schedule/events/tinc](tinc: the difficulties of a peer-to-peer VPN on the hostile Internet)".
-
-### Past events
-
+  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.  
@@ -60,8 +64,11 @@ Articles we have published:
 * [Linux Magazine](http://www.linuxmag.nl/), year 1, issue 2:
   *"Virtual Private Networks met tinc"* (Dutch).
 
-References to tinc that can be found in other articles:
+References to tinc that can be found in other articles and books:
 
+* [Der eigene Server mit FreeBSD 9](http://serverzeit.de/das-buch/),
+  a book by Benedikt Nießen,
+  published in 2012 by dpunkt.verlag GmbH, ISBN: 978-3-89864-814-1.
 * [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).