X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=b8a24514409dc36bb2e6743e32bd8ff0e2222bce;hb=94e5ee56307755064be414ac2f7bd185479a277e;hp=142013f186b6c68bcfd9a1233f08520eb0c9890a;hpb=91e652ecf81c1be503a859baa330914c21e3ed35;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index 142013f..b8a2451 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,32 +5,29 @@ 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).
-
-### Past events
-
-* [FOSDEM](http://fosdem.org/2011/),
+* [FOSDEM](https://archive.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/),
+  We were present as part of the devroom "New challenges in Virtualization".
+* [FOSDEM](https://archive.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).
+  ["tinc: the difficulties of a peer-to-peer VPN on the hostile Internet"](https://archive.fosdem.org/2010/schedule/events/tinc.html).
   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.  
   During this online tutorial installation, configuration and
   practical issues regarding tinc were discussed.
-* [Linux World Expo](http://www.linuxworldexpo.com/),
+* Linux World Expo,
   October 29, 2003, Frankfurt, Germany.  
   At this expo, Marc Lehmann gave a talk (in German) titled
   "Einfache VPN-Netzwerke". One of the solutions mentioned was tinc.
-* [NLUUG Spring Conference](http://www.nluug.nl/events/vj01/),
+* [NLUUG Spring Conference](https://www.nluug.nl/events/vj01/),
   May 31, 2001, Ede, the Netherlands.  
   This conference was on High Availability,
   and so we held a talk about the HA aspects of tinc.
@@ -38,7 +35,7 @@ not listed here, we would also like to hear about it.
   [abstract](/presentations/nluug-20010531/abstract).
   You can also download the
   [conference paper](/presentations/nluug-20010531/havpns.ps.gz) (Dutch only).
-* [Open Source Developers Europe Meeting](http://www.fosdem.org/),
+* [Open Source Developers Europe Meeting](https://archive.fosdem.org/2001/),
   February 3-4, 2001, Brussels, Belgium.  
   We were there, but unfortunately the official schedule was
   completely filled up. We did talk to some people in one of the
@@ -67,11 +64,14 @@ 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).
+  The full article can be read [online at heise.de](http://www.heise.de/netze/artikel/Dezentrales-VPN-mit-Tinc-785436.html).
 * [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/),
@@ -81,7 +81,5 @@ References to tinc that can be found in other articles:
   an article on "32 bits online", January 2001 (website gone).
 * [Computer Shopper](http://www.computershopper.co.uk/),
   issue 151, September 2000, page 491.
-  A copy of the article can be found
-  [here](http://www.antipope.org/charlie/linux/shopper/151.html).
-* [Tucows](http://linux.tucows.com/preview/8920.html),
+* [Tucows](http://linux.tucows.com/preview/8920),
   rates tinc with 4 tuxes (out of 5)