Merge pull request #13869 from meeseeksmachine/auto-backport-of-pr-13861-on-v3.1.x

dstansby · web-flow · commit 257c1ed31e59 · 2019-04-03T19:59:51.000+01:00
Backport PR #13861 on branch v3.1.x (Fix remaining links in docs)
diff --git a/INSTALL.rst b/INSTALL.rst
@@ -64,7 +64,7 @@ Third-party distributions of Matplotlib
 Scientific Python Distributions
 -------------------------------
 
-`Anaconda <https://www.continuum.io/downloads/>`_ and `Canopy
+`Anaconda <https://www.anaconda.com/>`_ and `Canopy
 <https://www.enthought.com/products/canopy/>`_ and `ActiveState
 <https://www.activestate.com/activepython/downloads>`_ are excellent
 choices that "just work" out of the box for Windows, macOS and common
diff --git a/doc/devel/MEP/MEP14.rst b/doc/devel/MEP/MEP14.rst
@@ -73,10 +73,10 @@ has a number of shortcomings.
 Supporting these things is difficult, and is the "full-time job" of a
 number of other projects:
 
-  - `pango <http://www.pango.org/>`_/`harfbuzz
+  - `pango <https://www.pango.org/>`_/`harfbuzz
     <https://www.freedesktop.org/wiki/Software/HarfBuzz/>`_
   - `QtTextLayout
-    <http://doc.qt.io/qt-4.8/qtextlayout.html>`_
+    <https://doc.qt.io/archives/qt-4.8/qtextlayout.html>`_
   - `Microsoft DirectWrite
     <https://msdn.microsoft.com/en-us/library/windows/desktop/dd371554(v=vs.85).aspx>`_
   - `Apple Core Text
diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
@@ -64,7 +64,7 @@ environment to build Matplotlib from source.
 To work on Matplotlib sources, it is strongly recommended to set up an alternative
 development environment, using the something like `virtual environments in python
 <http://docs.python-guide.org/en/latest/dev/virtualenvs/>`_, or a
-`conda environment <http://conda.pydata.org/docs/using/envs.html>`_.
+`conda environment <https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html>`_.
 
 If you choose to use an already existing environment, and not a clean virtual or
 conda environment, uninstall the current version of Matplotlib in that environment
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -900,7 +900,7 @@ Some helpful functions::
 
 .. _ReST: http://docutils.sourceforge.net/rst.html
 .. _Sphinx: http://www.sphinx-doc.org
-.. _documentation: http://www.sphinx-doc.org/contents.html
+.. _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/
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -12,7 +12,7 @@ Report a compilation problem
 
 See :ref:`reporting-problems`.
 
-matplotlib compiled fine, but nothing shows up when I use it
+Matplotlib compiled fine, but nothing shows up when I use it
 ============================================================
 
 The first thing to try is a :ref:`clean install <clean-install>` and see if
@@ -24,11 +24,11 @@ example::
 
    python -c "from pylab import *; plot(); show()" --verbose-helpful
 
-This will give you additional information about which backends matplotlib is
+This will give you additional information about which backends Matplotlib is
 loading, version information, and more. At this point you might want to make
-sure you understand matplotlib's :doc:`configuration </tutorials/introductory/customizing>`
+sure you understand Matplotlib's :doc:`configuration </tutorials/introductory/customizing>`
 process, governed by the :file:`matplotlibrc` configuration file which contains
-instructions within and the concept of the matplotlib backend.
+instructions within and the concept of the Matplotlib backend.
 
 If you are still having trouble, see :ref:`reporting-problems`.
 
@@ -84,7 +84,7 @@ excellent Python scientific software collections that are now available:
 - Canopy_ from Enthought_
 
 .. _Canopy: https://www.enthought.com/products/canopy/
-.. _Anaconda: https://www.continuum.io/downloads
+.. _Anaconda: https://www.anaconda.com/
 .. _Enthought: https://www.enthought.com
 .. _Continuum Analytics: https://www.continuum.io
 
@@ -195,7 +195,7 @@ and build and install as usual with::
       sudo apt-get build-dep python-matplotlib
 
    If you are on Fedora/RedHat, you can get all the dependencies required to
-   build matplotlib by first installing ``yum-builddep`` and then running::
+   build Matplotlib by first installing ``yum-builddep`` and then running::
 
       su -c 'yum-builddep python-matplotlib'
 
@@ -215,7 +215,7 @@ places.
 
    Windows users please see the :ref:`build_windows` guide.
 
-Then, if you want to update your matplotlib at any time, just do::
+Then, if you want to update your Matplotlib at any time, just do::
 
    git pull
 
diff --git a/doc/faq/troubleshooting_faq.rst b/doc/faq/troubleshooting_faq.rst
@@ -100,7 +100,7 @@ provide the following information in your e-mail to the `mailing list
      python -c "import matplotlib; print matplotlib.__version__"
 
 * Where you obtained Matplotlib (e.g., your Linux distribution's packages,
-  Github, PyPi, or `Anaconda <https://www.continuum.io/downloads>`_ or
+  Github, PyPi, or `Anaconda <https://www.anaconda.com/>`_ or
   `Enthought Canopy <https://www.enthought.com/products/canopy/>`_).
 
 * Any customizations to your ``matplotlibrc`` file (see
diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst
@@ -28,7 +28,6 @@ Glossary
       library used by matplotlib which supports TrueType, Type 1, and
       OpenType fonts.
 
-
   GDK
       The Gimp Drawing Kit for GTK+
 
@@ -88,7 +87,7 @@ Glossary
       application framework for desktop and embedded development.
 
   Qt4
-      `Qt4 <http://doc.qt.io/qt-4.8/index.html>`__ is the previous,
+      `Qt4 <https://doc.qt.io/archives/qt-4.8/index.html>`__ is the previous,
       but most widely used, version of Qt cross-platform application
       framework for desktop and embedded development.
 
diff --git a/doc/resources/index.rst b/doc/resources/index.rst
@@ -25,14 +25,10 @@
   by John Hunter and Michael Droettboom in The Architecture of Open Source
   Applications
 
-* `Graphics with Matplotlib
-  <http://kestrel.nmt.edu/~raymond/software/python_notes/paper004.html>`_
-  by David J. Raymond
-
 * `Ten Simple Rules for Better Figures
   <http://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1003833>`_
   by Nicolas P. Rougier, Michael Droettboom and Philip E. Bourne
-  
+
 * `Learning Scientific Programming with Python chapter 7
   <http://scipython.com/book/chapter-7-matplotlib/>`_
   by Christian Hill
diff --git a/doc/users/prev_whats_new/whats_new_2.2.rst b/doc/users/prev_whats_new/whats_new_2.2.rst
@@ -325,7 +325,7 @@ TkAgg backend reworked to support PyPy
 PyPy_ can now plot using the TkAgg backend, supported on PyPy 5.9
 and greater (both PyPy for python 2.7 and PyPy for python 3.5).
 
-.. _PyPy: https:/www.pypy.org
+.. _PyPy: https://www.pypy.org/
 
 
 
diff --git a/examples/style_sheets/ggplot.py b/examples/style_sheets/ggplot.py
@@ -10,7 +10,7 @@
 
 .. [1] https://web.archive.org/web/20111215111010/http://www.huyng.com/archives/sane-color-scheme-for-matplotlib/691/
 
-.. _ggplot: http://ggplot2.org/
+.. _ggplot: https://ggplot2.tidyverse.org/
 .. _R: https://www.r-project.org/
 
 """
