From 469e0107e212513748a4b638858fb2f28f24cb85 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Tue, 28 Aug 2018 20:53:12 +0200 Subject: [PATCH] docs, README: Gluon v2018.1.1 --- README.md | 2 +- docs/conf.py | 6 +----- docs/site-example/site.conf | 2 +- docs/user/getting_started.rst | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e5ac6029..91bac8d0 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 releases by running `git tag` -and switch to one by running `git checkout v2018.1 && make update`. +and switch to one by running `git checkout v2018.1.1 && 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 d035119b..79272816 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,11 +52,7 @@ copyright = '2015-2018, Project Gluon' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. -# -# The short X.Y version. -version = '2018.1' -# The full version, including alpha/beta/rc tags. -release = '2018.1' +version = release = '2018.1.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 6b52d53a..24fb68d0 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 v2018.1 +-- This is an example site configuration for Gluon v2018.1.1 -- -- 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 e6aad468..2f9ca66d 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. *v2018.1*. Always get Gluon using git and don't try to download it +e.g. *v2018.1.1*. 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. *v2018.1*. +version you'd like to checkout, e.g. *v2018.1.1*. :: -- GitLab