Merge remote-tracking branch 'upstream/RELEASE_next_patch' into RELEA…

…SE_next_minor

doc/dev_guide/writing_docs.rst

@@ -13,9 +13,9 @@ Docstrings
 Written at the start of a function, they give essential information
 about how it should be used, such as which arguments can be passed to it and
 what the syntax should be. The docstrings need to follow the `numpy
-specification <https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT
-.rst.txt>`_, as shown in `this example
-<https://github.com/numpy/numpy/blob/master/doc/example.py>`_.
+specification <https://numpydoc.readthedocs.io/en/latest/format.html#docstring-standard>`_, 
+as shown in `this example
+<https://github.com/numpy/numpy/blob/main/doc/example.py>`_.
 
 As a general rule, any code that is part of the public API (i.e. any function
 or class that an end-user might access) should have a clear and comprehensive

doc/user_guide/eds.rst

@@ -12,7 +12,7 @@ This chapter describes step-by-step the analysis of an EDS
 spectrum (SEM or TEM).
 
 .. NOTE::
-    See also the `EDS tutorials <http://nbviewer.ipython.org/github/hyperspy/hyperspy-	demos/blob/master/electron_microscopy/EDS/>`_.
+    See also the `EDS tutorials <https://nbviewer.org/github/hyperspy/hyperspy-demos/tree/main/electron_microscopy/EDS/>`_.
 
 Spectrum loading and parameters
 -------------------------------

hyperspy/drawing/utils.py

@@ -1225,7 +1225,7 @@ def make_cmap(colors, name='my_colormap', position=None,
     it with matplotlib for simplified use.
 
     Adapted from Chris Slocum's code at:
-    https://github.com/CSlocumWX/custom_colormap/blob/master/custom_colormaps.py
+    https://github.com/CSlocumWX/custom_colormap/blob/master/custom_colormaps/custom_colormaps.py
     and used under the terms of that code's BSD-3 license
 
     Parameters