fix old links

ivanov · ivanov · commit 64b246adbe02 · 2019-06-30T22:31:13.000-07:00
Sphinx-doc changes: the `inline markup` link was removed from text in 2017 via 06c8d4a. The inline markup page change to being called Roles. ipython-dev list unified with -users list and moved to being hosted on python.org
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -901,8 +901,7 @@ Some helpful functions::
 .. _ReST: http://docutils.sourceforge.net/rst.html
 .. _Sphinx: http://www.sphinx-doc.org
 .. _documentation: https://www.sphinx-doc.org/en/master/contents.html
-.. _`inline markup`: http://www.sphinx-doc.org/markup/inline.html
 .. _index: http://www.sphinx-doc.org/markup/para.html#index-generating-markup
 .. _`Sphinx Gallery`: https://sphinx-gallery.readthedocs.io/en/latest/
-.. _references: http://www.sphinx-doc.org/en/stable/markup/inline.html
+.. _references: https://www.sphinx-doc.org/en/stable/usage/restructuredtext/roles.html
 .. _`numpydoc docstring guide`: https://numpydoc.readthedocs.io/en/latest/format.html
diff --git a/doc/devel/gitwash/git_links.inc b/doc/devel/gitwash/git_links.inc
@@ -49,7 +49,7 @@
 .. _deleting master on github: https://matthew-brett.github.io/pydagogue/gh_delete_master.html
 .. _rebase without tears: https://matthew-brett.github.io/pydagogue/rebase_without_tears.html
 .. _resolving a merge: https://schacon.github.io/git/user-manual.html#resolving-a-merge
-.. _ipython git workflow: https://mail.scipy.org/pipermail/ipython-dev/2010-October/006746.html
+.. _ipython git workflow: https://mail.python.org/pipermail/ipython-dev/2010-October/005632.html
 
 .. other stuff
 .. _python: https://www.python.org
diff --git a/doc/users/shell.rst b/doc/users/shell.rst
@@ -73,7 +73,7 @@ run so you can continue tweaking the figure manually.
 There has been a lot of recent work to embed ipython, with pylab
 support, into various GUI applications, so check on the ipython
 mailing `list
-<https://mail.scipy.org/mailman/listinfo/ipython-user>`_ for the
+<https://mail.python.org/mailman/listinfo/ipython-dev>`_ for the
 latest status.
 
 .. _other-shells:
