Releasing 1.1pre1.

diff --git a/docs.mdwn b/docs.mdwn
index 3a6fa59..83be825 100644 (file)
--- a/docs.mdwn
+++ b/docs.mdwn
@@ -28,6 +28,16 @@ version 1.0.15 of tinc:
 - [tincd(8)](/documentation/tincd.8)
 - [tinc.conf(5)](/documentation/tinc.conf.5)
 
 - [tincd(8)](/documentation/tincd.8)
 - [tinc.conf(5)](/documentation/tinc.conf.5)
 

+### Tinc 1.1 documentation
+
+The documentation for the prerelease versions of tinc 1.1 is also available:
+
+- [manual (HTML)](/documentation-1.1/tinc_toc)
+- [manual (PDF)](/documentation-1.1/tinc.pdf)
+- [tincd(8)](/documentation-1.1/tincd.8)
+- [tincctl(8)](/documentation-1.1/tincctl.8)
+- [tinc.conf(5)](/documentation-1.1/tinc.conf.5)
+

 ### Examples
 
 After reading the manual, you can look at further
 ### Examples
 
 After reading the manual, you can look at further

diff --git a/download.mdwn b/download.mdwn
index e1adb05..b364c27 100644 (file)
--- a/download.mdwn
+++ b/download.mdwn
@@ -10,7 +10,7 @@ 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.
 
 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.15" template=newsitemnoheader feeds="no"]]
 
 
 [[!inline  pages="news/release-1.0.15" template=newsitemnoheader feeds="no"]]
 


@@ -23,6 +23,19 @@ packages you should contact its maintainer.
 [Windows XP/Vista/7](/packages/windows/tinc-1.0.15-install.exe)
 </table>
 
 [Windows XP/Vista/7](/packages/windows/tinc-1.0.15-install.exe)
 </table>
 

+### Latest pre-release from the 1.1 branch
+
+[[!inline  pages="news/release-1.1pre1" template=newsitemnoheader feeds="no"]]
+
+<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
 
 This is a list of distributions and unofficial package repositories
 ### Distributions providing tinc
 
 This is a list of distributions and unofficial package repositories

diff --git a/index.mdwn b/index.mdwn
index 81207da..92ef1ec 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,8 @@
 # Welcome to tinc!
 
 # Welcome to tinc!
 

-### Latest version: [[1.0.15|download]]
+### Latest stable version: [[1.0.15|download]]
+
+Latest prerelease from the 1.1 branch: [[1.1pre1|download]]

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

diff --git a/roadmap.mdwn b/roadmap.mdwn
index c4be786..bbc867a 100644 (file)
--- a/roadmap.mdwn
+++ b/roadmap.mdwn
@@ -2,16 +2,11 @@
 
 This is a tentative list of features that will be added to future versions of tinc.
 
 
 This is a tentative list of features that will be added to future versions of tinc.
 

-### Tinc 1.0.15
+### Tinc 1.0.X

 
 * Reading public/private keys from the commandline.
 * Reading configuration from standard input.
 
 
 * Reading public/private keys from the commandline.
 * Reading configuration from standard input.
 

-### Tinc 1.1.0
-
-* CLI to running tincd instance.
-* GUI to running tincd instance.
-

 ### Tinc 1.1.X
 
 * HTML administration.
 ### Tinc 1.1.X
 
 * HTML administration.

diff --git a/tasks.mdwn b/tasks.mdwn
index 338053d..94c1afe 100644 (file)
--- a/tasks.mdwn
+++ b/tasks.mdwn
@@ -35,10 +35,16 @@ and the top and sidebars could be made a little more fancy with the appropriate
 The website should not be cluttered, should load fast, must work with small and big screen sizes,
 and must work in text browsers.
 
 The website should not be cluttered, should load fast, must work with small and big screen sizes,
 and must work in text browsers.
 

-### Basic coding tasks
+### Coding tasks

 
 

-### Advanced coding tasks
+* Automatic selection of nodes to ConnectTo.
+* Exchange host config files between nodes.
+* Proper port to Android/iPhone.
+* Merge local node discovery patch from Daniel Schall.
+* ...

 
 ### GUI tasks
 
 
 ### GUI tasks
 

+* Improve tinc-gui from tinc 1.1.

 * Write a NetworkManager GUI for tinc.
 * Write a NetworkManager GUI for tinc.

+* ...