8000 Merge remote-tracking branch 'matplotlib/v2.1.x' · matplotlib/matplotlib@427e0bb · GitHub
[go: up one dir, main page]
Skip to content

Commit 427e0bb

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v2.1.x'
2 parents 5f63dd4 + 052b52b commit 427e0bb

File tree

15 files changed

+577
-29
lines changed

15 files changed

+577
-29
lines changed

‎doc/devel/MEP/MEP29.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Improvements
5252
to use the html.parser from the standard library.
5353

5454
* Computation of text fragment positions could benefit from the OffsetFrom
55-
class. See for example item 5 in `Using Complex Coordinates with Annotations <http://matplotlib.org/devdocs/users/annotations.html#using-complex-coordinates-with-annotations>`_
55+
class. See for example item 5 in `Using Complex Coordinates with Annotations <http://matplotlib.org/devdocs/tutorials/text/annotations.html#using-complex-coordinates-with-annotations>`_
5656

5757
Problems
5858
--------

‎doc/devel/gitwash/git_links.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
.. _git-osx-installer: https://git-scm.com/download/mac
1717
.. _subversion: http://subversion.tigris.org/
1818
.. _git cheat sheet: https://help.github.com/git-cheat-sheets/
19-
.. _pro git book: https://progit.org/
19+
.. _pro git book: https://git-scm.com/book/en/v2
2020
.. _git svn crash course: https://git-scm.com/course/svn.html
2121
.. _network graph visualizer: https://github.com/blog/39-say-hello-to-the-network-graph-visualizer
2222
.. _git user manual: https://schacon.github.io/git/user-manual.html

‎doc/devel/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Matplotlib's testing infrastructure depends on pytest_. The tests are in
99
infrastructure are in :mod:`matplotlib.testing`.
1010

1111
.. _pytest: http://doc.pytest.org/en/latest/
12-
.. _mock: https://docs.python.org/dev/library/unittest.mock.html>
12+
.. _mock: https://docs.python.org/3/library/unittest.mock.html>
1313
.. _Ghostscript: https://www.ghostscript.com/
1414
.. _Inkscape: https://inkscape.org
1515
.. _pytest-cov: https://pytest-cov.readthedocs.io/en/latest/

‎doc/users/dflt_style_changes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ The default font has changed from "Bitstream Vera Sans" to "DejaVu
689689
Sans". DejaVu Sans has additional international and math characters,
690690
but otherwise has the same appearance as Bitstream Vera Sans.
691691
Latin, Greek, Cyrillic, Armenian, Georgian, Hebrew, and Arabic are
692-
`all supported <http://dejavu-fonts.org/wiki/Main_Page>`__
692+
`all supported <https://dejavu-fonts.github.io/>`__
693693
(but right-to-left rendering is still not handled by matplotlib).
694694
In addition, DejaVu contains a sub-set of emoji symbols.
695695

0 commit comments

Comments
 (0)
0