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 099f0af

Browse filesBrowse files
committed
Merge remote-tracking branch 'matplotlib/v1.5.2-doc' into v2.x
2 parents e7d7a49 + afb9d18 commit 099f0af
Copy full SHA for 099f0af

File tree

Expand file treeCollapse file tree

3 files changed

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

3 files changed

+7
-3
lines changed

‎doc/faq/usage_faq.rst

Copy file name to clipboardExpand all lines: doc/faq/usage_faq.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ pygtk, wxpython, tkinter, qt4, or macosx; also referred to as
302302
"interactive backends") and hardcopy backends to make image files
303303
(PNG, SVG, PDF, PS; also referred to as "non-interactive backends").
304304

305-
There are a four ways to configure your backend. If they conflict each other,
305+
There are four ways to configure your backend. If they conflict each other,
306306
the method mentioned last in the following list will be used, e.g. calling
307307
:func:`~matplotlib.use()` will override the setting in your ``matplotlibrc``.
308308

‎doc/resources/index.rst

Copy file name to clipboardExpand all lines: doc/resources/index.rst
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
* `Anatomy of Matplotlib
5151
<https://conference.scipy.org/scipy2013/tutorial_detail.php?id=103>`_
5252
by Benjamin Root
53+
54+
* `Data Visualization Basics with Python (O'Reilly)
55+
<http://shop.oreilly.com/product/0636920046592.do>`_
56+
by Randal S. Olson
5357

5458
==========
5559
Tutorials

‎doc/users/style_sheets.rst

Copy file name to clipboardExpand all lines: doc/users/style_sheets.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ changes, you can write something like the following::
8484

8585

8686
.. _matplotlibrc: http://matplotlib.org/users/customizing.html
87-
.. _ggplot: http://had.co.nz/ggplot2/
88-
.. _R: http://www.r-project.org/
87+
.. _ggplot: http://ggplot2.org/
88+
.. _R: https://www.r-project.org/

0 commit comments

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