From c4adbca71b58134a6fe5333fc894eaaf51504bf8 Mon Sep 17 00:00:00 2001
From: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: Wed, 30 Nov 2016 15:31:26 -0800
Subject: [PATCH 1/2] DOC replaced dead links with active ones

closes #6678
---
 doc/devel/testing.rst                      | 3 ++-
 doc/resources/index.rst                    | 4 ----
 doc/users/colormaps.rst                    | 2 +-
 doc/users/prev_whats_new/whats_new_1.0.rst | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
index fdf619ca853d..1054589bdf34 100644
--- a/doc/devel/testing.rst
+++ b/doc/devel/testing.rst
@@ -266,7 +266,8 @@ example <https://travis-ci.org/msabramo/matplotlib>`_.
 Using tox
 ---------
 
-`Tox <http://tox.testrun.org/>`_ is a tool for running tests against
+`Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running
+tests against
 multiple Python environments, including multiple versions of Python
 (e.g., 2.7, 3.4, 3.5) and even different Python implementations
 altogether (e.g., CPython, PyPy, Jython, etc.)
diff --git a/doc/resources/index.rst b/doc/resources/index.rst
index b58df6f54f23..73b40630f47d 100644
--- a/doc/resources/index.rst
+++ b/doc/resources/index.rst
@@ -37,10 +37,6 @@
  Videos
 =======
 
-* `Getting started with Matplotlib
-  <http://showmedo.com/videotutorials/video?name=7200090&fromSeriesID=720>`_
-  by `unpingco <http://showmedo.com/videotutorials/?author=6237>`_
-
 * `Plotting with matplotlib <http://www.youtube.com/watch?v=P7SVi0YTIuE>`_
   by Mike Müller
 
diff --git a/doc/users/colormaps.rst b/doc/users/colormaps.rst
index 407faad5c036..2c2476007dc0 100644
--- a/doc/users/colormaps.rst
+++ b/doc/users/colormaps.rst
@@ -186,6 +186,6 @@ References
 .. [mycarta-lablinear] http://mycarta.wordpress.com/2012/12/06/the-rainbow-is-deadlong-live-the-rainbow-part-5-cie-lab-linear-l-rainbow/
 .. [mycarta-cubelaw] http://mycarta.wordpress.com/2013/02/21/perceptual-rainbow-palette-the-method/
 .. [bw] http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/
-.. [colorblindness] http://aspnetresources.com/tools/colorBlindness
+.. [colorblindness] http://www.color-blindness.com/
 .. [asp] http://aspnetresources.com/tools/colorBlindness
 .. [IBM] http://www.research.ibm.com/people/l/lloydt/color/color.HTM
diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/users/prev_whats_new/whats_new_1.0.rst
index bc7a336b3065..0da674204eb9 100644
--- a/doc/users/prev_whats_new/whats_new_1.0.rst
+++ b/doc/users/prev_whats_new/whats_new_1.0.rst
@@ -69,7 +69,7 @@ figures since the last call.  Eric has done a lot of testing on the
 user interface toolkits and versions and platforms he has access to,
 but it is not possible to test them all, so please report problems to
 the `mailing list
-<http://mail.python.org/mailman/listinfo/matplotlib users>`__
+<http://mail.python.org/mailman/listinfo/matplotlib-users>`__
 and `bug tracker
 <http://github.com/matplotlib/matplotlib/issues>`__.
 

From f1aa758663e152612bc12d3b1a91f40a185857a5 Mon Sep 17 00:00:00 2001
From: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: Wed, 30 Nov 2016 16:29:00 -0800
Subject: [PATCH 2/2] FIX http -> https

---
 doc/users/prev_whats_new/whats_new_1.0.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/users/prev_whats_new/whats_new_1.0.rst
index 0da674204eb9..940aac6e362c 100644
--- a/doc/users/prev_whats_new/whats_new_1.0.rst
+++ b/doc/users/prev_whats_new/whats_new_1.0.rst
@@ -69,7 +69,7 @@ figures since the last call.  Eric has done a lot of testing on the
 user interface toolkits and versions and platforms he has access to,
 but it is not possible to test them all, so please report problems to
 the `mailing list
-<http://mail.python.org/mailman/listinfo/matplotlib-users>`__
+<https://mail.python.org/mailman/listinfo/matplotlib-users>`__
 and `bug tracker
 <http://github.com/matplotlib/matplotlib/issues>`__.