Merge pull request #17894 from Carreau/npdoc

QuLogic · web-flow · commit d7feb03da5b7 · 2020-07-14T03:02:50.000-04:00
DOC: Numpydoc format.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -273,9 +273,10 @@ def _get_executable_info(name):
 
     Returns
     -------
-    If the executable is found, a namedtuple with fields ``executable`` (`str`)
-    and ``version`` (`distutils.version.LooseVersion`, or ``None`` if the
-    version cannot be determined).
+    tuple
+        A namedtuple with fields ``executable`` (`str`) and ``version``
+        (`distutils.version.LooseVersion`, or ``None`` if the version cannot be
+        determined).
 
     Raises
     ------
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -934,10 +934,10 @@ def cohere(x, y, NFFT=256, Fs=2, detrend=detrend_none, window=window_hanning,
 
     Returns
     -------
-    The return value is the tuple (*Cxy*, *f*), where *f* are the
-    frequencies of the coherence vector. For cohere, scaling the
-    individual densities by the sampling frequency has no effect,
-    since the factors cancel out.
+    Cxy : 1-D array
+        The coherence vector.
+    freqs : 1-D array
+            The frequencies for the elements in *Cxy*.
 
     See Also
     --------
