X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=index.mdwn;h=4b203b19ed187c09179ef5a8d01eb9c2d44ffb76;hb=e2c427b8a13de08e0dc34effbbeb89e03bba3ef6;hp=32f22e3f6c6b9af6a19cc4e14b30587890650afc;hpb=8ce54d0da07413160b5a08c67a1b1c4ea11adc33;p=wiki

diff --git a/index.mdwn b/index.mdwn
index 32f22e3..4b203b1 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,11 +2,11 @@
 
 ### Latest stable version: [[1.0.28|download]]
 
-Latest prerelease from the 1.1 branch: [[1.1pre11|download]]
+Latest prerelease from the 1.1 branch: [[1.1pre12|download]]
 
 ### Latest news:
 
-[[!inline  pages="news/* and !*/Discussion" template=newsitemnoheader show="1" feeds="no"]]
+[[!inline  pages="news/* and !*/Discussion" template=newsitemnoheader show="2" feeds="no"]]
 
 *[[More news...|news]]*
 
@@ -50,7 +50,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