From d6cab552df269c3ee050d83adebe784e02eccb23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <martin@darmstadt.freifunk.net> Date: Fri, 15 Mar 2019 22:45:14 +0100 Subject: [PATCH] docs, README: Gluon v2018.2.1 --- README.md | 2 +- docs/conf.py | 4 ++-- docs/site-example/site.conf | 2 +- docs/user/getting_started.rst | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 269fe76f4..fe4ead878 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 v2018.2 && make update`. +and switch to one by running `git checkout v2018.2.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 013ffadfd..6681ab795 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,12 +47,12 @@ master_doc = 'index' # General information about the project. project = 'Gluon' -copyright = '2015-2018, Project Gluon' +copyright = '2015-2019, 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. -version = release = '2018.2' +version = release = '2018.2.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 a2f5312cd..7c3cdfacc 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.2 +-- This is an example site configuration for Gluon v2018.2.1 -- -- 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 ed3b6d0a8..90d4d49a1 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.2*. Always get Gluon using git and don't try to download it +e.g. *v2018.2.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 @@ -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. *v2018.2*. +version you'd like to checkout, e.g. *v2018.2.1*. :: -- GitLab