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 `_. Using tox --------- -`Tox `_ is a tool for running tests against +`Tox `_ 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 - `_ - by `unpingco `_ - * `Plotting with matplotlib `_ 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..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 -`__ +`__ and `bug tracker `__.