From 269d4582b82df43b744fc78c91f8b247848adfa0 Mon Sep 17 00:00:00 2001
From: "j.schoenau" <j.schoenau@fz-juelich.de>
Date: Wed, 22 Sep 2021 08:10:06 +0200
Subject: [PATCH 1/2] Updated version for readTheDocs

---
 docs/source/conf.py     | 6 +++---
 docs/source/newsDoc.rst | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0a74885..0133dc9 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -58,7 +58,7 @@
 
 # General information about the project.
 project = 'tsam'
-copyright = '2016-2020, tsam Developer Team'
+copyright = '2016-2021, tsam Developer Team'
 author = 'Leander Kotzur, Maximilian Hoffmann'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -66,9 +66,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.1'
+version = '1.1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/source/newsDoc.rst b/docs/source/newsDoc.rst
index 189b5d6..8a901c7 100644
--- a/docs/source/newsDoc.rst
+++ b/docs/source/newsDoc.rst
@@ -2,7 +2,6 @@
 tsam's Change Log
 #################
 
-In tsam's latest release (1.1.1) the following functionalities were included:
+In tsam's latest release (1.1.2) the following functionalities were included:
 
-* Significantly increased test coverage 
-* Separation between clustering and representation, i.e. for clustering algorithms like Ward’s hierarchical clustering algorithm the representation by medoids or centroids can now freely be chosen.
+* Added first version of the k-medoid contiguity algorithm.

From 27b26778cacc3ba42680493fd4eb243472ce39d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Sch=C3=B6nau?=
 <60855819+OfficialCodexplosive@users.noreply.github.com>
Date: Thu, 23 Sep 2021 14:58:11 +0200
Subject: [PATCH 2/2] Update newsDoc style and integrate previous log changes

---
 docs/source/newsDoc.rst | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/source/newsDoc.rst b/docs/source/newsDoc.rst
index 8a901c7..2d6f367 100644
--- a/docs/source/newsDoc.rst
+++ b/docs/source/newsDoc.rst
@@ -2,6 +2,29 @@
 tsam's Change Log
 #################
 
-In tsam's latest release (1.1.2) the following functionalities were included:
+*********************
+Release version 1.1.2
+*********************
+
+tsam release (1.1.2) includes the following new functionalities:
 
 * Added first version of the k-medoid contiguity algorithm.
+
+*********************
+Release version 1.1.1
+*********************
+
+tsam release (1.1.1) includes the following new functionalities:
+
+* Significantly increased test coverage 
+* Separation between clustering and representation, i.e. for clustering algorithms like Ward’s hierarchical clustering algorithm the representation by medoids or centroids can now freely be chosen.
+
+*********************
+Release version 1.1.0
+*********************
+
+tsam release (1.1.0) includes the following new functionalities:
+
+* Segmentation - the clustering of adjacent time steps - according to Pineda et al. (2018)
+* k-MILP - an extension of the MILP-based k-medoids clustering that allows automatic identification of extreme periods according to Zatti et al. (2019)
+* The option to dynamically choose whether to clusters found should be represented by their centroid or medoid.