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

diff --git a/docs.mdwn b/docs.mdwn
index 64cf3b3..83be825 100644
--- a/docs.mdwn
+++ b/docs.mdwn
@@ -18,16 +18,26 @@ 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.
+1.0.15.
 
 ### Manpages
 
 You can also view the HTML version of the manpages that come with
-version 1.0.14 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