Merge remote-tracking branch 'upstream/v1.4.2-doc' into v1.4.x

tacaswell · tacaswell · commit 4bbce2b233b5 · 2015-02-15T22:46:53.000-05:00
diff --git a/doc/users/artists.rst b/doc/users/artists.rst
@@ -104,7 +104,7 @@ The Axes also has helper methods to configure and decorate the x-axis
 and y-axis tick, tick labels and axis labels::
 
     xtext = ax.set_xlabel('my xdata') # returns a Text instance
-    ytext = ax.set_ylabel('my xdata')
+    ytext = ax.set_ylabel('my ydata')
 
 When you call :meth:`ax.set_xlabel <matplotlib.axes.Axes.set_xlabel>`,
 it passes the information on the :class:`~matplotlib.text.Text`
