Merge pull request #17762 from meeseeksmachine/auto-backport-of-pr-17742-on-v3.3.x

QuLogic · web-flow · commit ca174384913c · 2020-06-26T01:42:29.000-04:00
Backport PR #17742 on branch v3.3.x (Update tricontour[f] docs)
diff --git a/doc/api/tri_api.rst b/doc/api/tri_api.rst
@@ -7,6 +7,9 @@
 .. autoclass:: matplotlib.tri.Triangulation
     :members:
 
+.. autoclass:: matplotlib.tri.TriContourSet
+    :show-inheritance:
+
 .. autoclass:: matplotlib.tri.TriFinder
 
 .. autoclass:: matplotlib.tri.TrapezoidMapTriFinder
diff --git a/doc/missing-references.json b/doc/missing-references.json
@@ -1374,12 +1374,6 @@
     "matplotlib.colorbar.ColorbarBase.set_norm": [
       "doc/api/prev_api_changes/api_changes_3.1.0.rst:290"
     ],
-    "matplotlib.contour.TriContourSet": [
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.tricontour:57",
-      "lib/matplotlib/pyplot.py:docstring of matplotlib.pyplot.tricontourf:57",
-      "lib/matplotlib/tri/tricontour.py:docstring of matplotlib.axes.Axes.tricontour:57",
-      "lib/matplotlib/tri/tricontour.py:docstring of matplotlib.axes.Axes.tricontourf:57"
-    ],
     "matplotlib.dates.rrulewrapper": [
       "lib/matplotlib/dates.py:docstring of matplotlib.dates:121"
     ],
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -1653,7 +1653,7 @@ def _initialize_x_y(self, z):
             By default (value *None*), the colormap specified by *cmap*
             will be used.
 
-        alpha : float, optional
+        alpha : float, default: 1
             The alpha blending value, between 0 (transparent) and 1 (opaque).
 
         cmap : str or `.Colormap`, default: :rc:`image.cmap`
@@ -1707,7 +1707,7 @@ def _initialize_x_y(self, z):
             and above the *levels* range.
 
             Values below ``min(levels)`` and above ``max(levels)`` are mapped
-            to the under/over values of the `.Colormap`. Note, that most
+            to the under/over values of the `.Colormap`. Note that most
             colormaps do not have dedicated colors for these by default, so
             that the over and under values are the edge values of the colormap.
             You may want to set these values explicitly using
diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py
