From a1d41bc8544df94bbb5ca6dc37af0d602f920024 2021-01-19 23:17:38 From: Branko Majic Date: 2021-01-19 23:17:38 Subject: [PATCH] MAR-179: Creating maintenance branch for release 6.0.0. --- diff --git a/docs/conf.py b/docs/conf.py index c5aebce8a1e9af639dd42b29d19a780cddffd660..c33089618ba9fcb164c49e94188a9af51434011e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,9 @@ copyright = u'2018, Branko Majic' # built documents. # # The short X.Y version. -version = '6.0.0' +version = '6.0-maint' # The full version, including alpha/beta/rc tags. -release = '6.0.0' +release = '6.0-maint' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/usage.rst b/docs/usage.rst index e54908dc50d1d60549a948796fe310425c685fef..9a77fcaef4566bc2ff8ed53b8b089aae3a9370b7 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -164,7 +164,7 @@ Ansible Roles: 2. Checkout the correct version of the roles:: cd ~/majic-ansible-roles/ - git checkout -b 6.0.0 6.0.0 + git checkout -b 6.0-maint 6.0-maint Preparing the basic site configuration