Merge pull request #3 from alasconnect/combinechangelogs

Updated documentation

.github_changelog_generator

@@ -6,3 +6,4 @@ release-branch=master
 since-tag=0.2.0
 
 header=# LDAP Client Changelog
+exclude-labels=documentation

CHANGELOG.markdown

@@ -1,14 +0,0 @@
-Original
-====
-  * See [CHANGELOG.md](./CHANGELOG.md) for current changelog.
-
-0.2.0
-=====
-
-  * Supported SASL authentication via the EXTERNAL mechanism. (https://github.com/supki/ldap-client/pull/9)
-
-  * Added the `SecureWithTLSSettings` constructor to the `Host` datatype for the
-    cases where the user needs more control over TLS connection settings.
-    (https://github.com/supki/ldap-client/issues/5, https://github.com/supki/ldap-client/pull/6)
-
-  * Switched the decoding of server's messages to BER (See https://tools.ietf.org/html/rfc4511#section-5.1) (https://github.com/supki/ldap-client/pull/11)

CHANGELOG.md

@@ -1,8 +1,9 @@
 # LDAP Client Changelog
 
-## [Unreleased](https://github.com/alasconnect/ldap-client/tree/HEAD)
 
-[Full Changelog](https://github.com/alasconnect/ldap-client/compare/0.3.0...HEAD)
+## [0.4.0](https://github.com/alasconnect/ldap-client/tree/0.4.0) (2019-11-07)
+
+[Full Changelog](https://github.com/alasconnect/ldap-client/compare/0.3.0...0.4.0)
 
 **Merged pull requests:**
 

ldap-client.cabal

@@ -18,8 +18,8 @@ tested-with:
   , GHC == 8.4.4
   , GHC == 8.6.5
 extra-source-files:
-  README.markdown
-  CHANGELOG.markdown
+  README.md
+  CHANGELOG.md
 
 source-repository head
   type:     git