From 3347b69e128bdf5257565cfcebe10d1c870a59e0 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sat, 1 Oct 2016 23:31:42 +0200 Subject: [PATCH 1/3] DOC: proper rst syntax for table --- doc/source/categorical.rst | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/source/categorical.rst b/doc/source/categorical.rst index b1795cb37200c..f52f72b49dd31 100644 --- a/doc/source/categorical.rst +++ b/doc/source/categorical.rst @@ -757,12 +757,18 @@ Use ``.astype`` or ``union_categoricals`` to get ``category`` result. Following table summarizes the results of ``Categoricals`` related concatenations. -| arg1 | arg2 | result | -|---------|-------------------------------------------|---------| -| category | category (identical categories) | category | -| category | category (different categories, both not ordered) | object (dtype is inferred) | ++----------+--------------------------------------------------------+----------------------------+ +| arg1 | arg2 | result | ++==========+========================================================+============================+ +| category | category (identical categories) | category | ++----------+--------------------------------------------------------+----------------------------+ +| category | category (different categories, both not ordered) | object (dtype is inferred) | ++----------+--------------------------------------------------------+----------------------------+ | category | category (different categories, either one is ordered) | object (dtype is inferred) | -| category | not category | object (dtype is inferred) | ++----------+--------------------------------------------------------+----------------------------+ +| category | not category | object (dtype is inferred) | ++----------+--------------------------------------------------------+----------------------------+ + Getting Data In/Out ------------------- From fbb8d180d6787732cc74a16e7b699b4328667f9d Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sat, 1 Oct 2016 23:35:38 +0200 Subject: [PATCH 2/3] DOC: fix 'Unexpected indentation' --- pandas/indexes/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/indexes/base.py b/pandas/indexes/base.py index 557b9b2b17e95..5082fc84982c6 100644 --- a/pandas/indexes/base.py +++ b/pandas/indexes/base.py @@ -1994,7 +1994,7 @@ def symmetric_difference(self, other, result_name=None): ``symmetric_difference`` contains elements that appear in either ``idx1`` or ``idx2`` but not both. Equivalent to the Index created by ``idx1.difference(idx2) | idx2.difference(idx1)`` with duplicates - dropped. + dropped. Examples -------- From 0419321c8859d21e0a8c22bedcb29581756d4543 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Sat, 1 Oct 2016 23:42:34 +0200 Subject: [PATCH 3/3] DOC: fix links to offset aliases --- pandas/core/generic.py | 2 +- pandas/tseries/index.py | 3 +++ pandas/tseries/tdi.py | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 4aa1ac4a47090..697438df87d4f 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -3999,7 +3999,7 @@ def asfreq(self, freq, method=None, how=None, normalize=False): converted : type of caller To learn more about the frequency strings, please see `this link -`__. + `__. """ from pandas.tseries.resample import asfreq return asfreq(self, freq, method=method, how=how, normalize=normalize) diff --git a/pandas/tseries/index.py b/pandas/tseries/index.py index ff6c0b85a1e5c..f68750e242f1f 100644 --- a/pandas/tseries/index.py +++ b/pandas/tseries/index.py @@ -196,6 +196,9 @@ class DatetimeIndex(DatelikeOps, TimelikeOps, DatetimeIndexOpsMixin, name : object Name to be stored in the index + Notes + ----- + To learn more about the frequency strings, please see `this link `__. """ diff --git a/pandas/tseries/tdi.py b/pandas/tseries/tdi.py index f1e199adeebfc..c1b0936edaff9 100644 --- a/pandas/tseries/tdi.py +++ b/pandas/tseries/tdi.py @@ -112,6 +112,9 @@ class TimedeltaIndex(DatetimeIndexOpsMixin, TimelikeOps, Int64Index): name : object Name to be stored in the index + Notes + ----- + To learn more about the frequency strings, please see `this link `__. """