Merge pull request #4427 from tacaswell/doc_linestyle_accepts

efiring · efiring · commit bbe291baaac2 · 2015-05-13T20:10:48.000-10:00
DOC : revert some documentation changes from #3772
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -498,6 +498,11 @@ def set_linestyle(self, ls):
         where ``onoffseq`` is an even length tuple of on and off ink
         in points.
 
+        ACCEPTS: ['solid' | 'dashed', 'dashdot', 'dotted' |
+                   (offset, on-off-dash-seq) |
+                   ``'-'`` | ``'--'`` | ``'-.'`` | ``':'`` | ``'None'`` |
+                   ``' '`` | ``''``]
+
         Parameters
         ----------
         ls : { '-',  '--', '-.', ':'} and more see description
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -949,6 +949,12 @@ def set_linestyle(self, ls):
         where ``onoffseq`` is an even length tuple of on and off ink
         in points.
 
+
+        ACCEPTS: ['solid' | 'dashed', 'dashdot', 'dotted' |
+                   (offset, on-off-dash-seq) |
+                   ``'-'`` | ``'--'`` | ``'-.'`` | ``':'`` | ``'None'`` |
+                   ``' '`` | ``''``]
+
         .. seealso::
 
             :meth:`set_drawstyle`
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -360,6 +360,11 @@ def set_linestyle(self, ls):
         where ``onoffseq`` is an even length tuple of on and off ink
         in points.
 
+        ACCEPTS: ['solid' | 'dashed', 'dashdot', 'dotted' |
+                   (offset, on-off-dash-seq) |
+                   ``'-'`` | ``'--'`` | ``'-.'`` | ``':'`` | ``'None'`` |
+                   ``' '`` | ``''``]
+
         Parameters
         ----------
         ls : { '-',  '--', '-.', ':'} and more see description
