From dba4af01d257dc19195a60167779380d0fe73a4c 2017-04-22 21:05:15 From: Branko Majic Date: 2017-04-22 21:05:15 Subject: [PATCH] MAR-101: Creating maintenance branch for release 1.5.0. --- diff --git a/docs/conf.py b/docs/conf.py index 33b8267bbbdfb9a67c6b36117dcf9128da935613..9ebbb2337d6f3df04e80add3735342f168c6e785 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,9 @@ copyright = u'2016, Branko Majic' # built documents. # # The short X.Y version. -version = '1.5.0' +version = '1.5-maint' # The full version, including alpha/beta/rc tags. -release = '1.5.0' +release = '1.5-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 3539d6629659577657fb79e694f182d3c8f9576b..9fbfd065fc2cb406f18c8db4d069f5625634e5fd 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -149,7 +149,7 @@ Ansible Roles: 2. Checkout the correct version of the roles:: cd ~/majic-ansible-roles/ - git checkout -b 1.5.0 1.5.0 + git checkout -b 1.5-maint 1.5-maint Preparing the basic site configuration