From f01037384d2cbbec975635c1526c45b5126664b5 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Sun, 8 Jul 2018 20:59:57 +0200 Subject: [PATCH] docs, README: Gluon v2018.1 --- README.md | 2 +- docs/conf.py | 4 ++-- docs/releases/v2018.1.rst | 4 ++-- docs/site-example/site.conf | 2 +- docs/user/getting_started.rst | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e223e12aa..e5ac6029d 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.8 && make update`. +and switch to one by running `git checkout v2018.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 623d4795b..d035119bb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,9 +54,9 @@ copyright = '2015-2018, Project Gluon' # built documents. # # The short X.Y version. -version = '2017.1+' +version = '2018.1' # The full version, including alpha/beta/rc tags. -release = '2017.1+' +release = '2018.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/releases/v2018.1.rst b/docs/releases/v2018.1.rst index 20e5729e1..7132b0cf6 100644 --- a/docs/releases/v2018.1.rst +++ b/docs/releases/v2018.1.rst @@ -1,5 +1,5 @@ -Gluon 2018.1 (in development) -############################# +Gluon 2018.1 +############ Important notes *************** diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 68f0d2942..6b52d53a3 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+ +-- This is an example site configuration for Gluon v2018.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 0cf6ab732..e6aad4681 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.8*. Always get Gluon using git and don't try to download it +e.g. *v2018.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. *v2017.1.8*. +version you'd like to checkout, e.g. *v2018.1*. :: -- GitLab