X-Git-Url: https://tinc-vpn.org/git/browse?p=wiki;a=blobdiff_plain;f=index.mdwn;h=bc9d629539118c94f7048946adeb283db79c13d5;hp=f95591a889587082fa6d44ede2ba44a169cfe8d2;hb=fa4c1b3599ae5192b205149a2b2f565c6cff6732;hpb=9159e02b143e5876748352c53ec1698fb75331e3

diff --git a/index.mdwn b/index.mdwn
index f95591a..bc9d629 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,12 +1,14 @@
 # Welcome to tinc!
 
-### Latest version: [1.0.11](news#1.0.11)
+### Latest stable version: [[1.0.29|download]]
+
+Latest prerelease from the 1.1 branch: [[1.1pre14|download]]
 
 ### Latest news:
 
-[[!inline  pages="news/* and !*/Discussion" template=newsitem show="1"]]
+[[!inline  pages="news/* and !*/Discussion" template=newsitemnoheader show="1" feeds="no"]]
 
-*[[news|More news...]]*
+*[[More news...|news]]*
 
 ### What is tinc?
 
@@ -14,7 +16,7 @@ tinc is a Virtual Private Network (VPN) daemon that uses tunnelling
 and encryption to create a secure private network between hosts on
 the Internet.
 tinc is Free Software and licensed under the
-[GNU General Public License](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+[GNU General Public License](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 version 2 or later.
 Because the VPN appears to the IP level network code as a normal
 network device, there is no need to adapt any existing software.
@@ -24,7 +26,7 @@ tinc has the following features:
 
 <dl>
 <dt><b>Encryption, authentication and compression</b></dt>
-<dd>All traffic is optionally compressed using zlib or LZO, and OpenSSL
+<dd>All traffic is optionally compressed using zlib or LZO, and LibreSSL or OpenSSL
 is used to encrypt the traffic and protect it from alteration with
 message authentication codes and sequence numbers.
 </dd>
@@ -48,8 +50,8 @@ normally only work on a LAN over the Internet.
 </dd>
 
 <dt><b>Runs on many operating systems and supports IPv6</b></dt>
-<dd>Currently Linux, FreeBSD, OpenBSD, NetBSD, MacOS/X, Solaris,
-Windows 2000, XP, Vista and Windows 7 platforms are supported. See our section about
+<dd>Currently Linux, FreeBSD, OpenBSD, NetBSD, OS X, Solaris,
+Windows 2000, XP, Vista and Windows 7 and 8 platforms are supported. See our section about
 <a href="/platforms">supported platforms</a> for more information about the
 state of the ports. tinc has also full support for IPv6, providing
 both the possibility of tunneling IPv6 traffic over its tunnels and