X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=download.mdwn;h=b364c277d9429e52f5a39b696abcef6bb4045345;hb=3a8e854e61db9b0d7b5b2f4e5bd1ca1d96aa6e37;hp=6886fd820e7b901735339a21abacb2b87140aa6d;hpb=620623b927aff63537c6a764c21dc8b817c2bc9f;p=wiki

diff --git a/download.mdwn b/download.mdwn
index 6886fd8..b364c27 100644
--- a/download.mdwn
+++ b/download.mdwn
@@ -10,36 +10,31 @@ operating systems and architectures. We do not support the packages
 and static binaries though. If there are any problems with the
 packages you should contact its maintainer.
 
-### Latest release
+### Latest stable release
 
-[[!inline  pages="news/release-1.0.14" template=newsitemnoheader feeds="no"]]
+[[!inline  pages="news/release-1.0.15" template=newsitemnoheader feeds="no"]]
 
-<a name="1.0.14"></a><table>
-<tr><td>**Version**<td>1.0.14
+<a name="1.0.15"></a><table>
+<tr><td>**Version**<td>1.0.15
 <tr><td>**Source**<td>
-[tinc-1.0.14.tar.gz](/packages/tinc-1.0.14.tar.gz)
-([sig](/packages/tinc-1.0.14.tar.gz.sig))
+[tinc-1.0.15.tar.gz](/packages/tinc-1.0.15.tar.gz)
+([sig](/packages/tinc-1.0.15.tar.gz.sig))
 <tr><td>**Packages**<td>
-[Windows XP/Vista/7](/packages/windows/tinc-1.0.14-install.exe)
+[Windows XP/Vista/7](/packages/windows/tinc-1.0.15-install.exe)
 </table>
 
-### Mirror sites
+### Latest pre-release from the 1.1 branch
 
-These tinc pages are hosted in the Netherlands. If you live more
-closely to one of the following countries, please go to the mirror
-site for better performance.
+[[!inline  pages="news/release-1.1pre1" template=newsitemnoheader feeds="no"]]
 
-- Australia,
-  at [Wiretapped.net](http://www.wiretapped.net/) in Sydney, updated nightly:
-  - [ftp://ftp.wiretapped.net/pub/security/network-security/tinc/](ftp://ftp.wiretapped.net/pub/security/network-security/tinc/)
-  - [http://the.wiretapped.net/security/network-security/tinc/](http://the.wiretapped.net/security/network-security/tinc/)
-
-- Sweden,
-  at [Endpoint](http://www.endpoint.nu/), updated daily:
-  - [ftp://ftp.endpoint.nu/pub/software/tinc/](ftp://ftp.endpoint.nu/pub/software/tinc/)
-  - [http://ftp.endpoint.nu/pub/software/tinc/](http://ftp.endpoint.nu/pub/software/tinc/)
-  - [rsync://ftp.endpoint.nu::pub/software/tinc/](rsync://ftp.endpoint.nu::pub/software/tinc/)
-    (only within Sweden)
+<a name="1.1pre1"></a><table>
+<tr><td>**Version**<td>1.1pre1
+<tr><td>**Source**<td>
+[tinc-1.1pre1.tar.gz](/packages/tinc-1.1pre1.tar.gz)
+([sig](/packages/tinc-1.1pre1.tar.gz.sig))
+<tr><td>**Packages**<td>
+[Windows XP/Vista/7](/packages/windows/tinc-1.1pre1-install.exe)
+</table>
 
 ### Distributions providing tinc
 
@@ -62,6 +57,15 @@ using one of these packages.
 
 ### Older versions
 
+<a name="1.0.14"></a><table>
+<tr><td>**Version**<td>1.0.14
+<tr><td>**Source**<td>
+[tinc-1.0.14.tar.gz](/packages/tinc-1.0.14.tar.gz)
+([sig](/packages/tinc-1.0.14.tar.gz.sig))
+<tr><td>**Packages**<td>
+[Windows XP/Vista/7](/packages/windows/tinc-1.0.14-install.exe)
+</table>
+
 <a name="1.0.13"></a><table>
 <tr><td>**Version**<td>1.0.13
 <tr><td>**Source**<td>