Fix some broken links

dstansby · dstansby · commit 58832d90d833 · 2018-02-11T19:25:05.000Z
diff --git a/INSTALL.rst b/INSTALL.rst
@@ -203,7 +203,7 @@ etc., you can install the following:
     <https://libav.org/avconv.html>`_: for saving movies;
   * `ImageMagick <https://www.imagemagick.org/script/index.php>`_: for saving
     animated gifs;
-  * `Pillow <https://python-pillow.org/>`_ (>=2.0): for a larger selection of
+  * `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>=2.0): for a larger selection of
     image file formats: JPEG, BMP, and TIFF image files;
   * `LaTeX <https://miktex.org/>`_ and `GhostScript
     <https://ghostscript.com/download/>`_ (for rendering text with LaTeX).
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -1876,7 +1876,7 @@ Changes beyond 0.99.x
   date. If needed, install them independently.
 
 .. _configobj: http://www.voidspace.org.uk/python/configobj.html
-.. _`enthought.traits`: http://code.enthought.com/projects/traits
+.. _`enthought.traits`: http://code.enthought.com/pages/traits.html
 
 * The new rc parameter ``savefig.extension`` sets the filename extension
   that is used by :meth:`matplotlib.figure.Figure.savefig` if its *fname*
diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -9,7 +9,7 @@ Matplotlib's testing infrastructure depends on pytest_. The tests are in
 infrastructure are in :mod:`matplotlib.testing`.
 
 .. _pytest: http://doc.pytest.org/en/latest/
-.. _mock: https://docs.python.org/3/library/unittest.mock.html>
+.. _mock: https://docs.python.org/3/library/unittest.mock.html
 .. _Ghostscript: https://www.ghostscript.com/
 .. _Inkscape: https://inkscape.org
 .. _pytest-cov: https://pytest-cov.readthedocs.io/en/latest/
diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
@@ -675,7 +675,7 @@ or by saving to a file handle::
     import sys
     fig.savefig(sys.stdout)
 
-Here is an example using `Pillow <https://python-pillow.org/>`_.
+Here is an example using `Pillow <https://pillow.readthedocs.io/en/latest/>`_.
 First, the figure is saved to a BytesIO object which is then fed to
 Pillow for further processing::
 
diff --git a/doc/index.rst b/doc/index.rst
@@ -185,7 +185,7 @@ the Numfocus organization or to the `John Hunter Technology Fellowship
 <jdh-fellowship_>`_.
 
 .. _donating: https://www.flipcause.com/secure/cause_pdetails/MjI1OA==
-.. _jdh-fellowship: http://numfocus.org/johnhunter/
+.. _jdh-fellowship: https://www.numfocus.org/programs/john-hunter-technology-fellowship/
 
 The :doc:`Matplotlib license <users/license>` is based on the `Python Software
 Foundation (PSF) license <psf-license_>`_.
diff --git a/doc/users/history.rst b/doc/users/history.rst
@@ -73,7 +73,7 @@ devices, aka renderers, that transform the frontend representation to
 hardcopy or a display device (:ref:`what-is-a-backend`).  Example
 backends: PS creates `PostScript®
 <http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
-creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`_
+creates `Scalable Vector Graphics <https://www.w3.org/Graphics/SVG/>`_
 hardcopy, Agg creates PNG output using the high quality `Anti-Grain
 Geometry <http://antigrain.com/>`_
 library that ships with Matplotlib, GTK embeds Matplotlib in a
diff --git a/doc/users/prev_whats_new/changelog.rst b/doc/users/prev_whats_new/changelog.rst
@@ -15,11 +15,11 @@ the `API changes <../../api/api_changes.html>`_.
 
 2015-10-21 Added get_ticks_direction()
 
-2015-02-27 Added the rcParam 'image.composite_image' to permit users 
-		   to decide whether they want the vector graphics backends to combine 
-		   all images within a set of axes into a single composite image.  
-		   (If images do not get combined, users can open vector graphics files 
-		   in Adobe Illustrator or Inkscape and edit each image individually.)  
+2015-02-27 Added the rcParam 'image.composite_image' to permit users
+		   to decide whether they want the vector graphics backends to combine
+		   all images within a set of axes into a single composite image.
+		   (If images do not get combined, users can open vector graphics files
+		   in Adobe Illustrator or Inkscape and edit each image individually.)
 
 2015-02-19 Rewrite of C++ code that calculates contours to add support for
            corner masking.  This is controlled by the 'corner_mask' keyword
@@ -678,7 +678,7 @@ the `API changes <../../api/api_changes.html>`_.
            (with control of dimensions via squeeze keyword). FP.
 
 2010-03-13 Manually brought in commits from branch::
- 
+
     ------------------------------------------------------------------------
     r8191 | leejjoon | 2010-03-13 17:27:57 -0500 (Sat, 13 Mar 2010) | 1 line
 
@@ -1416,7 +1416,7 @@ the `API changes <../../api/api_changes.html>`_.
            and are somewhat out of date. If needed, install them
            independently, see:
 
-           http://code.enthought.com/projects/traits
+           http://code.enthought.com/pages/traits.html
 
            and:
 
diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/users/prev_whats_new/whats_new_1.0.rst
@@ -129,7 +129,7 @@ Much improved software carpentry
 The matplotlib trunk is probably in as good a shape as it has ever
 been, thanks to improved `software carpentry
 <http://software-carpentry.org/>`__.  We now have a `buildbot
-<http://buildbot.net/trac>`__ which runs a suite of `nose
+<https://buildbot.net>`__ which runs a suite of `nose
 <http://code.google.com/p/python-nose/>`__ regression tests on every
 svn commit, auto-generating a set of images and comparing them against
 a set of known-goods, sending emails to developers on failures with a
diff --git a/examples/images_contours_and_fields/shading_example.py b/examples/images_contours_and_fields/shading_example.py
@@ -7,7 +7,7 @@
 like Mathematica
 (http://reference.wolfram.com/mathematica/ref/ReliefPlot.html)
 or Generic Mapping Tools
-(http://gmt.soest.hawaii.edu/gmt/doc/gmt/html/GMT_Docs/node145.html)
+(https://gmt.soest.hawaii.edu/)
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/tutorials/introductory/images.py b/tutorials/introductory/images.py
@@ -58,9 +58,9 @@
 # ===============================================
 #
 # Loading image data is supported by the `Pillow
-# <https://python-pillow.org/>`_ library.  Natively, matplotlib only
-# supports PNG images.  The commands shown below fall back on Pillow if the
-# native read fails.
+# <https://pillow.readthedocs.io/en/latest/>`_ library.  Natively, Matplotlib
+# only supports PNG images.  The commands shown below fall back on Pillow if
+# the native read fails.
 #
 # The image used in this example is a PNG file, but keep that Pillow
 # requirement in mind for your own data.

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@`
`58`	`58`	`# ===============================================`
`59`	`59`	`#`
`60`	`60`	# Loading image data is supported by the `Pillow
`61`		-# <https://python-pillow.org/>`_ library. Natively, matplotlib only
`62`		`-# supports PNG images. The commands shown below fall back on Pillow if the`
`63`		`-# native read fails.`
	`61`	+# <https://pillow.readthedocs.io/en/latest/>`_ library. Natively, Matplotlib
	`62`	`+# only supports PNG images. The commands shown below fall back on Pillow if`
	`63`	`+# the native read fails.`
`64`	`64`	`#`
`65`	`65`	`# The image used in this example is a PNG file, but keep that Pillow`
`66`	`66`	`# requirement in mind for your own data.`