From f4d642d516204994bdd77898af07b97b04c2be2f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Mon, 14 Aug 2017 02:01:24 +0200 Subject: [PATCH] docs, README: Gluon v2017.1.2 --- README.md | 2 +- docs/conf.py | 4 ++-- docs/releases/v2017.1.2.rst | 9 ++++++--- docs/site-example/site.conf | 2 +- docs/user/getting_started.rst | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e7e0ea92..b63b5d89 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ the future development of Gluon. Please refrain from using the `master` branch for anything else but development purposes! Use the most recent release instead. You can list all relaseses by running `git tag` -and switch to one by running `git checkout v2017.1.1 && make update`. +and switch to one by running `git checkout v2017.1.2 && make update`. If you're using the autoupdater, do not autoupdate nodes with anything but releases. If you upgrade using random master commits the nodes *will break* eventually. diff --git a/docs/conf.py b/docs/conf.py index ae7b40f4..25bf8895 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,9 +54,9 @@ copyright = '2015-2017, Project Gluon' # built documents. # # The short X.Y version. -version = '2017.1.1' +version = '2017.1.2' # The full version, including alpha/beta/rc tags. -release = '2017.1.1' +release = '2017.1.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/releases/v2017.1.2.rst b/docs/releases/v2017.1.2.rst index 597567a1..eac4ddc2 100644 --- a/docs/releases/v2017.1.2.rst +++ b/docs/releases/v2017.1.2.rst @@ -1,5 +1,5 @@ -Gluon 2017.1.2 (in development) -=============================== +Gluon 2017.1.2 +============== New features ~~~~~~~~~~~~ @@ -46,7 +46,7 @@ Bugfixes - sysupgrade rejecting Allnet images - OpenMesh devices losing their configuration on upgrades - This is a regression in Gluon v2017.1. + This is a regression introduced in Gluon v2017.1. * Improve sysupgrade error handling (`#1160 <https://github.com/freifunk-gluon/gluon/issues/1160>`_) @@ -59,6 +59,9 @@ Bugfixes It was only displayed on nodes with fastd before. +* Fix migration of enabled/disabled state between fastd and Tunneldigger + (`#1187 <https://github.com/freifunk-gluon/gluon/issues/1187>`_) + Known issues ~~~~~~~~~~~~ diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 28721d73..6ce179cd 100644 --- a/docs/site-example/site.conf +++ b/docs/site-example/site.conf @@ -1,4 +1,4 @@ --- This is an example site configuration for Gluon v2017.1.1 +-- This is an example site configuration for Gluon v2017.1.2 -- -- Take a look at the documentation located at -- http://gluon.readthedocs.org/ for details. diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index dc158efa..9c73c50f 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -8,7 +8,7 @@ Gluon's releases are managed using `Git tags`_. If you are just getting started with Gluon we recommend to use the latest stable release of Gluon. Take a look at the `list of gluon releases`_ and notice the latest release, -e.g. *v2017.1.1*. Always get Gluon using git and don't try to download it +e.g. *v2017.1.2*. Always get Gluon using git and don't try to download it as a Zip archive as the archive will be missing version information. Please keep in mind that there is no "default Gluon" build; a site configuration @@ -43,7 +43,7 @@ Building the images ------------------- To build Gluon, first check out the repository. Replace *RELEASE* with the -version you'd like to checkout, e.g. *v2017.1.1*. +version you'd like to checkout, e.g. *v2017.1.2*. :: -- GitLab