Merge remote-tracking branch 'matplotlib/v1.5.2-doc' into v2.x

tacaswell · tacaswell · commit 099f0af8e7c1 · 2016-08-27T14:12:16.000-04:00
diff --git a/doc/faq/usage_faq.rst b/doc/faq/usage_faq.rst
@@ -302,7 +302,7 @@ pygtk, wxpython, tkinter, qt4, or macosx; also referred to as
 "interactive backends") and hardcopy backends to make image files
 (PNG, SVG, PDF, PS; also referred to as "non-interactive backends").
 
-There are a four ways to configure your backend. If they conflict each other,
+There are four ways to configure your backend. If they conflict each other,
 the method mentioned last in the following list will be used, e.g. calling
 :func:`~matplotlib.use()` will override the setting in your ``matplotlibrc``.
 
diff --git a/doc/resources/index.rst b/doc/resources/index.rst
@@ -50,6 +50,10 @@
 * `Anatomy of Matplotlib
   <https://conference.scipy.org/scipy2013/tutorial_detail.php?id=103>`_
   by Benjamin Root
+  
+* `Data Visualization Basics with Python (O'Reilly)
+  <http://shop.oreilly.com/product/0636920046592.do>`_
+  by Randal S. Olson
 
 ==========
  Tutorials
diff --git a/doc/users/style_sheets.rst b/doc/users/style_sheets.rst
@@ -84,5 +84,5 @@ changes, you can write something like the following::
 
 
 .. _matplotlibrc: http://matplotlib.org/users/customizing.html
-.. _ggplot: http://had.co.nz/ggplot2/
-.. _R: http://www.r-project.org/
+.. _ggplot: http://ggplot2.org/
+.. _R: https://www.r-project.org/
