Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Change majority of redirected links in docs #7693
Conversation
tacaswell
added this to the
2.0.1 (next bug fix release)
milestone
Dec 27, 2016
tacaswell
added the
Documentation
label
Dec 27, 2016
| .. [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
Dec 27, 2016
Owner
Is this a typo? Would have guessed it should be http://www.labri.fr/person/rougier/teaching/matplotlib/
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
Dec 29, 2016
Contributor
"perso" = French abbrev. for "personal" so it's probably intended as such.
|
(FWIW, I've checked that these work by hand, apart from the http --> https changes) |
|
@QuLogic is going to love this PR |
| 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>`__ |
| 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>`__ |
| 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
Dec 28, 2016
Member
That's an unfortunate redirect; would have been nice if they didn't do that.
| @@ -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>`_ |
| @@ -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 |
| @@ -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 |
| -.. _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 |
| @@ -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>`_. |
| Optionally you can install: | ||
| - - `coverage <http://nedbatchelder.com/code/coverage/>`_ to collect coverage | ||
| + - `coverage <http://coverage.readthedocs.io/en/latest/>`_ to collect coverage |
| 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 |
| 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, |
| 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
Dec 28, 2016
Member
Why all this extra stuff? (This applies to every wiki link in this file.)
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.
| @@ -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 |
| @@ -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/ |
| @@ -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/ |
| @@ -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/ |
|
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. |
|
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! |
|
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
|
I've undone the merge of master, and rebased again, which I presume was the aim? |
codecov-io
commented
Dec 29, 2016
•
Current coverage is 62.07% (diff: 100%)@@ 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
|
|
Yes, thanks! |
|
For the record, I used the 'resolve conflict' button that I assume everyone with push rights can see. |
NelleV
merged commit 196686e
into matplotlib:master
Dec 31, 2016
5 checks passed
|
Thanks for the pull request @dstansby ! |
tacaswell
added a commit
that referenced
this pull request
Dec 31, 2016
|
|
NelleV + tacaswell |
dba5232
|
|
Thanks, backported to v2.x as dba5232 |
dstansby commentedDec 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.