Merge remote-tracking branch 'origin/v2.1.1-doc' into v2.1.x

tacaswell · tacaswell · commit abb43516df12 · 2018-02-11T22:52:38.000-05:00
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -171,6 +171,9 @@ guide:
      'polar' | 'rectilinear'], optional
              The projection type of the axes.
 
+         ...
+         """
+
   Alternatively, you can describe the valid parameter values in a dedicated
   section of the docstring.
 
@@ -185,8 +188,6 @@ guide:
      -------
      lines : `~matplotlib.collections.LineCollection`
 
-
-
 Linking to other code
 ---------------------
 To link to other methods, classes, or modules in Matplotlib you can encase
@@ -304,6 +305,7 @@ calls in `matplotlib.patches`.
 
 Adding figures
 ==============
+
 Figures in the documentation are automatically generated from scripts.
 It is not necessary to explicitly save the figure from the script; this will be
 done automatically when the docs are built to ensure that the code that is
