From 68a9342c077611d7d3f0d2a93597b693b1cc12c0 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 3 Apr 2019 11:56:38 +0100 Subject: [PATCH] Fix remaining links in docs --- INSTALL.rst | 2 +- doc/devel/MEP/MEP14.rst | 4 ++-- doc/devel/contributing.rst | 2 +- doc/devel/documenting_mpl.rst | 2 +- doc/faq/installing_faq.rst | 14 +++++++------- doc/faq/troubleshooting_faq.rst | 2 +- doc/glossary/index.rst | 3 +-- doc/resources/index.rst | 6 +----- doc/users/prev_whats_new/whats_new_2.2.rst | 2 +- examples/style_sheets/ggplot.py | 2 +- 10 files changed, 17 insertions(+), 22 deletions(-) diff --git a/INSTALL.rst b/INSTALL.rst index ec0c74930812..81d381298ba3 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -64,7 +64,7 @@ Third-party distributions of Matplotlib Scientific Python Distributions ------------------------------- -`Anaconda `_ and `Canopy +`Anaconda `_ and `Canopy `_ and `ActiveState `_ are excellent choices that "just work" out of the box for Windows, macOS and common diff --git a/doc/devel/MEP/MEP14.rst b/doc/devel/MEP/MEP14.rst index ccdd80e13198..82a40a0bafbb 100644 --- a/doc/devel/MEP/MEP14.rst +++ b/doc/devel/MEP/MEP14.rst @@ -73,10 +73,10 @@ has a number of shortcomings. Supporting these things is difficult, and is the "full-time job" of a number of other projects: - - `pango `_/`harfbuzz + - `pango `_/`harfbuzz `_ - `QtTextLayout - `_ + `_ - `Microsoft DirectWrite `_ - `Apple Core Text diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst index a90dc1694d6a..d2d1224023f7 100644 --- a/doc/devel/contributing.rst +++ b/doc/devel/contributing.rst @@ -64,7 +64,7 @@ environment to build Matplotlib from source. To work on Matplotlib sources, it is strongly recommended to set up an alternative development environment, using the something like `virtual environments in python `_, or a -`conda environment `_. +`conda environment `_. If you choose to use an already existing environment, and not a clean virtual or conda environment, uninstall the current version of Matplotlib in that environment diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst index 75b3369517bc..d0ff0b1173a8 100644 --- a/doc/devel/documenting_mpl.rst +++ b/doc/devel/documenting_mpl.rst @@ -901,7 +901,7 @@ Some helpful functions:: .. _ReST: http://docutils.sourceforge.net/rst.html .. _Sphinx: http://www.sphinx-doc.org -.. _documentation: http://www.sphinx-doc.org/contents.html +.. _documentation: https://www.sphinx-doc.org/en/master/contents.html .. _`inline markup`: http://www.sphinx-doc.org/markup/inline.html .. _index: http://www.sphinx-doc.org/markup/para.html#index-generating-markup .. _`Sphinx Gallery`: https://sphinx-gallery.readthedocs.io/en/latest/ diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst index 6aa37b8ed0d2..7a88b32bf2db 100644 --- a/doc/faq/installing_faq.rst +++ b/doc/faq/installing_faq.rst @@ -12,7 +12,7 @@ Report a compilation problem See :ref:`reporting-problems`. -matplotlib compiled fine, but nothing shows up when I use it +Matplotlib compiled fine, but nothing shows up when I use it ============================================================ The first thing to try is a :ref:`clean install ` and see if @@ -24,11 +24,11 @@ example:: python -c "from pylab import *; plot(); show()" --verbose-helpful -This will give you additional information about which backends matplotlib is +This will give you additional information about which backends Matplotlib is loading, version information, and more. At this point you might want to make -sure you understand matplotlib's :doc:`configuration ` +sure you understand Matplotlib's :doc:`configuration ` process, governed by the :file:`matplotlibrc` configuration file which contains -instructions within and the concept of the matplotlib backend. +instructions within and the concept of the Matplotlib backend. If you are still having trouble, see :ref:`reporting-problems`. @@ -84,7 +84,7 @@ excellent Python scientific software collections that are now available: - Canopy_ from Enthought_ .. _Canopy: https://www.enthought.com/products/canopy/ -.. _Anaconda: https://www.continuum.io/downloads +.. _Anaconda: https://www.anaconda.com/ .. _Enthought: https://www.enthought.com .. _Continuum Analytics: https://www.continuum.io @@ -195,7 +195,7 @@ and build and install as usual with:: sudo apt-get build-dep python-matplotlib If you are on Fedora/RedHat, you can get all the dependencies required to - build matplotlib by first installing ``yum-builddep`` and then running:: + build Matplotlib by first installing ``yum-builddep`` and then running:: su -c 'yum-builddep python-matplotlib' @@ -215,7 +215,7 @@ places. Windows users please see the :ref:`build_windows` guide. -Then, if you want to update your matplotlib at any time, just do:: +Then, if you want to update your Matplotlib at any time, just do:: git pull diff --git a/doc/faq/troubleshooting_faq.rst b/doc/faq/troubleshooting_faq.rst index 3511a2141271..965f88165afb 100644 --- a/doc/faq/troubleshooting_faq.rst +++ b/doc/faq/troubleshooting_faq.rst @@ -100,7 +100,7 @@ provide the following information in your e-mail to the `mailing list python -c "import matplotlib; print matplotlib.__version__" * Where you obtained Matplotlib (e.g., your Linux distribution's packages, - Github, PyPi, or `Anaconda `_ or + Github, PyPi, or `Anaconda `_ or `Enthought Canopy `_). * Any customizations to your ``matplotlibrc`` file (see diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst index 5a62de4f4ea0..75ea5b8e18b3 100644 --- a/doc/glossary/index.rst +++ b/doc/glossary/index.rst @@ -28,7 +28,6 @@ Glossary library used by matplotlib which supports TrueType, Type 1, and OpenType fonts. - GDK The Gimp Drawing Kit for GTK+ @@ -88,7 +87,7 @@ Glossary application framework for desktop and embedded development. Qt4 - `Qt4 `__ is the previous, + `Qt4 `__ is the previous, but most widely used, version of Qt cross-platform application framework for desktop and embedded development. diff --git a/doc/resources/index.rst b/doc/resources/index.rst index 3b5107bcac61..ffc6239a5d2d 100644 --- a/doc/resources/index.rst +++ b/doc/resources/index.rst @@ -25,14 +25,10 @@ by John Hunter and Michael Droettboom in The Architecture of Open Source Applications -* `Graphics with Matplotlib - `_ - by David J. Raymond - * `Ten Simple Rules for Better Figures `_ by Nicolas P. Rougier, Michael Droettboom and Philip E. Bourne - + * `Learning Scientific Programming with Python chapter 7 `_ by Christian Hill diff --git a/doc/users/prev_whats_new/whats_new_2.2.rst b/doc/users/prev_whats_new/whats_new_2.2.rst index 5c6307cd7e9c..eaa7c4772fb6 100644 --- a/doc/users/prev_whats_new/whats_new_2.2.rst +++ b/doc/users/prev_whats_new/whats_new_2.2.rst @@ -325,7 +325,7 @@ TkAgg backend reworked to support PyPy PyPy_ can now plot using the TkAgg backend, supported on PyPy 5.9 and greater (both PyPy for python 2.7 and PyPy for python 3.5). -.. _PyPy: https:/www.pypy.org +.. _PyPy: https://www.pypy.org/ diff --git a/examples/style_sheets/ggplot.py b/examples/style_sheets/ggplot.py index abf66352f25e..799021e50cf5 100644 --- a/examples/style_sheets/ggplot.py +++ b/examples/style_sheets/ggplot.py @@ -10,7 +10,7 @@ .. [1] https://web.archive.org/web/20111215111010/http://www.huyng.com/archives/sane-color-scheme-for-matplotlib/691/ -.. _ggplot: http://ggplot2.org/ +.. _ggplot: https://ggplot2.tidyverse.org/ .. _R: https://www.r-project.org/ """