Merge branch 'RELEASE_v1.1.2' of https://github.com/francisco-dlp/hyp…

…erspy into RELEASE_v1.1.2

CHANGES.txt

@@ -5,14 +5,23 @@ We only cover here the main highlights, for a detailed list of all the changes
 see `the github commits changelog
 <https://github.com/hyperspy/hyperspy/commits/master>`_.
 
-.. _changes_1.1.1:
-
+.. _changes_1.1.2: 
 v1.1.2
 ======
 
+This is a maintenance release. Follow the following links for details on all
+the `bugs fixed
+<https://github.com/hyperspy/hyperspy/issues?q=label%3Abug+is%3Aclosed+milestone%3Av1.1.2>`_
+and `enhancements <https://github.com/hyperspy/hyperspy/issues?q=is%3Aclosed+milestone%3Av1.1.2+label%3Aenhancement>`_.
+
+
+.. _changes_1.1.1: 
+v1.1.1
+======
+
 This is a maintenance release. Follow the following link for details on all
 the `bugs fixed
-<https://github.com/hyperspy/hyperspy/issues?q=label%3Abug+is%3Aclosed+milestone%3A1.1.2>`_.
+<https://github.com/hyperspy/hyperspy/issues?q=label%3Abug+is%3Aclosed+milestone%3A1.1.1>`_.
 
 Enhancements
 ------------

README.rst

@@ -49,5 +49,5 @@ Cite
 
 |DOI|_
 
-.. |DOI| image:: https://zenodo.org/badge/doi/10.5281/zenodo.60697.svg
-.. _DOI: http://dx.doi.org/10.5281/zenodo.60697
+.. |DOI| image:: https://zenodo.org/badge/doi/10.5281/zenodo.240660.svg
+.. _DOI: http://dx.doi.org/10.5281/zenodo.240660

doc/citing.rst

@@ -8,7 +8,7 @@ entry
 
 .. code-block:: bibtex
 
-    @misc{francisco_de_la_pena_2016_59293,
+    @misc{francisco_de_la_pena_2017_240660,
       author       = {Francisco de la Peña and
                       Tomas Ostasevicius and
                       Vidar Tonaas Fauske and
@@ -17,29 +17,32 @@ entry
                       Mike Sarahan and
                       Duncan Johnstone and
                       Magnus Nord and
-                      Josh Taillon and
+                      Joshua Taillon and
                       Jan Caron and
+                      Eric Prestat and
+                      Tom Furnival and
                       Katherine E. MacArthur and
                       Alberto Eljarrat and
                       Stefano Mazzucco and
-                      Tom Furnival and
-                      Eric Prestat and
+                      Vadim Migunov and
+                      Thomas Aarholt and
                       Michael Walls and
-                      Gaël Donval and
+                      FWin22 and
                       Ben Martineau and
+                      Gaël Donval and
                       Luiz Fernando Zagonel and
                       Andreas Garmannslund and
-                      Thomas Aarholt and
                       Christoph Gohlke and
-                      iygr},
-      title        = {hyperspy: HyperSpy 1.1},
-      month        = aug,
-      year         = 2016,
-      doi          = {10.5281/zenodo.60697},
-      url          = {http://dx.doi.org/10.5281/zenodo.60697}
-    }
-    
+                      iygr and
+                      Huang-Wei Chang},
+      title        = {hyperspy/hyperspy: HyperSpy 1.1.2},
+      month        = jan,
+      year         = 2017,
+      doi          = {10.5281/zenodo.240660},
+      url          = {https://doi.org/10.5281/zenodo.240660}
+}
+
 or click on the DOI badge below for more citation formats.
 
-.. image:: https://zenodo.org/badge/doi/10.5281/zenodo.60697.svg
-   :target: http://dx.doi.org/10.5281/zenodo.60697
+.. image:: https://zenodo.org/badge/doi/10.5281/zenodo.240660.svg
+   :target: http://dx.doi.org/10.5281/zenodo.240660