[docs] update changelog

4 files changed, 42 insertions, 59 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3beb439..681eaa8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,56 +2,73 @@
 
 Changelog
 ---------
-====
-2017
-====
+
+0.6.1 - `master`_
+-----------------
+
+.. note:: This version is not yet released and is under active development.
+ 
+ 
+0.6.0 Jul 8, 2017
+~~~~~~~~~~~~~~~~~
+
+Features
+++++++++
+
+- Update certificate bundle
+- Adapt parsing of the cert bundle for twisted http client.
+
+
 0.5.5 Apr 20, 2017
-++++++++++++++++++
+~~~~~~~~~~~~~~~~~
+
 - Add a bonafide status event.
 
 0.5.4 Mar 17, 2017
-++++++++++++++++++
+~~~~~~~~~~~~~~~~~~
+
 - Add a vpn status event.
 
 0.5.3 Mar 13, 2017
-++++++++++++++++++
+~~~~~~~~~~~~~~~~~~
+
 - Add mail_status_changed event.
 
-====
-2016
-====
 0.5.2 Jul 11, 2016
-++++++++++++++++++
+~~~~~~~~~~~~~~~~~~
+
 - Remove dependency on dirspec
 
 0.5.1 Apr 18, 2016
-+++++++++++++++++++
+~~~~~~~~~~~~~~~~~~
 
 Features
-~~~~~~~~
+++++++++
+
 - Add HookableService, allowing inter-service notification for hooks.
 - Get events working on windows.
 - Optional flag to disable curve authentication.
 
-Bugfixes
-~~~~~~~~
-- `#7536 <https://leap.se/code/issues/7536>`_: zmq authenticator often hangs.
 
+Bugfixes
+++++++++
 
-====
-2015
-====
+- `#7536 <https://leap.se/code/issues/7536>`_: zmq authenticator often hangs.
 
 
 0.5.0 Nov 11, 2015
-++++++++++++++++++
+~~~~~~~~~~~~~~~~~~
 
 Features
-~~~~~~~~
+++++++++
+
 - `#7523 <https://leap.se/code/issues/7523>`_: Allow to skip the twisted version check, needed to run soledad-client sync tests in the platform with the twisted versions in wheezy.
 
 Misc
-~~~~
+++++
+
 - Bump version to 0.5.0, to correct a versioning mistake in the debian packages.
 - Rename extras to 'http' and document dependencies on the README.
 - Migrate changelog to rst.
+
+.. _`master`: https://0xacab.org/leap/leap_pycommon
diff --git a/README.rst b/README.rst
index f46b70e..28a725f 100644
--- a/README.rst
+++ b/README.rst
@@ -17,14 +17,17 @@ A collection of shared utils used by the several python LEAP subprojects.
 
 Library dependencies
 --------------------
+
 * ``libssl-dev``
 
 Python dependencies
 -------------------
+
 * See ``pkg/requirements.pip``
 
 Extras
 -------------------
+
 Using `leap.common.http` needs some extra dependencies (twisted.web >= 14.0.2,
 python-service-identity). You can install them by running::
 
@@ -33,6 +36,7 @@ python-service-identity). You can install them by running::
 
 Running the tests
 -------------------
+
 To run the tests, first run the setup with:
 
 .. code-block::
diff --git a/changes/VERSION_COMPAT b/changes/VERSION_COMPAT
deleted file mode 100644
index cc00ecf..0000000
--- a/changes/VERSION_COMPAT
+++ /dev/null
@@ -1,10 +0,0 @@
-#################################################
-# This file keeps track of the recent changes
-# introduced in internal leap dependencies.
-# Add your changes here so we can properly update
-# requirements.pip during the release process.
-# (leave header when resetting)
-#################################################
-#
-# BEGIN DEPENDENCY LIST -------------------------
-# leap.foo.bar>=x.y.z
diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst
deleted file mode 100644
index 3b08499..0000000
--- a/changes/next-changelog.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-0.5.x
-+++++++++++++++++++
-
-Please add lines to this file, they will be moved to the CHANGELOG.rst during
-the next release.
-
-There are two template lines for each category, use them as reference.
-
-I've added a new category `Misc` so we can track doc/style/packaging stuff.
-
-Features
-~~~~~~~~
-- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
-- New feature without related issue number.
-
-Bugfixes
-~~~~~~~~
-- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
-- Bugfix without related issue number.
-
-Misc
-~~~~
-- `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
-- Some change without issue number.
-
-Known Issues
-~~~~~~~~~~~~
-- `#1236 <https://leap.se/code/issues/1236>`_: Description of the known issue corresponding with issue #1236.