Releasing 1.1pre2.

diff --git a/docs.mdwn b/docs.mdwn
index 83be825..8900f19 100644 (file)
--- a/docs.mdwn
+++ b/docs.mdwn
@@ -10,22 +10,17 @@ 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
-manual ([HTML](/documentation/tinc_toc), [PDF](/documentation/tinc.pdf)).
-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.15.
-
-### Manpages
-
-You can also view the HTML version of the manpages that come with
-version 1.0.15 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.15.

 
 

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

 - [tincd(8)](/documentation/tincd.8)
 - [tincd(8)](/documentation/tincd.8)

+- [tincctl(8)](/documentation/tincctl.8)

 - [tinc.conf(5)](/documentation/tinc.conf.5)
 
 ### Tinc 1.1 documentation
 - [tinc.conf(5)](/documentation/tinc.conf.5)
 
 ### Tinc 1.1 documentation

diff --git a/download.mdwn b/download.mdwn
index c0f7d32..b675047 100644 (file)
--- a/download.mdwn
+++ b/download.mdwn
@@ -25,17 +25,15 @@ packages you should contact its maintainer.
 
 ### Latest pre-release from the 1.1 branch
 
 
 ### Latest pre-release from the 1.1 branch
 

-[[!inline  pages="news/release-1.1pre1" template=newsitemnoheader feeds="no"]]
+[[!inline  pages="news/release-1.1pre2" template=newsitemnoheader feeds="no"]]

 
 

-<a name="1.1pre1"></a><table>
-<tr><td>**Version**<td>1.1pre1
+<a name="1.1pre2"></a><table>
+<tr><td>**Version**<td>1.1pre2

 <tr><td>**Source**<td>
 <tr><td>**Source**<td>

-[tinc-1.1pre1.tar.gz](/packages/tinc-1.1pre1.tar.gz)
-([sig](/packages/tinc-1.1pre1.tar.gz.sig))
+[tinc-1.1pre2.tar.gz](/packages/tinc-1.1pre2.tar.gz)
+([sig](/packages/tinc-1.1pre2.tar.gz.sig))

 <tr><td>**Packages**<td>
 <tr><td>**Packages**<td>

-[Windows XP/Vista/7](/packages/windows/tinc-1.1pre1-install.exe)
-<tr><td>**Remarks**<td>
-One header file is missing, save [this file](http://tinc-vpn.org/git/browse?p=tinc;a=blob_plain;f=src/tincctl.h;h=114b931e5c088639a025b8ed7ac22f7240cd2c2d;hb=e4f65db89726ac06ba7e787d420db4422d9a6e98) as `src/tincctl.h` before compiling.
+[Windows XP/Vista/7](/packages/windows/tinc-1.1pre2-install.exe)

 </table>
 
 ### Distributions providing tinc
 </table>
 
 ### Distributions providing tinc


@@ -59,6 +57,17 @@ using one of these packages.
 
 ### Older versions
 
 
 ### Older versions
 

+<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)
+<tr><td>**Remarks**<td>
+One header file is missing, save [this file](http://tinc-vpn.org/git/browse?p=tinc;a=blob_plain;f=src/tincctl.h;h=114b931e5c088639a025b8ed7ac22f7240cd2c2d;hb=e4f65db89726ac06ba7e787d420db4422d9a6e98) as `src/tincctl.h` before compiling.
+</table>
+

 <a name="1.0.14"></a><table>
 <tr><td>**Version**<td>1.0.14
 <tr><td>**Source**<td>
 <a name="1.0.14"></a><table>
 <tr><td>**Version**<td>1.0.14
 <tr><td>**Source**<td>

diff --git a/index.mdwn b/index.mdwn
index 92ef1ec..9e8c8a4 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,7 +2,7 @@
 
 ### Latest stable version: [[1.0.15|download]]
 
 
 ### Latest stable version: [[1.0.15|download]]
 

-Latest prerelease from the 1.1 branch: [[1.1pre1|download]]
+Latest prerelease from the 1.1 branch: [[1.1pre2|download]]

 
 ### Latest news:
 
 
 ### Latest news:
 

diff --git a/news/release-1.1pre2.mdwn b/news/release-1.1pre2.mdwn
new file mode 100644 (file)
index 0000000..c10b9de
--- /dev/null
+++ b/news/release-1.1pre2.mdwn
@@ -0,0 +1,10 @@
+[[!meta author="guus"]]
+[[!meta date="July 17th 2011"]]
+
+Version 1.1pre2 released.
+
+ * .cookie files are renamed to .pid files, which are compatible with 1.0.x.
+ * Experimental protocol enhancements that can be enabled with the option ExperimentalProtocol = yes:
+   * Ephemeral ECDH key exchange will be used for both the meta protocol and UDP session keys.
+   * Key exchanges are signed with ECDSA.
+   * ECDSA public keys are automatically exchanged after RSA authentication if nodes do not know each other's ECDSA public key yet.