From 0e9e1076b0768236664259c8895d944c1d251b50 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@googlemail.com>
Date: Sat, 7 Jul 2012 15:03:31 +0200
Subject: DOC: merge doc wiki edits.  A number of small edits in linalg and
 lib.

---
 numpy/lib/arraysetops.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'numpy/lib/arraysetops.py')

diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py
index 91dd96f9c..20a0e7151 100644
--- a/numpy/lib/arraysetops.py
+++ b/numpy/lib/arraysetops.py
@@ -44,7 +44,7 @@ def ediff1d(ary, to_end=None, to_begin=None):
 
     Returns
     -------
-    ed : ndarray
+    ediff1d : ndarray
         The differences. Loosely, this is ``ary.flat[1:] - ary.flat[:-1]``.
 
     See Also
@@ -212,7 +212,7 @@ def intersect1d(ar1, ar2, assume_unique=False):
 
     Returns
     -------
-    out : ndarray
+    intersect1d : ndarray
         Sorted 1D array of common and unique elements.
 
     See Also
@@ -251,7 +251,7 @@ def setxor1d(ar1, ar2, assume_unique=False):
 
     Returns
     -------
-    xor : ndarray
+    setxor1d : ndarray
         Sorted 1D array of unique values that are in only one of the input
         arrays.
 
@@ -287,7 +287,7 @@ def in1d(ar1, ar2, assume_unique=False):
 
     Parameters
     ----------
-    ar1 : array_like, shape (M,)
+    ar1 : (M,) array_like
         Input array.
     ar2 : array_like
         The values against which to test each value of `ar1`.
@@ -297,8 +297,8 @@ def in1d(ar1, ar2, assume_unique=False):
 
     Returns
     -------
-    mask : ndarray of bools, shape(M,)
-        The values `ar1[mask]` are in `ar2`.
+    in1d : (M,) ndarray, bool
+        The values `ar1[in1d]` are in `ar2`.
 
     See Also
     --------
@@ -365,7 +365,7 @@ def union1d(ar1, ar2):
 
     Returns
     -------
-    union : ndarray
+    union1d : ndarray
         Unique, sorted union of the input arrays.
 
     See Also
@@ -399,7 +399,7 @@ def setdiff1d(ar1, ar2, assume_unique=False):
 
     Returns
     -------
-    difference : ndarray
+    setdiff1d : ndarray
         Sorted 1D array of values in `ar1` that are not in `ar2`.
 
     See Also
-- 
cgit v1.2.1