Change majority of redirected links in docs #7693

Merged
merged 5 commits into from Dec 31, 2016

Conversation

Projects
None yet
6 participants
Contributor

dstansby commented Dec 27, 2016

Having a play around with the sphinx linkchecker. This PR replaces quite a few links that redirect.

I'll open another PR in a bit for actual broken website changes as opposed to just redirects.

.. [3] http://matplotlib.1069221.n5.nabble.com/Matplotlib-gallery-td762.html#a33379091
-.. [4] http://www.loria.fr/~rougier/teaching/matplotlib/
-.. [5] http://www.loria.fr/~rougier/coding/gallery/
+.. [4] http://www.labri.fr/perso/nrougier/teaching/matplotlib/
@tacaswell

tacaswell Dec 27, 2016

Owner

Is this a typo? Would have guessed it should be http://www.labri.fr/person/rougier/teaching/matplotlib/

@dstansby

dstansby Dec 27, 2016

Contributor

It might be a typo on that website, yes!

/perso/ works, but http://www.labri.fr/person/nrougier/teaching/matplotlib/ gives a 404

@anntzer

anntzer Dec 29, 2016

Contributor

"perso" = French abbrev. for "personal" so it's probably intended as such.

Contributor

dstansby commented Dec 27, 2016

(FWIW, I've checked that these work by hand, apart from the http --> https changes)

Owner

tacaswell commented Dec 27, 2016

@QuLogic is going to love this PR 😄 .

@QuLogic

Some typos, improvements, etc.

INSTALL
or
-`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`__
+`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=29>`__
@QuLogic

QuLogic Dec 28, 2016

Member

Can add https on this one too.

INSTALL
or
-`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`__
+`32 bit <http://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>`__
@QuLogic

QuLogic Dec 28, 2016

Member

And this one and the one after it too.

with LaTeX.
`FFmpeg <https://www.ffmpeg.org/>`_, `avconv <https://libav.org/>`_,
`mencoder <http://www.mplayerhq.hu>`_, or
-`ImageMagick <http://www.imagemagick.org/>`_ are required for the
+`ImageMagick <http://www.imagemagick.org/script/index.php>`_ are required for the
@QuLogic

QuLogic Dec 28, 2016

Member

That's an unfortunate redirect; would have been nice if they didn't do that.

INSTALL
@@ -146,7 +146,7 @@ python, numpy, libpng and freetype), you can build matplotlib::
python setup.py install
We provide a `setup.cfg
-<https://github.com/matplotlib/matplotlib/raw/master/setup.cfg.template>`_
+<https://raw.githubusercontent.com/matplotlib/matplotlib/master/setup.cfg.templatef>`_
@QuLogic

QuLogic Dec 28, 2016

Member

Extra f added at the end here.

doc/devel/MEP/MEP13.rst
@@ -20,7 +20,7 @@ Abstract
Wrap all of the matplotlib getter and setter methods with python
`properties
-<http://docs.python.org/2/library/functions.html#property>`_, allowing
+<https://docs.python.org/2/library/functions.html#property>`_, allowing
@QuLogic

QuLogic Dec 28, 2016

Member

Change 2 to 3.

doc/devel/MEP/MEP25.rst
@@ -126,7 +126,7 @@ Implementation
* A simple NB demonstrating some functionality for
``Line2DController`` objects:
- http://nbviewer.ipython.org/gist/theengineear/f0aa8d79f64325e767c0
+ http://nbviewer.jupyter.org/gist/theengineear/f0aa8d79f64325e767c0
@QuLogic

QuLogic Dec 28, 2016

Member

https-able.

doc/devel/documenting_mpl.rst
-.. _index: http://sphinx.pocoo.org/markup/para.html#index-generating-markup
+.. _Sphinx: http://www.sphinx-doc.org
+.. _documentation: http://www.sphinx-doc.org/contents.html
+.. _`inline markup`: http://sphinx-doc.org/markup/inline.html
@QuLogic

QuLogic Dec 28, 2016

Member

Add www. on these two.

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
-<http://docs.python.org/2/distutils/packageindex.html>`_.
+<https://docs.python.org/2/distutils/packageindex.html>`_.
@QuLogic

QuLogic Dec 28, 2016

Member

2 -> 3

doc/devel/testing.rst
Optionally you can install:
- - `coverage <http://nedbatchelder.com/code/coverage/>`_ to collect coverage
+ - `coverage <http://coverage.readthedocs.io/en/latest/>`_ to collect coverage
@QuLogic

QuLogic Dec 28, 2016

Member

https-able.

doc/faq/howto_faq.rst
application servers? Write a FAQ or tutorial and we'll find a place
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.pocoo.org/index.html>`_ extensions to restructured text
+<http://sphinx-doc.org/index.html>`_ extensions to restructured text
@QuLogic

QuLogic Dec 28, 2016

Member

Add www..

doc/faq/installing_faq.rst
Homebrew, then you can use the standard pip installer to install matplotlib
binaries in the form of wheels.
Python.org Python
^^^^^^^^^^^^^^^^^
Install pip following the `standard pip install instructions
-<http://pip.readthedocs.io/en/latest/installing.html>`_. For the impatient,
+<http://pip.readthedocs.io/en/latest/installing/>`_. For the impatient,
@QuLogic

QuLogic Dec 28, 2016

Member

https-able.

doc/glossary/index.rst
dateutil
The `dateutil <https://dateutil.readthedocs.io>`_ library
provides extensions to the standard datetime module
EPS
- Encapsulated Postscript (`EPS <http://en.wikipedia.org/wiki/Encapsulated_PostScript>`_)
+ Encapsulated Postscript (`EPS <https://en.wikipedia.org/w/index.php?title=Encapsulated_PostScript>`_)
@QuLogic

QuLogic Dec 28, 2016

Member

Why all this extra stuff? (This applies to every wiki link in this file.)

@dstansby

dstansby Dec 28, 2016

Contributor

They were throwing a weird warning with linkcheker when I just added https, but they seem to be fine in the actual build like that. I'll change them back and just add https.

doc/users/event_handling.rst
@@ -240,8 +240,8 @@ Here is the solution::
**Extra credit**: use the animation blit techniques discussed in the
`animations recipe
-<http://www.scipy.org/Cookbook/Matplotlib/Animations>`_ to make the
-animated drawing faster and smoother.
+<http://scipy-cookbook.readthedocs.io/items/Matplotlib_Animations.html>`_ to
@QuLogic

QuLogic Dec 28, 2016

Member

https-able.

doc/users/usetex.rst
@@ -152,7 +152,7 @@ Troubleshooting
.. _LaTeX: http://www.tug.org
.. _dvipng: http://www.nongnu.org/dvipng/
-.. _Ghostscript: http://www.cs.wisc.edu/~ghost/
+.. _Ghostscript: http://pages.cs.wisc.edu/~ghost/
@QuLogic

QuLogic Dec 28, 2016

Member

Switch to ghostscript.com like the others?

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://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52308
+ From: http://code.activestate.com/recipes/121294/
@QuLogic

QuLogic Dec 28, 2016

Member

https-able.

lib/matplotlib/cbook.py
@@ -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://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/121294
+ From: http://code.activestate.com/recipes/121294/
@QuLogic

QuLogic Dec 28, 2016

Member

https-able.

Member

QuLogic commented Dec 28, 2016

It's probably not a good idea to modify the gitwash links and instead regenerate them from the original sources (which should be correct now) like @NelleV did in her PR.

This will also need a rebase after the other PR.

Contributor

dstansby commented Dec 28, 2016

That should be rebased and all the changes requested added, I don't how to regenerate the gitwash links, so feel free to commit to my branch to do that!

Owner

tacaswell commented Dec 29, 2016

Oh, that did not do what I thought it would do at all.

@dstansby Do you mind cleaning up the mess I made or may I force-push to your branch?

dstansby added some commits Dec 27, 2016

@dstansby dstansby Add https 6ec29e6
@dstansby dstansby Mass link redirection update f278217
@dstansby dstansby Catch last few redirect links 567d03a
@dstansby dstansby Fix little link bug 8eb34b2
@dstansby dstansby Requested changes for link redirect fixes
808d996
Contributor

dstansby commented Dec 29, 2016

I've undone the merge of master, and rebased again, which I presume was the aim?

codecov-io commented Dec 29, 2016 edited

Current coverage is 62.07% (diff: 100%)

Merging #7693 into master will decrease coverage by <.01%

@@             master      #7693   diff @@
==========================================
  Files           174        174          
  Lines         56022      56022          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
- Hits          34776      34774     -2   
- Misses        21246      21248     +2   
  Partials          0          0          

Powered by Codecov. Last update d8f535c...808d996

Owner

tacaswell commented Dec 29, 2016

Yes, thanks!

Owner

tacaswell commented Dec 29, 2016

For the record, I used the 'resolve conflict' button that I assume everyone with push rights can see.

@NelleV NelleV merged commit 196686e into matplotlib:master Dec 31, 2016

5 checks passed

codecov/patch Coverage not affected when comparing d8f535c...808d996
Details
codecov/project Absolute coverage decreased by -<.01% but relative coverage increased by +37.92% compared to d8f535c
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.004%) to 62.072%
Details
Contributor

NelleV commented Dec 31, 2016

Thanks for the pull request @dstansby !

@tacaswell tacaswell added a commit that referenced this pull request Dec 31, 2016

@NelleV @tacaswell NelleV + tacaswell Merge pull request #7693 from dstansby/doc-links
Change majority of redirected links in docs

Conflicts:
	doc/devel/MEP/MEP12.rst
	  - previously not backported changes to text still not
 	    backported
	doc/devel/release_guide.rst
	  - conflicts due to 2.x not having been merged up in a while,
	    a no longer existing link was fixed on master.
	doc/mpl_toolkits/index.rst
	  - manually fixed some links, master has reorganized this
	doc/thirdpartypackages/index.rst
	  - does not exist on this branch
dba5232
Owner

tacaswell commented Dec 31, 2016

Thanks, backported to v2.x as dba5232

dstansby deleted the dstansby:doc-links branch Jan 11, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment