[doc] some entries to changelog for 2.2

markovmodel · May 17, 2016 · f18b417 · f18b417
1 parent a16efdd
commit f18b417
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/doc/source/CHANGELOG.rst b/doc/source/CHANGELOG.rst
@@ -1,12 +1,14 @@
 Changelog
 =========
 
-2.2 ()
-----------------
+2.2 (5-17-16)
+-------------
 
 **New features**:
 
 - thermo: added TRAM estimation.
+- thermo: added plotting feature for implied timescales.
+- thermo: added Jupyter notebook examples: :ref:`ref-notebooks`.
 - thermo: show convergence progress during estimation.
 
 **Fixes**:

diff --git a/doc/source/ipython.rst b/doc/source/ipython.rst
@@ -1,11 +1,13 @@
-=================
-IPython Tutorials
-=================
+ .. _ref-notebooks:
 
-These IPython (http://ipython.org) notebooks show the usage of the PyEMMA API in
+=====================================
+Jupyter (IPython) notebooks Tutorials
+=====================================
+
+These Jupyter (http://jupyter.org) notebooks show the usage of the PyEMMA API in
 action and also describe the workflow of Markov model building.
 
-You can obtain a copy of all notebooks and most of the used data
+You can download a copy of all notebooks and most of the used data
 `here <https://github.com/markovmodel/PyEMMA_IPython/archive/devel.zip>`_.
 Note that the trajectory of the D.E. Shaw BPTI simulation trajectory is not included
 in this archive, since we're not permitted to share this data. Thus the corresponding
@@ -45,7 +47,6 @@ In this section we will give you in-depth tutorials on specific methods or conce
    generated/model_selection_validation
    generated/tpt
 
-
 Multi-Ensemble Markov state models
 ----------------------------------
 
@@ -62,4 +63,4 @@ Estimation with fixed equilibrium distribution
    :maxdepth: 1
 
    generated/doublewell
-   generated/alanine
+   generated/alanine