diff --git a/README.md b/README.md index 0798f4f984abc9fa381b0a7b7aec4b6586952641..ca0fddb9dddb80f525dbda12d37cf8e1c2bf47c4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,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 releases by running `git tag` -and switch to one by running `git checkout v2020.2.1 && make update`. +and switch to one by running `git checkout v2020.2.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 a425676af2c30f51a016f7c3a5442004c3562b64..1503b3e5cf4e19c8c886fa45e118313d19df4c1d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,7 +24,7 @@ copyright = '2015-2020, Project Gluon' author = 'Project Gluon' # The short X.Y version -version = '2020.2.1' +version = '2020.2.2' # The full version, including alpha/beta/rc tags release = version diff --git a/docs/releases/v2020.2.2.rst b/docs/releases/v2020.2.2.rst index 7c2dd39149231323b3f17286deac399d6662e7cf..84257ba5ccff68b5d93faaa6bd1f17cab8db2e2d 100644 --- a/docs/releases/v2020.2.2.rst +++ b/docs/releases/v2020.2.2.rst @@ -11,7 +11,7 @@ Bugfixes Other changes ------------- -- Linux kernel has been updated to 4.14.206 +- Linux kernel has been updated to 4.14.209 - Backports of batman-adv bugfixes Known issues diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 6b379ac77d795eb796f9b8e63ca3901334785188..1fb7a2314603f411d4aef3fd726db01aa6d215e9 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 v2020.2.1 +-- This is an example site configuration for Gluon v2020.2.2 -- -- Take a look at the documentation located at -- https://gluon.readthedocs.io/ for details. diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index c563600f4e25ca2eb44bfb944c186e1b1eb47c07..6b1373010a318786808bd4bff695ca50156aa5c7 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. *v2020.2.1*. Always get Gluon using git and don't try to download it +e.g. *v2020.2.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 @@ -44,7 +44,7 @@ Building the images ------------------- To build Gluon, first check out the repository. Replace *RELEASE* with the -version you'd like to checkout, e.g. *v2020.2.1*. +version you'd like to checkout, e.g. *v2020.2.2*. ::