Merge remote-tracking branch 'origin/dev' into feature/adding_type_hi…

…nting

edisgo/edisgo.py

@@ -1015,7 +1015,7 @@ def analyze(
 
         Conducts a static, non-linear power flow analysis using
         `PyPSA <https://pypsa.readthedocs.io/en/latest/user-guide/power-flow.html#\
-        full-non-linear-power-flow>`_
+        non-linear-power-flow>`_
         and writes results (active, reactive and apparent power as well as
         current on lines and voltages at buses) to :class:`~.network.results.Results`
         (e.g. :attr:`~.network.results.Results.v_res` for voltages).