git:// links no longer work, refer to the https:// one.

[wiki] / docs.mdwn

diff --git a/docs.mdwn b/docs.mdwn
index ba6ae92..c642932 100644 (file)
--- a/docs.mdwn
+++ b/docs.mdwn
@@ -10,23 +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!
 
 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
-[tinc manual](/documentation/tinc_toc). 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.12.
-
-### Manpages
-
-You can also view the HTML version of the manpages that come with
-version 1.0.12 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.36.

 
 

+- [manual (HTML)](/documentation/)
+- [manual (PDF)](/documentation/tinc.pdf)

 - [tincd(8)](/documentation/tincd.8)
 - [tinc.conf(5)](/documentation/tinc.conf.5)
 
 - [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
 ### Examples
 
 After reading the manual, you can look at further