Small additional doc updates.

Author: anntzer

…/api/next_api_changes/2018-06-01-AFV.rst …/next_api_changes/behavior/20699-AFV.rstdoc/api/next_api_changes/2018-06-01-AFV.rst renamed to doc/api/next_api_changes/behavior/20699-AFV.rst doc/api/next_api_changes/2018-06-01-AFV.rst renamed to doc/api/next_api_changes/behavior/20699-AFV.rst

@@ -19,8 +19,7 @@ after instantiating a legend.
   leg.legendHandles[0].set_mec("black")  # marker edge color
 
 The former legend handler for Line2D objects has been renamed
-`.HandlerLine2DCompound`. To revert to the behavior that was used before
-Matplotlib 3, one can use
+`.HandlerLine2DCompound`. To revert to the previous behavior, one can use
 
 .. code::
 

lib/matplotlib/legend_handler.py

@@ -207,8 +207,9 @@ def get_ydata(self, legend, xdescent, ydescent, width, height, fontsize):
 class HandlerLine2DCompound(HandlerNpoints):
     """
     Original handler for `.Line2D` instances, that relies on combining
-    a line-only with a marker-only artist.
+    a line-only with a marker-only artist.  May be deprecated in the future.
     """
+
     def __init__(self, marker_pad=0.3, numpoints=None, **kwargs):
         """
         Parameters
@@ -257,25 +258,22 @@ class HandlerLine2D(HandlerNpoints):
     """
     Handler for `.Line2D` instances.
 
-    A class similar to the original handler for `.Line2D` instances but
-    that uses a monolithic artist rather than using one artist for the
-    line and another one for the marker(s).  NB: the former handler, in
-    use before Matplotlib 3, is still available as `.HandlerLine2DCompound`.
-
+    See Also
+    --------
+    HandlerLine2DCompound : An earlier handler implementation, which used one
+                            artist for the line and another for the marker(s).
     """
+
     def __init__(self, marker_pad=0.3, numpoints=None, **kw):
         """
         Parameters
         ----------
         marker_pad : float
             Padding between points in legend entry.
-
         numpoints : int
             Number of points to show in legend entry.
-
-        Notes
-        -----
-        Any other keyword arguments are given to `HandlerNpoints`.
+        **kwargs
+            Keyword arguments forwarded to `.HandlerNpoints`.
         """
         HandlerNpoints.__init__(self, marker_pad=marker_pad,
                                 numpoints=numpoints, **kw)

lib/matplotlib/tests/test_legend.py

@@ -865,9 +865,7 @@ def test_legend_text_axes():
 
 
 def test_handlerline2d():
-    '''Test consistency of the marker for the (monolithic) Line2D legend
-    handler (see #11357).
-    '''
+    # Test marker consistency for monolithic Line2D legend handler (#11357).
     fig, ax = plt.subplots()
     ax.scatter([0, 1], [0, 1], marker="v")
     handles = [mlines.Line2D([0], [0], marker="v")]