Merge pull request #6074 from dylan-evans/master

tacaswell · tacaswell · commit f6f9996fd0c1 · 2016-02-29T09:25:28.000-05:00
DOC: linestyle is dash_dot and should be dashdot
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -497,7 +497,7 @@ def set_linestyle(self, ls):
         ===========================   =================
         ``'-'`` or ``'solid'``        solid line
         ``'--'`` or  ``'dashed'``     dashed line
-        ``'-.'`` or  ``'dash_dot'``   dash-dotted line
+        ``'-.'`` or  ``'dashdot'``    dash-dotted line
         ``':'`` or ``'dotted'``       dotted line
         ===========================   =================
 
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -989,7 +989,7 @@ def set_linestyle(self, ls):
         ===========================   =================
         ``'-'`` or ``'solid'``        solid line
         ``'--'`` or  ``'dashed'``     dashed line
-        ``'-.'`` or  ``'dash_dot'``   dash-dotted line
+        ``'-.'`` or  ``'dashdot'``    dash-dotted line
         ``':'`` or ``'dotted'``       dotted line
         ``'None'``                    draw nothing
         ``' '``                       draw nothing
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -358,7 +358,7 @@ def set_linestyle(self, ls):
         ===========================   =================
         ``'-'`` or ``'solid'``        solid line
         ``'--'`` or  ``'dashed'``     dashed line
-        ``'-.'`` or  ``'dash_dot'``   dash-dotted line
+        ``'-.'`` or  ``'dashdot'``    dash-dotted line
         ``':'`` or ``'dotted'``       dotted line
         ===========================   =================
 
