Skip to content

DOC: fix some sphinx build issues #14332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2016
Merged

DOC: fix some sphinx build issues #14332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3347b69
DOC: proper rst syntax for table
jorisvandenbossche Oct 1, 2016
fbb8d18
DOC: fix 'Unexpected indentation'
jorisvandenbossche Oct 1, 2016
0419321
DOC: fix links to offset aliases
jorisvandenbossche Oct 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions doc/source/categorical.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------------
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
"""
from pandas.tseries.resample import asfreq
return asfreq(self, freq, method=method, how=how, normalize=normalize)
Expand Down
2 changes: 1 addition & 1 deletion pandas/indexes/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------
Expand Down
3 changes: 3 additions & 0 deletions pandas/tseries/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
"""
Expand Down
3 changes: 3 additions & 0 deletions pandas/tseries/tdi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
"""
Expand Down