Review (gfyoung)

pandas-dev · Aug 9, 2018 · 16b0b03 · 16b0b03
1 parent 372cc24
commit 16b0b03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/doc/source/text.rst b/doc/source/text.rst
@@ -306,7 +306,7 @@ The same alignment can be used when ``others`` is a ``DataFrame``:
 Concatenating a Series and many objects into a Series
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Several objects of type ``Series``, ``Index`` or ``np.ndarray`` can be arbitrarily combined in a list-like container (including iterators, ``dict``-views, etc.):
+An arbitrary combination of ``Series``, ``Index`` and ``np.ndarray`` (1-dimensional) can be passed in a list-like container (including iterators, ``dict``-views, etc.):
 
 .. ipython:: python
 

diff --git a/pandas/core/strings.py b/pandas/core/strings.py
@@ -2025,7 +2025,7 @@ def _get_series_list(self, others, ignore_index=False):
                     join_warn = join_warn or wnx
 
                     if depr_warn:
-                        warnings.warn('list-likes other than Series, Index or '
+                        warnings.warn('list-likes other than Series, Index, or '
                                       'np.ndarray WITHIN another list-like '
                                       'are deprecated and will be removed in '
                                       'a future version.',