X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=docs.mdwn;h=83be8254da60bb6646c30d4407e8dfc19b59be00;hb=6143ffc9f7597e01df80405f1d877ac38550d5d1;hp=79b6bf4bee2090b878ae2a94a14252555552315b;hpb=574b008236cac5908eae159f7d4c0d9074f173f7;p=wiki

diff --git a/docs.mdwn b/docs.mdwn
index 79b6bf4..83be825 100644
--- a/docs.mdwn
+++ b/docs.mdwn
@@ -13,20 +13,31 @@ something else than the documentation says, please tell us!
 ### Manual
 
 The main source of information is the
-[tinc manual](/documentation/tinc_toc). This text describes how to
+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.13.
+1.0.15.
 
 ### Manpages
 
 You can also view the HTML version of the manpages that come with
-version 1.0.13 of tinc:
+version 1.0.15 of tinc:
 
 - [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/tinc_toc)
+- [manual (PDF)](/documentation-1.1/tinc.pdf)
+- [tincd(8)](/documentation-1.1/tincd.8)
+- [tincctl(8)](/documentation-1.1/tincctl.8)
+- [tinc.conf(5)](/documentation-1.1/tinc.conf.5)
+
 ### Examples
 
 After reading the manual, you can look at further