From 6d642aefc9d873226d44ac293f3fed98deba4a8a Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 27 Dec 2016 23:20:23 +0000 Subject: [PATCH 1/2] Fix a few broken links --- doc/devel/MEP/MEP11.rst | 2 +- doc/devel/gitwash/git_links.inc | 2 +- doc/devel/license.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/devel/MEP/MEP11.rst b/doc/devel/MEP/MEP11.rst index 67274038877e..4a76d56be792 100644 --- a/doc/devel/MEP/MEP11.rst +++ b/doc/devel/MEP/MEP11.rst @@ -117,7 +117,7 @@ Implementation For installing from source, and assuming the user has all of the C-level compilers and dependencies, this can be accomplished fairly easily using `distribute` and following the instructions `here -`_. The only anticipated +`_. The only anticipated change to the matplotlib library code will be to import `pyparsing` from the top-level namespace rather than from within matplotlib. Note that `distribute` will also allow us to remove the direct dependency diff --git a/doc/devel/gitwash/git_links.inc b/doc/devel/gitwash/git_links.inc index 2fe60e3fe8e8..e4c76a219f45 100644 --- a/doc/devel/gitwash/git_links.inc +++ b/doc/devel/gitwash/git_links.inc @@ -22,7 +22,7 @@ .. _network graph visualizer: http://github.com/blog/39-say-hello-to-the-network-graph-visualizer .. _git user manual: http://schacon.github.com/git/user-manual.html .. _git tutorial: http://schacon.github.com/git/gittutorial.html -.. _git community book: http://book.git-scm.com/ +.. _git community book: https://git-scm.com/book/en/v2 .. _git ready: http://www.gitready.com/ .. _git casts: http://www.gitcasts.com/ .. _Fernando's git page: http://www.fperez.org/py4science/git.html diff --git a/doc/devel/license.rst b/doc/devel/license.rst index 6afe33afc559..fb591661f2c2 100644 --- a/doc/devel/license.rst +++ b/doc/devel/license.rst @@ -6,7 +6,7 @@ Licenses Matplotlib only uses BSD compatible code. If you bring in code from another project make sure it has a PSF, BSD, MIT or compatible license (see the Open Source Initiative `licenses page -`_ for details on individual +`_ for details on individual licenses). If it doesn't, you may consider contacting the author and asking them to relicense it. GPL and LGPL code are not acceptable in the main code base, though we are considering an alternative way of From 83827c271a710c81e4bc0f2fb39a25f7078c6ee6 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 27 Dec 2016 23:25:51 +0000 Subject: [PATCH 2/2] One more link fix --- doc/users/colormaps.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/users/colormaps.rst b/doc/users/colormaps.rst index 33bebc508e59..63757f97a8dd 100644 --- a/doc/users/colormaps.rst +++ b/doc/users/colormaps.rst @@ -168,7 +168,8 @@ Color vision deficiencies There is a lot of information available about color blindness (*e.g.*, [colorblindness]_). Additionally, there are tools available to convert images to -how they look for different types of color vision deficiencies (*e.g.*, [asp]_). +how they look for different types of color vision deficiencies (*e.g.*, +[vischeck]_). The most common form of color vision deficiency involves differentiating between red and green. Thus, avoiding colormaps with both red and green will avoid many @@ -187,5 +188,5 @@ References .. [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://www.color-blindness.com/ -.. [asp] http://aspnetresources.com/tools/colorBlindness +.. [vischeck] http://www.vischeck.com/vischeck/ .. [IBM] http://www.research.ibm.com/people/l/lloydt/color/color.HTM