diff --git a/docs/conf.py b/docs/conf.py index b1ead6ddbbfd68db8f16b6f11206563032d17e45..61bc571abbc674bb40aa1b7ea4f20478c32f6956 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 = '3.1-dev' +version = '4.0.0' # The full version, including alpha/beta/rc tags. -release = '3.1-dev' +release = '4.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst index 05577bb3591af95ef131707ec7defadad3dd500d..372bbb3513a3995678c66e85cb92855ef3e12688 100644 --- a/docs/releasenotes.rst +++ b/docs/releasenotes.rst @@ -2,8 +2,12 @@ Release notes ============= -NEXT RELEASE ------------- +4.0.0 +----- + +A couple of smaller bug-fixes, and introduction of (minor) breaking +change related to handling of pip requirements upgrade checks in the +``common`` role (see below). Breaking changes: diff --git a/docs/usage.rst b/docs/usage.rst index a064e2ab19d57a57c4c24c66115449d0d8460a9a..e3868f8f27cef47f3e2d2503e4f0b2c1f87c6f60 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -151,7 +151,7 @@ Ansible Roles: 2. Checkout the correct version of the roles:: cd ~/majic-ansible-roles/ - git checkout -b 3.1-dev 3.1-dev + git checkout -b 4.0.0 4.0.0 Preparing the basic site configuration