Merged revisions 8016,8036,8057 via svnmerge from

mdboom · mdboom · commit 7851aaca8257 · 2009-12-31T15:48:55.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r8016 | heeres | 2009-12-09 19:09:03 -0500 (Wed, 09 Dec 2009) | 2 lines Mplot3d: fix scatter3d markers bug ........ r8036 | jdh2358 | 2009-12-16 14:21:44 -0500 (Wed, 16 Dec 2009) | 1 line add mpl book to index sidebar ........ r8057 | mdboom | 2009-12-31 10:46:58 -0500 (Thu, 31 Dec 2009) | 2 lines [2916753] Wrong API signature- yscale ........ svn path=/trunk/matplotlib/; revision=8058
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -9,6 +9,12 @@ <h3>News</h3>
 pathto('users/installing') }}">installing</a>
 </p>
 
+<p>Sandro Tosi has a new book 
+<a href="http://www.packtpub.com/matplotlib-python-development/book">Matplotlib for python
+developers</a>
+also
+at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
+
 <p>Build websites like matplotlib's,
 with <a href="http://sphinx.pocoo.org/">sphinx</a> and extensions for
 mpl plots, math, inheritance diagrams -- try
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -945,7 +945,7 @@ def yscale(*args, **kwargs):
     """
     call signature::
 
-      xscale(scale, **kwargs)
+      yscale(scale, **kwargs)
 
     Set the scaling for the y-axis: %(scale)s
 
