Small addition/cleanup + resolved merge conflict

Author: tp

pandas/core/indexes/multi.py

@@ -2015,8 +2015,8 @@ def get_loc(self, key, method=None):
         See also
         --------
         Index.get_loc : get_loc method for (single-level) index.
-        get_locs : Get location for a label/slice/list/mask or a sequence of
-                   such.
+        MultiIndex.get_locs : Get location for a label/slice/list/mask or a
+                              sequence of such.
         """
         if method is not None:
             raise NotImplementedError('only the default get_loc method is '
@@ -2340,16 +2340,16 @@ def convert_indexer(start, stop, step, indexer=indexer, labels=labels):
     def get_locs(self, seq):
         """
         Get location for a given label/slice/list/mask or a sequence of such as
-        a integer, slice or boolean mask.
+        a integer, array of integers, slice or boolean mask.
 
         Parameters
         ----------
         seq : label/slice/list/mask or a sequence of such.
 
         Returns
         -------
-        locs : integer, slice or boolean mask suitable
-               for passing to iloc
+        locs : array of integers, slice or boolean mask suitable for passing to
+               iloc
 
         Examples
         ---------
@@ -2366,7 +2366,7 @@ def get_locs(self, seq):
 
         See also
         --------
-        get_loc : Get location for a label or a tuple of labels.
+        MultiIndex.get_loc : Get location for a label or a tuple of labels.
         """
 
         # must be lexsorted to at least as many levels