Merge branch 'dev' into features/chemical_exergy

LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2017-2021, oemof developer group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2017-2022, oemof developer group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.rst

@@ -116,7 +116,7 @@ tespy version:
 
 If you want to use the latest features, you might want to install the
 **developer version**. See section
-`Developing TESPy <http://tespy.readthedocs.io/en/dev/developing_tespy.html>`_
+`Developing TESPy <http://tespy.readthedocs.io/en/dev/development/how.html>`_
 for more information. The developer version is not recommended for productive
 use.
 
@@ -146,12 +146,9 @@ Examples
 ========
 
 For a short introduction on how TESPy works and how you can use it, we provide
-some
-`examples and tutorials <https://tespy.readthedocs.io/en/main/tutorials_examples.html>`_,
-go and check them out. You can download the python scripts of all example plants
-from the
-`tespy_examples <https://github.com/oemof/oemof-examples/tree/master/oemof_examples/tespy>`_
-repository.
+an extensive `user guide <https://tespy.readthedocs.io/en/main/>`__. You can
+download all python scripts of the examples and tutorials from this GitHub
+repository. They are included in the "tutorial" directory.
 
 Citation
 ========