Merge branch 'feature/option-appraisal-costincome' into feature/option-appraisal-new-measure-base

Author: spjuhel

doc/api/climada/climada.entity._legacy_measures.rst

@@ -0,0 +1,22 @@
+climada\.entity\._legacy_measures package
+=========================================
+
+.. note::
+   This package implements the legacy way of defining measures
+   and is retained for compatibility.
+
+climada\.entity\._legacy_measures\.base module
+----------------------------------------------
+
+.. automodule:: climada.entity._legacy_measures.base
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+climada\.entity\._legacy_measures\.measure\_set module
+------------------------------------------------------
+
+.. automodule:: climada.entity._legacy_measures.measure_set
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/api/climada/climada.entity.measures.rst

@@ -1,18 +1,14 @@
 climada\.entity\.measures package
 =================================
 
-climada\.entity\.measures\.base module
---------------------------------------
+.. note::
+   This package implements the new way of defining measures.
+   For the previous way, see :ref:`climada.entity._legacy_measures`
 
-.. automodule:: climada.entity.measures.base
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-climada\.entity\.measures\.measure\_set module
-----------------------------------------------
+climada\.entity\.measures\.measure_config module
+------------------------------------------------
 
-.. automodule:: climada.entity.measures.measure_set
+.. automodule:: climada.entity.measures.measure_config
     :members:
     :undoc-members:
     :show-inheritance:

doc/api/climada/climada.entity.rst

@@ -7,6 +7,7 @@ climada\.entity package
     climada.entity.exposures
     climada.entity.impact_funcs
     climada.entity.measures
+    climada.entity._legacy_measures
 
 climada\.entity\.entity\_def module
 -----------------------------------