From 6964d30ff24eef9fc436e97bc909dc4c5e048ad4 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Wed, 21 Sep 2016 20:04:57 +0200 Subject: [PATCH] docs, README: change current release to v2016.2 --- README.md | 2 +- docs/conf.py | 4 ++-- docs/features/wired-mesh.rst | 4 ++-- docs/releases/v2016.2.rst | 4 ++-- docs/site-example/site.conf | 2 +- docs/user/getting_started.rst | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0fb2f2bfe..9fe746516 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 branch -a` -and switch to one by running `git checkout v2016.1.6 && make update`. +and switch to one by running `git checkout v2016.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 fd329bda5..188925533 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,9 +54,9 @@ copyright = '2015-2016, Project Gluon' # built documents. # # The short X.Y version. -version = '2016.1+' +version = '2016.2' # The full version, including alpha/beta/rc tags. -release = '2016.1+' +release = '2016.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/features/wired-mesh.rst b/docs/features/wired-mesh.rst index b9996335f..f1e501819 100644 --- a/docs/features/wired-mesh.rst +++ b/docs/features/wired-mesh.rst @@ -61,5 +61,5 @@ It may be disabled by running:: uci commit Please note that this configuration has changed in Gluon v2016.1. Using -the old commands on v2016.1 will break the corresponding options in the -*Advanced settings*. +the old commands on v2016.1 and later will break the corresponding options +in the *Advanced settings*. diff --git a/docs/releases/v2016.2.rst b/docs/releases/v2016.2.rst index 723598e51..e0043e9f5 100644 --- a/docs/releases/v2016.2.rst +++ b/docs/releases/v2016.2.rst @@ -1,5 +1,5 @@ -Gluon 2016.2 (in development) -============================= +Gluon 2016.2 +============ Added hardware support ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 663209563..6405f6d61 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 v2016.1+ +-- This is an example site configuration for Gluon v2016.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 66a94f81e..813eb3e41 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. *v2016.1.6*. Always get Gluon using git and don't try to download it +e.g. *v2016.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 @@ -42,7 +42,7 @@ Building the images ------------------- To build Gluon, first check out the repository. Replace *RELEASE* with the -version you'd like to checkout, e.g. *v2016.1.6*. +version you'd like to checkout, e.g. *v2016.2*. :: -- GitLab