From 9b97210fd352aedb2bd7411350b62ae2bcaeecdf 2017-02-12 00:19:35
From: Branko Majic <branko@majic.rs>
Date: 2017-02-12 00:19:35
Subject: [PATCH] MAR-93: Preparing for release 1.4.0.

---

diff --git a/docs/conf.py b/docs/conf.py
index 42ec10106ab81c240b229b37cec158188a601265..13cbf5232fe5501b1503cc3df992877f5f993106 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.3-dev'
+version = '1.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.3-dev'
+release = '1.4.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 b7ba0a2b3b0cb3b257c25ba72e21a0067c33b5ab..c40378ee3b219ad0b4e3332f4390f772de471071 100644
--- a/docs/releasenotes.rst
+++ b/docs/releasenotes.rst
@@ -2,6 +2,29 @@ Release notes
 =============
 
 
+1.4.0
+-----
+
+Minor fixes and features allowing for more fine-tuning of installations.
+
+New features/improvements:
+
+* ``ldap_server`` role
+
+  * TLS versions and ciphers supported by server are now configurable.
+
+* ``mail_server`` role
+
+  * TLS versions and ciphers supported by SMTP and IMAP server are now
+    configurable.
+  * Number of allowed concurent IMAP connections for a single user from a single
+    IP address is now configurable.
+
+* ``web_server`` role
+
+  * TLS versions and ciphers supported by server are now configurable.
+
+
 1.3.0
 -----
 
diff --git a/docs/usage.rst b/docs/usage.rst
index 007d14eda7cd232b38db739582e404c46d9d6091..f22591d23d0dd9d6c4d8a7d61880de1b3a77f3b2 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.3-dev 1.3-dev
+     git checkout -b 1.4.0 1.4.0
 
 
 Preparing the basic site configuration