Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2c00342

Browse filesBrowse files
committed
Merge remote-tracking branch 'matplotlib/v1.5.0-doc' into v1.5.x
2 parents b27863d + 81f54ba commit 2c00342
Copy full SHA for 2c00342

File tree

Expand file treeCollapse file tree

2 files changed

+4
-7
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+4
-7
lines changed

‎doc/_templates/citing.html

Copy file name to clipboardExpand all lines: doc/_templates/citing.html
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ <h1>Citing matplotlib</h1>
2828

2929
<h2>DOIs</h2>
3030
<dl>
31+
<dt>v1.5.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.32914"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.32914.svg" alt="10.5281/zenodo.32914"></a></dd>
3132
<dt>v1.4.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.15423"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.15423.svg" alt="10.5281/zenodo.15423"></a></dd>
3233
<dt>v1.4.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12400"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12400.png" alt="10.5281/zenodo.12400"></a></dd>
3334
<dt>v1.4.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12287"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12287.png" alt="10.5281/zenodo.12287"></a></dd>

‎doc/style_changes.rst

Copy file name to clipboardExpand all lines: doc/style_changes.rst
+3-7Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,11 @@ All four color maps will be included in matplotlib 1.5.
2222
Everything Else
2323
---------------
2424

25-
We are soliciting proposals to change any and all visual defaults
25+
We have collected proposals to change any and all visual defaults
2626
(including adding new rcParams as needed).
2727

28-
If you have a proposal please create an issue or PR on `github <https://github.com/matplotlib/matplotlib/issues/new>`_ with the
29-
changes to `rcsetup.py` and `matplotlibrc.template` by August 9, 2015.
30-
31-
In the second week of August, Michael Droettboom and Thomas Caswell
32-
will decide on the new default styles, with the release of 2.0 by the
33-
beginning of September 2015.
28+
Michael Droettboom and Thomas Caswell will decide on the new default
29+
styles to appear in the upcoming 2.0 release.
3430

3531
A 'classic' style sheet will be provided so reverting to the 1.x
3632
default values will be a single line of python

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.