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

[wiki] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index 1b272b9..378350a 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,12 +1,12 @@
 # Welcome to tinc!
 
-### Latest stable version: [[1.0.28|download]]
+### Latest stable version: [[1.0.36|download]]
 
-Latest prerelease from the 1.1 branch: [[1.1pre11|download]]
+Latest prerelease from the 1.1 branch: [[1.1pre18|download]]
 
 ### Latest news:
 
-[[!inline  pages="news/* and !*/Discussion" template=newsitemnoheader show="2" feeds="no"]]
+[[!inline  pages="news/* and !*/Discussion" template=newsitemnoheader show="1" feeds="no"]]
 
 *[[More news...|news]]*
 
@@ -37,6 +37,11 @@ other, VPN traffic is always (if possible) sent directly to the
 destination, without going through intermediate hops.
 </dd>
 
+<dt><b>NAT traversal</b></dt>
+<dd>As long as one node in the VPN allows incoming connections on a public IP address (even if it is a dynamic IP address),
+tinc will be able to do NAT traversal, allowing direct communication between peers.
+</dd>
+
 <dt><b>Easily expand your VPN</b></dt>
 <dd>When you want to add nodes to your VPN, all you have to do is add
 an extra configuration file, there is no need to start new daemons
@@ -50,7 +55,7 @@ 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,
+<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