Fix broken and redirected links.

diff --git a/activities.mdwn b/activities.mdwn
index e69b02d38795ec7c6e5732f32c866580702485bf..8d208bab7bb5bb1b132f2776b92f3b9bbb70b9bf 100644 (file)
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -10,24 +10,24 @@ not listed here, we would also like to hear about it.
 * [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/),
+* [FOSDEM](http://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](http://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"](http://archive.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.  
   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.
@@ -35,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](http://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
@@ -66,12 +66,12 @@ Articles we have published:
 
 References to tinc that can be found in other articles and books:
 
-* [Der eigene Server mit FreeBSD 9](http://serverzeit.de/das-buch/),
+* [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 and books:
   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)

diff --git a/docs.mdwn b/docs.mdwn
index 7abf17755c949861e48ec9ac5992c3775b8a125b..8426b5b272e5fc70361b02db95eeb2123f87d79b 100644 (file)
--- a/docs.mdwn
+++ b/docs.mdwn
@@ -20,7 +20,6 @@ currently up to date with version 1.0.19.
 - [manual (HTML)](/documentation/tinc_toc)
 - [manual (PDF)](/documentation/tinc.pdf)
 - [tincd(8)](/documentation/tincd.8)
-- [tincctl(8)](/documentation/tincctl.8)
 - [tinc.conf(5)](/documentation/tinc.conf.5)
 
 ### Tinc 1.1 documentation

diff --git a/examples/bridging.mdwn b/examples/bridging.mdwn
index d1c18675f03c207ec43b57e9b1e03c51216642ea..239d1bf948bb5092883c2eca9acb199c49080f22 100644 (file)
--- a/examples/bridging.mdwn
+++ b/examples/bridging.mdwn
@@ -131,4 +131,4 @@ you will need to re-add the default route.
 If you want to be able to filter packets on your bridge interface, you will
 need to a kernel with [ebtables](http://ebtables.sourceforge.net/) support.
 More information For more information on Linux bridging, see the [bridge-utils
-homepage](http://www.linuxfoundation.org/en/Net:Bridge).
+homepage](http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge).

diff --git a/examples/osx-install.mdwn b/examples/osx-install.mdwn
index b8384fe0afab6929e33ccaa45c2689612828fff4..c64632ccb0c396a3ed6cdf494d558ff975685a4a 100644 (file)
--- a/examples/osx-install.mdwn
+++ b/examples/osx-install.mdwn
@@ -29,7 +29,7 @@ Macports is recommended because it does not modify your system files. It keeps i
 XCode is a required prerequisite. It must be installed before installing Macports.
 Download and install the Macports system from MacForge.
 
-* [XCode](http://developer.apple.com/technology/Xcode.html) (requires
+* [XCode](https://developer.apple.com/xcode/) (requires
   free online ADC Membership); it can also be obtained from original
   OSX installation DVD
 * [Macports](http://www.macports.org/install.php)
@@ -112,7 +112,7 @@ getting tinc to work.
 
 In the case of compiling tinc the following is required:
 
-* [XCode](http://developer.apple.com/technology/Xcode.html)
+* [XCode](http://developer.apple.com/xcode/)
 * [LZO libraries](http://www.oberhumer.com/opensource/lzo/)
 
 Before starting, create a new folder `tmp` in your home directory

diff --git a/news/fosdem-2010.mdwn b/news/fosdem-2010.mdwn
index ff2f6d9717d25083d377236fe79f2992458994ee..2c313aa2848ef2734384d327a8bff30579c99c0e 100644 (file)
--- a/news/fosdem-2010.mdwn
+++ b/news/fosdem-2010.mdwn
@@ -1,7 +1,5 @@
 [[!meta author="guus"]]
 
-<p><a href="http://www.fosdem.org/2010/"><img src="http://www.fosdem.org/promo/fosdem-2010" alt="FOSDEM, the Free and Open Source Software Developers' European Meeting" /></a></p>
-
-At [FOSDEM 2010](http://fosdem.org/2010/), I will give a lightning talk titled
-["tinc: the difficulties of a peer-to-peer VPN on the hostile Internet"](http://fosdem.org/2010/schedule/events/tinc).
+At [FOSDEM 2010](http://archive.fosdem.org/2010/), I will give a lightning talk titled
+["tinc: the difficulties of a peer-to-peer VPN on the hostile Internet"](http://archive.fosdem.org/2010/schedule/events/tinc).
 The talk will be on Saturday 7th of Februari at 15:20 CET.

diff --git a/news/fosdem-2011-devroom.mdwn b/news/fosdem-2011-devroom.mdwn
index 9b813c42bc573f87078bc796995f1adee0739a93..e4d2ff776fe20b596b200bee0c56a1d2812f02e7 100644 (file)
--- a/news/fosdem-2011-devroom.mdwn
+++ b/news/fosdem-2011-devroom.mdwn
@@ -1,9 +1,7 @@
 [[!meta author="guus"]]
 
-<p><a href="http://www.fosdem.org"><img src="http://www.fosdem.org/promo/fosdem/static" alt="FOSDEM, the Free and Open Source Software Developers' European Meeting" /></a></p>
-
-At [FOSDEM 2011](http://fosdem.org/2011/), 
-we will be present in the devroom [New challenges in Virtualization](http://nciv2011.v2.cs.unibo.it/).
+At [FOSDEM 2011](http://archive.fosdem.org/2011/),
+we will be present in the devroom "New challenges in Virtualization".
 You are invited to come by and discuss tinc, VPNs and other virtualization issues here.
 
 FOSDEM 2011 will take place on February 5 and 6 in Brussels, Belgium.

diff --git a/news/fosdem-2011-talks.mdwn b/news/fosdem-2011-talks.mdwn
index 632550ab3cf051aaa586b4d34a3f40cc99feb123..693254c97a2b64432eb5af9a45e0aa36a48ab5a9 100644 (file)
--- a/news/fosdem-2011-talks.mdwn
+++ b/news/fosdem-2011-talks.mdwn
@@ -1,10 +1,8 @@
 [[!meta author="guus"]]
 
-<p><a href="http://www.fosdem.org"><img src="http://www.fosdem.org/promo/fosdem/static" alt="FOSDEM, the Free and Open Source Software Developers' European Meeting" /></a></p>
-
-At [FOSDEM 2011](http://fosdem.org/2011/), on Sunday morning February 6,
+At [FOSDEM 2011](http://archive.fosdem.org/2011/), on Sunday morning February 6,
 there will be three tinc related talks in the
-[New challenges in Virtualization](http://nciv2011.v2.cs.unibo.it/) devroom:
+"New challenges in Virtualization" devroom:
 
 * 10:00 Brandon Black: "Building VPNs in EC2"
 * 10:20 Guus Sliepen: "The difficulties of a peer-to-peer VPN on the hostile Internet"

diff --git a/vpnlinks.mdwn b/vpnlinks.mdwn
index 40ab6cb77e8126ec572cf1aeb2ec02986e4317be..773ad088028034dac81468d3378447e21ccca492 100644 (file)
--- a/vpnlinks.mdwn
+++ b/vpnlinks.mdwn
@@ -19,13 +19,13 @@ here, please [[tell us|contact]].
 
 - [Amrita VPN](http://amvpn.sourceforge.net/)
 - [CIPE](http://cipe-linux.sourceforge.net/)
-- [CloudVPN](http://dev.e-x-a.org/projects/cloudvpn/wiki)
+- [CloudVPN](http://freecode.com/projects/cloudvpn)
 - [FairVPN](http://minerva.netgroup.uniroma2.it/fairvpn)
 - [GVPE](http://software.schmorp.de/pkg/gvpe.html)
 - [l2tpd](http://sourceforge.net/projects/l2tpd)
 - [Nest](http://www.targeted.org/nest/)
 - [OpenS/WAN](http://www.openswan.org/)
-- [OpenVPN](http://openvpn.sourceforge.net/)
+- [OpenVPN](http://openvpn.net/)
 - [Poptop](http://poptop.sourceforge.net/)
 - [QuickTun](http://wiki.qontrol.nl/QuickTun)
 - [SocialVPN](http://socialvpn.wordpress.com/)