From a8af5c4499c23baa4a4e8d6c01828a7885739f37 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Mon, 16 Apr 2018 18:07:13 +0200 Subject: [PATCH] docs, README: Gluon v2017.1.6 --- README.md | 2 +- docs/conf.py | 6 +++--- docs/releases/v2017.1.6.rst | 4 ++-- docs/site-example/site.conf | 2 +- docs/user/getting_started.rst | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5cef4a645..4aceebce0 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 v2017.1.5 && make update`. +and switch to one by running `git checkout v2017.1.6 && 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 071e6fbae..581b7dc37 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,16 +47,16 @@ master_doc = 'index' # General information about the project. project = 'Gluon' -copyright = '2015-2017, Project Gluon' +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 = '2017.1.5' +version = '2017.1.6' # The full version, including alpha/beta/rc tags. -release = '2017.1.5' +release = '2017.1.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/releases/v2017.1.6.rst b/docs/releases/v2017.1.6.rst index 33d16c27e..2a05ebb82 100644 --- a/docs/releases/v2017.1.6.rst +++ b/docs/releases/v2017.1.6.rst @@ -1,5 +1,5 @@ -Gluon 2017.1.6 (in development) -=============================== +Gluon 2017.1.6 +============== Bugfixes ~~~~~~~~ diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 7d1aeec76..cb062aa73 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.5 +-- This is an example site configuration for Gluon v2017.1.6 -- -- 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 070c228b6..0263c3148 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.5*. Always get Gluon using git and don't try to download it +e.g. *v2017.1.6*. 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.5*. +version you'd like to checkout, e.g. *v2017.1.6*. :: -- GitLab