Skip to content

Commit befab78

Browse files
tacaswelltacaswell
authored
Merge pull request matplotlib#13489 from tacaswell/224_prep
DOC: v2.2.4 prep
2 parents 00d2340 + 522c922 commit befab78

File tree

20 files changed

+326
-195
lines changed

20 files changed

+326
-195
lines changed

‎INSTALL.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Third-party distributions of Matplotlib
9696
Scientific Python Distributions
9797
-------------------------------
9898

99-
`Anaconda <https://www.continuum.io/downloads/>`_ and `Canopy
99+
`Anaconda <https://www.anaconda.com/distribution//>`_ and `Canopy
100100
<https://www.enthought.com/products/canopy/>`_ and `ActiveState
101101
<https://www.activestate.com/activepython/downloads>`_ are excellent
102102
choices that "just work" out of the box for Windows, macOS and common

‎doc/_static/mpl.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,14 @@ table.docutils {
623623
background-color: #eff3f4;
624624
}
625625

626+
/* tables inside class descriptions */
627+
dl.class table.property-table {
628+
width: 85%;
629+
border-spacing: 2px;
630+
border-collapse: collapse;
631+
border: 0px;
632+
}
633+
626634
/* tables inside parameter descriptions */
627635
td.field-body table.property-table {
628636
width: 100%;

‎doc/api/api_changes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ For new features that were added to Matplotlib, please see
1313
.. for a release comment out the toctree below
1414
1515
16-
.. toctree::
17-
:glob:
18-
:maxdepth: 1
16+
.. toctree::
17+
:glob:
18+
:maxdepth: 1
1919
20-
next_api_changes/*
20+
next_api_changes/*
2121
2222
2323
API Changes in 2.2.0

‎doc/citing.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ publication, please acknowledge this fact by citing `Hunter et al (2007)
2727
2828
DOIs
2929
----
30+
v2.2.3
31+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1343133.svg
32+
:target: https://doi.org/10.5281/zenodo.1343133
3033
v2.2.2
3134
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1202077.svg
3235
:target: https://doi.org/10.5281/zenodo.1202077

‎doc/devel/MEP/MEP24.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ but this seems more generally useful (for example growth rate as a
3131
function of angle). The assumption in the current code (as I
3232
understand it) is that the center of the graph is `r==0`, however it
3333
would be good to be able to set the center to be at any `r` (with any
34-
value less than the off set clipped).
34+
value less than the offset clipped).
3535

3636
Implementation
3737
==============

‎doc/devel/contributing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ environment to build Matplotlib from source.
6464
To work on Matplotlib sources, it is strongly recommended to set up an alternative
6565
development environment, using the something like `virtual environments in python
6666
<http://docs.python-guide.org/en/latest/dev/virtualenvs/>`_, or a
67-
`conda environment <http://conda.pydata.org/docs/using/envs.html>`_.
67+
`conda environment <https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html>`_.
6868

6969
If you choose to use an already existing environment, and not a clean virtual or
7070
conda environment, uninstall the current version of Matplotlib in that environment

‎doc/faq/howto_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ for it in the :ref:`users-guide-index`. Bundle Matplotlib in a
605605
`py2exe <http://www.py2exe.org/>`_ app? ... I think you get the idea.
606606

607607
Matplotlib is documented using the `sphinx
608-
<http://www.sphinx-doc.org/index.html>`_ extensions to restructured text
608+
<http://www.sphinx-doc.org/>`_ extensions to restructured text
609609
`(ReST) <http://docutils.sourceforge.net/rst.html>`_. sphinx is an
610610
extensible python framework for documentation projects which generates
611611
HTML and PDF, and is pretty easy to write; you can see the source for this

‎doc/faq/installing_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ excellent Python scientific software collections that are now available:
8484
- Canopy_ from Enthought_
8585

8686
.. _Canopy: https://www.enthought.com/products/canopy/
87-
.. _Anaconda: https://www.continuum.io/downloads
87+
.. _Anaconda: https://www.anaconda.com/distribution/
8888
.. _Enthought: https://www.enthought.com
8989
.. _Continuum Analytics: https://www.continuum.io
9090

‎doc/faq/troubleshooting_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ provide the following information in your e-mail to the `mailing list
100100
python -c "import matplotlib; print matplotlib.__version__"
101101

102102
* Where you obtained Matplotlib (e.g., your Linux distribution's packages,
103-
Github, PyPi, or `Anaconda <https://www.continuum.io/downloads>`_ or
103+
Github, PyPi, or `Anaconda <https://www.anaconda.com/distribution/>`_ or
104104
`Enthought Canopy <https://www.enthought.com/products/canopy/>`_).
105105

106106
* Any customizations to your ``matplotlibrc`` file (see

‎doc/thirdpartypackages/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ plotnine
6262
========
6363

6464
`plotnine <https://plotnine.readthedocs.io/en/stable/>`_ implements a grammar
65-
of graphics, similar to R's `ggplot2 <http://ggplot2.org/>`_. The grammar allows
65+
of graphics, similar to R's `ggplot2 <https://ggplot2.tidyverse.org/>`_. The grammar allows
6666
users to compose plots by explicitly mapping data to the visual objects that
6767
make up the plot.
6868

0 commit comments

Comments
 (0)