matplotlib
diff --git a/‎lib/matplotlib/axes/_axes.py
Lines changed: 44 additions & 27 deletions b/‎lib/matplotlib/axes/_axes.py
Lines changed: 44 additions & 27 deletions
diff --git a/‎lib/matplotlib/collections.py
Lines changed: 36 additions & 38 deletions b/‎lib/matplotlib/collections.py
Lines changed: 36 additions & 38 deletions
diff --git a/‎lib/matplotlib/tests/test_axes.py
Lines changed: 1 addition & 0 deletions b/‎lib/matplotlib/tests/test_axes.py
Lines changed: 1 addition & 0 deletions
@@ -1091,55 +1091,72 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
                   linelengths=1, linewidths=None, colors=None,
                   linestyles='solid', **kwargs):
         """
-        Plot identical parallel lines at specific positions.
+        Plot identical parallel lines at the given positions.
 
-        Plot parallel lines at the given positions.  positions should be a 1D
-        or 2D array-like object, with each row corresponding to a row or column
-        of lines.
+        *positions* should be a 1D or 2D array-like object, with each row
+        corresponding to a row or column of lines.
 
         This type of plot is commonly used in neuroscience for representing
-        neural events, where it is commonly called a spike raster, dot raster,
+        neural events, where it is usually called a spike raster, dot raster,
         or raster plot.
 
         However, it is useful in any situation where you wish to show the
         timing or position of multiple sets of discrete events, such as the
         arrival times of people to a business on each day of the month or the
         date of hurricanes each year of the last century.
 
-        *orientation* : [ 'horizontal' | 'vertical' ]
-          'horizontal' : the lines will be vertical and arranged in rows
-          'vertical' : lines will be horizontal and arranged in columns
+        Parameters
+        ----------
+        positions : 1D or 2D array-like object.
+            Each value is an event. If *positions* is a 2D array-like, each
+            row corresponds to a row or a column of lines (depending on the
+            *orientation* parameter).
+
+        orientation : str [ 'horizontal' (default) | 'vertical' ], optional.
+            'horizontal' : the lines will be vertical and arranged in rows.
+            'vertical' : the lines will be horizontal and arranged in columns.
 
-        *lineoffsets* :
-          A float or array-like containing floats.
+        lineoffsets : scalar or sequence of scalars, optional. Default is 1.
+            The offset of the center of the lines from the origin.
 
-        *linelengths* :
-          A float or array-like containing floats.
+        linelengths : scalar or sequence of scalars, optional. Default is 1.
+            The total height of the lines (i.e. the lines stretches from
+            ``lineoffset + linelength/2`` to ``lineoffset - linelength/2``).
 
-        *linewidths* :
-          A float or array-like containing floats.
+        linewidths : scalar, scalar sequence or None, optional. Default: None.
+            If it is None, defaults to its rcParams setting.
 
-        *colors*
-          must be a sequence of RGBA tuples (e.g., arbitrary color
-          strings, etc, not allowed) or a list of such sequences
+        colors : color, sequence of colors or None, optional. Default is None.
+            If it is None, defaults to its rcParams setting.
 
-        *linestyles* :
-          [ 'solid' | 'dashed' | 'dashdot' | 'dotted' ] or an array of these
-          values
+        linestyles : str or tuple or a sequence of such values, optional.
+            Default is 'solid'. Valid strings are [ 'solid' | 'dashed' |
+            'dashdot' | 'dotted' | '-' | '--' | '-.' | ':' ]. Dash tuples
+            have to follow::
 
-        For linelengths, linewidths, colors, and linestyles, if only a single
-        value is given, that value is applied to all lines.  If an array-like
-        is given, it must have the same length as positions, and each value
-        will be applied to the corresponding row or column in positions.
+                (offset, onoffseq),
 
-        Returns a list of :class:`matplotlib.collections.EventCollection`
-        objects that were added.
+            where *onoffseq* is an even length tuple of on and off ink
+            in points.
+
+        For *linelengths*, *linewidths*, *colors*, and *linestyles*, if only
+        a single value is given, that value is applied to all lines.  If an
+        array-like is given, it must have the same length as positions, and
+        each value will be applied to the corresponding row or column in
+        positions.
 
         kwargs are :class:`~matplotlib.collections.LineCollection` properties:
 
         %(LineCollection)s
 
-        **Example:**
+        Returns
+        -------
+
+        A list of :class:`matplotlib.collections.EventCollection` objects that
+        were added.
+
+        Example
+        -------
 
         .. plot:: mpl_examples/pylab_examples/eventplot_demo.py
         """
 
@@ -1243,9 +1243,9 @@ class EventCollection(LineCollection):
     '''
     A collection of discrete events.
 
-    An event is a 1-dimensional value, usually the position of something along
-    an axis, such as time or length.  Events do not have an amplitude.  They
-    are displayed as v
+    The events are a 1-dimensional array, usually the position of something
+    along an axis, such as time or length.  The do not have an amplitude and
+    are displayed as vertical or horizontal parallel bars.
     '''
 
     _edge_default = True
@@ -1262,51 +1262,49 @@ def __init__(self,
                  **kwargs
                  ):
         """
-        *positions*
-            a sequence of numerical values or a 1D numpy array.  Can be None
+        Parameters
+        ----------
+        positions : 1D array-like object or None.
+            Each value is an event.
 
-        *orientation* [ 'horizontal' | 'vertical' | None ]
-            defaults to 'horizontal' if not specified or None
+        orientation : [ None (default) | 'horizontal' | 'vertical'], optional.
+            The orientation of the **collection** (the event bars are along
+            the orthogonal direction). Defaults to 'horizontal' if not
+            specified or None.
 
-        *lineoffset*
-            a single numerical value, corresponding to the offset of the center
-            of the markers from the origin
+        lineoffset : scalar, optional. Default is 0.
+            The offset of the center of the markers from the origin.
 
-        *linelength*
-            a single numerical value, corresponding to the total height of the
-            marker (i.e. the marker stretches from lineoffset+linelength/2 to
-            lineoffset-linelength/2).  Defaults to 1
+        linelength : scalar, optional. Default is 1.
+            The total height of the marker (i.e. the marker stretches from
+            ``lineoffset + linelength/2`` to ``lineoffset - linelength/2``).
 
-        *linewidth*
-            a single numerical value
+        linewidth : scalar or None, optional. Default is None.
+            If it is None, defaults to its rcParams setting, in sequence form.
 
-        *color*
-            must be a sequence of RGBA tuples (e.g., arbitrary color
-            strings, etc, not allowed).
+        color : color, sequence of colors or None, optional. Default is None.
+            If it is None, defaults to its rcParams setting, in sequence form.
 
-        *linestyle* [ 'solid' | 'dashed' | 'dashdot' | 'dotted' ]
+        linestyle : str or tuple, optional. Default is 'solid'.
+            If it is a string, it has to be among [ 'solid' | 'dashed' |
+            'dashdot' | 'dotted' | '-' | '--' | '-.' | ':' ]. If it is a dash
+            tuple, it has to be of the form::
 
-        *antialiased*
-            1 or 2
+                (offset, onoffseq),
 
-        If *linewidth*, *color*, or *antialiased* is None, they
-        default to their rcParams setting, in sequence form.
+            where *onoffseq* is an even length tuple of on and off ink
+            in points.
 
-        *norm*
-            None (optional for :class:`matplotlib.cm.ScalarMappable`)
-        *cmap*
-            None (optional for :class:`matplotlib.cm.ScalarMappable`)
+        antialiased : [None (default) | 1 | 2], optional.
+            If it is None, defaults to its rcParams setting, in sequence form.
 
-        *pickradius* is the tolerance for mouse clicks picking a line.
-        The default is 5 pt.
+        Additional kwargs of :class:`~matplotlib.collections.LineCollection`
+        can also be used:
 
-        The use of :class:`~matplotlib.cm.ScalarMappable` is optional.
-        If the :class:`~matplotlib.cm.ScalarMappable` array
-        :attr:`~matplotlib.cm.ScalarMappable._A` is not None (i.e., a call to
-        :meth:`~matplotlib.cm.ScalarMappable.set_array` has been made), at
-        draw time a call to scalar mappable will be made to set the colors.
+        %(LineCollection)s
 
-        **Example:**
+        Example
+        -------
 
         .. plot:: mpl_examples/pylab_examples/eventcollection_demo.py
         """
@@ -1316,8 +1314,8 @@ def __init__(self,
         if len(positions) == 0:
             segments = []
         elif hasattr(positions, 'ndim') and positions.ndim > 1:
-            raise ValueError('if positions is an ndarry it cannot have '
-                             'dimensionality great than 1 ')
+            raise ValueError('if positions is an ndarray it cannot have '
+                             'dimensionality strictly greater than 1 ')
         elif (orientation is None or orientation.lower() == 'none' or
               orientation.lower() == 'horizontal'):
             positions.sort()
 
@@ -2932,6 +2932,7 @@ def test_eventplot_colors():
     for ax in axs.flat:
         ax.set_xlim(-0.1, 3.1)  # avoid having some events on the axes edges
 
+
 @image_comparison(baseline_images=['test_eventplot_problem_kwargs'],
                   extensions=['png'], remove_text=True)
 def test_eventplot_problem_kwargs():