X-Git-Url: https://tinc-vpn.org/git/browse?p=wiki;a=blobdiff_plain;f=docs.mdwn;h=a4c4565f47cbc80b76c89958cc1ca042e7556d21;hp=64cf3b393e17d581f88adefb06959f10eded0140;hb=fa4c1b3599ae5192b205149a2b2f565c6cff6732;hpb=1527b56ca72534790bd96d9f1c90e14466f05ef2

diff --git a/docs.mdwn b/docs.mdwn
index 64cf3b3..a4c4565 100644
--- a/docs.mdwn
+++ b/docs.mdwn
@@ -10,24 +10,28 @@ Note: documentation is always behind. If you think you miss
 something, you spotted an error or you notice that the program does
 something else than the documentation says, please tell us!
 
-### Manual
+### Tinc 1.0 documentation
 
-The main source of information is the
-manual ([HTML](/documentation/tinc_toc), [PDF](/documentation/tinc.pdf)).
-This text describes how to
-set up a VPN using tinc. It also contains a chapter with more
-technical details, which you may want to read, as well as the ideas
-behind tinc. This manual is currently up to date with version
-1.0.14.
-
-### Manpages
-
-You can also view the HTML version of the manpages that come with
-version 1.0.14 of tinc:
+The main source of information is the manual. This text describes how to set
+up a VPN using tinc. It also contains a chapter with more technical details,
+which you may want to read, as well as the ideas behind tinc. This manual is
+currently up to date with version 1.0.29.
 
+- [manual (HTML)](/documentation/)
+- [manual (PDF)](/documentation/tinc.pdf)
 - [tincd(8)](/documentation/tincd.8)
 - [tinc.conf(5)](/documentation/tinc.conf.5)
 
+### Tinc 1.1 documentation
+
+The documentation for the prerelease versions of tinc 1.1 is also available:
+
+- [manual (HTML)](/documentation-1.1/)
+- [manual (PDF)](/documentation-1.1/tinc.pdf)
+- [tincd(8)](/documentation-1.1/tincd.8)
+- [tinc(8)](/documentation-1.1/tinc.8)
+- [tinc.conf(5)](/documentation-1.1/tinc.conf.5)
+
 ### Examples
 
 After reading the manual, you can look at further