Requested changes for link redirect fixes

dstansby · dstansby · commit 808d996bdcbf · 2016-12-29T20:48:43.000Z
diff --git a/INSTALL b/INSTALL
@@ -67,11 +67,11 @@ In case Python 2.7 or 3.4 are not installed for all users,
 the Microsoft Visual C++ 2008 (
 `64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=15336>`__
 or
-`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=29>`__
+`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=29>`__
 for Python 2.7) or Microsoft Visual C++ 2010 (
-`64 bit <http://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
+`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
 or
-`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
+`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
 for Python 3.4) redistributable packages need to be installed.
 
 Matplotlib depends on `Pillow <https://pypi.python.org/pypi/Pillow>`_
@@ -146,7 +146,7 @@ python, numpy, libpng and freetype), you can build matplotlib::
   python setup.py install
 
 We provide a `setup.cfg
-<https://raw.githubusercontent.com/matplotlib/matplotlib/master/setup.cfg.templatef>`_
+<https://raw.githubusercontent.com/matplotlib/matplotlib/master/setup.cfg.template>`_
 file that goes with :file:`setup.py` which you can use to customize
 the build process. For example, which default backend to use, whether
 some of the optional libraries that matplotlib ships with are
diff --git a/doc/devel/MEP/MEP13.rst b/doc/devel/MEP/MEP13.rst
@@ -20,7 +20,7 @@ Abstract
 
 Wrap all of the matplotlib getter and setter methods with python
 `properties
-<https://docs.python.org/2/library/functions.html#property>`_, allowing
+<https://docs.python.org/3/library/functions.html#property>`_, allowing
 them to be read and written like class attributes.
 
 Detailed description
diff --git a/doc/devel/MEP/MEP25.rst b/doc/devel/MEP/MEP25.rst
@@ -126,7 +126,7 @@ Implementation
 
     * A simple NB demonstrating some functionality for
       ``Line2DController`` objects:
-      http://nbviewer.jupyter.org/gist/theengineear/f0aa8d79f64325e767c0
+      https://nbviewer.jupyter.org/gist/theengineear/f0aa8d79f64325e767c0
 
 2. Write in protocols for the ``Controller`` to *update* the model.
 
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -257,8 +257,8 @@ working with Sphinx in general. Here are a few additional things to keep in mind
 
 .. _Sphinx: http://www.sphinx-doc.org
 .. _documentation: http://www.sphinx-doc.org/contents.html
-.. _`inline markup`: http://sphinx-doc.org/markup/inline.html
-.. _index: http://sphinx-doc.org/markup/para.html#index-generating-markup
+.. _`inline markup`: http://www.sphinx-doc.org/markup/inline.html
+.. _index: http://www.sphinx-doc.org/markup/para.html#index-generating-markup
 
 * Please limit the text width of docstrings to 70 characters.
 
diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst
@@ -100,7 +100,7 @@ releases, since doing so will hide any available stable releases.
 
 You may need to set up your `.pypirc` file as described in the
 `distutils register command documentation
-<https://docs.python.org/2/distutils/packageindex.html>`_.
+<https://docs.python.org/3/distutils/packageindex.html>`_.
 
 Then updating the record on PyPI is as simple as::
 
diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -26,7 +26,7 @@ The following software is required to run the tests:
 
 Optionally you can install:
 
-  - `coverage <http://coverage.readthedocs.io/en/latest/>`_ to collect coverage
+  - `coverage <https://coverage.readthedocs.io/en/latest/>`_ to collect coverage
     information
   - `pep8 <http://pep8.readthedocs.io/en/latest>`_ to test coding standards
 
diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
@@ -591,7 +591,7 @@ for it in the :ref:`users-guide-index`.  Bundle matplotlib in a
 `py2exe <http://www.py2exe.org/>`_ app?  ... I think you get the idea.
 
 matplotlib is documented using the `sphinx
-<http://sphinx-doc.org/index.html>`_ extensions to restructured text
+<http://www.sphinx-doc.org/index.html>`_ extensions to restructured text
 `(ReST) <http://docutils.sourceforge.net/rst.html>`_.  sphinx is an
 extensible python framework for documentation projects which generates
 HTML and PDF, and is pretty easy to write; you can see the source for this
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -205,7 +205,7 @@ Python.org Python
 ^^^^^^^^^^^^^^^^^
 
 Install pip following the `standard pip install instructions
-<http://pip.readthedocs.io/en/latest/installing/>`_.  For the impatient,
+<https://pip.readthedocs.io/en/latest/installing/>`_.  For the impatient,
 open a new Terminal.app window and::
 
     curl -O https://bootstrap.pypa.io/get-pip.py
diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst
@@ -20,7 +20,7 @@ Glossary
       provides extensions to the standard datetime module
 
   EPS
-      Encapsulated Postscript (`EPS <https://en.wikipedia.org/w/index.php?title=Encapsulated_PostScript>`_)
+      Encapsulated Postscript (`EPS <https://en.wikipedia.org/wiki/Encapsulated_PostScript>`_)
 
   FreeType
       `FreeType <https://www.freetype.org/>`_ is a font rasterization
@@ -36,7 +36,7 @@ Glossary
 
   JPG
       The Joint Photographic Experts Group (`JPEG
-      <https://en.wikipedia.org/w/index.php?title=Jpeg>`_) compression method and
+      <https://en.wikipedia.org/wiki/Jpeg>`_) compression method and
       file format for photographic images
 
   numpy
@@ -47,17 +47,17 @@ Glossary
       deviation, fourier transforms, and convolutions.
 
   PDF
-      Adobe's Portable Document Format (`PDF <https://en.wikipedia.org/w/index.php?title=Portable_Document_Format>`_)
+      Adobe's Portable Document Format (`PDF <https://en.wikipedia.org/wiki/Portable_Document_Format>`_)
 
   PNG
       Portable Network Graphics (`PNG
-      <https://en.wikipedia.org/w/index.php?title=Portable_Network_Graphics>`_), a raster graphics format
+      <https://en.wikipedia.org/wiki/Portable_Network_Graphics>`_), a raster graphics format
       that employs lossless data compression which is more suitable
       for line art than the lossy jpg format. Unlike the gif format,
       png is not encumbered by requirements for a patent license.
 
   PS
-      Postscript (`PS <https://en.wikipedia.org/w/index.php?title=PostScript>`_) is a
+      Postscript (`PS <https://en.wikipedia.org/wiki/PostScript>`_) is a
       vector graphics ASCII text language widely used in printers and
       publishing.  Postscript was developed by adobe systems and is
       starting to show its age: for example is does not have an alpha
@@ -106,20 +106,20 @@ Glossary
 
   raster graphics
       `Raster graphics
-      <https://en.wikipedia.org/w/index.php?title=Raster_graphics>`_, or bitmaps,
+      <https://en.wikipedia.org/wiki/Raster_graphics>`_, or bitmaps,
       represent an image as an array of pixels which is resolution
       dependent. Raster graphics are generally most practical for
       photo-realistic images, but do not scale easily without loss of
       quality.
 
   SVG
       The Scalable Vector Graphics format (`SVG
-      <https://en.wikipedia.org/w/index.php?title=Svg>`_).  An XML based vector
+      <https://en.wikipedia.org/wiki/Svg>`_).  An XML based vector
       graphics format supported by many web browsers.
 
   TIFF
       Tagged Image File Format (`TIFF
-      <https://en.wikipedia.org/w/index.php?title=Tagged_Image_File_Format>`_) is a
+      <https://en.wikipedia.org/wiki/Tagged_Image_File_Format>`_) is a
       file format for storing images, including photographs and line
       art.
 
@@ -131,7 +131,7 @@ Glossary
 
   vector graphics
       `vector graphics
-      <https://en.wikipedia.org/w/index.php?title=Vector_graphics>`_ use geometrical
+      <https://en.wikipedia.org/wiki/Vector_graphics>`_ use geometrical
       primitives based upon mathematical equations to represent images
       in computer graphics. Primitives can include points, lines,
       curves, and shapes or polygons. Vector graphics are scalable,
diff --git a/doc/users/event_handling.rst b/doc/users/event_handling.rst
@@ -240,7 +240,7 @@ Here is the solution::
 
 **Extra credit**: use the animation blit techniques discussed in the
 `animations recipe
-<http://scipy-cookbook.readthedocs.io/items/Matplotlib_Animations.html>`_ to
+<https://scipy-cookbook.readthedocs.io/items/Matplotlib_Animations.html>`_ to
 make the animated drawing faster and smoother.
 
 Extra credit solution::
diff --git a/doc/users/usetex.rst b/doc/users/usetex.rst
@@ -152,7 +152,7 @@ Troubleshooting
 
 .. _LaTeX: http://www.tug.org
 .. _dvipng: http://www.nongnu.org/dvipng/
-.. _Ghostscript: http://pages.cs.wisc.edu/~ghost/
+.. _Ghostscript: https://ghostscript.com/
 .. _PSNFSS: http://www.ctan.org/tex-archive/macros/latex/required/psnfss/psnfss2e.pdf
 .. _Poppler: https://poppler.freedesktop.org/
 .. _Xpdf: http://www.foolabs.com/xpdf
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -674,7 +674,7 @@ class is even handier, and prettier to use.  Whenever you want to
       >>> point.datum
 
       By: Alex Martelli
-      From: http://code.activestate.com/recipes/121294/
+      From: https://code.activestate.com/recipes/121294/
     """
     def __init__(self, **kwds):
         self.__dict__.update(kwds)
@@ -869,7 +869,7 @@ def flatten(seq, scalarp=is_scalar_or_string):
         ['John', 'Hunter', 1, 23, 42, 5, 23]
 
     By: Composite of Holger Krekel and Luther Blissett
-    From: http://code.activestate.com/recipes/121294/
+    From: https://code.activestate.com/recipes/121294/
     and Recipe 1.12 in cookbook
     """
     for item in seq:
