Skip to content

Commit fc9a960

Browse files
committed
Revert changes
1 parent f6481aa commit fc9a960

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

doc/source/10min.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ the quarter end:
645645
ts.index = (prng.asfreq('M', 'e') + 1).asfreq('H', 's') + 9
646646
ts.head()
647647
648-
Categorical
648+
Categoricals
649649
------------
650650

651651
pandas can include categorical data in a ``DataFrame``. For full docs, see the

doc/source/advanced.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ Furthermore you can *set* the values using the following methods.
387387
df2.loc(axis=0)[:, :, ['C1', 'C3']] = -10
388388
df2
389389
390-
You can use a right-hand-side of an align object as well.
390+
You can use a right-hand-side of an alignable object as well.
391391

392392
.. ipython:: python
393393
@@ -593,7 +593,7 @@ Take Methods
593593

594594
Similar to NumPy ndarrays, pandas Index, Series, and DataFrame also provides
595595
the ``take`` method that retrieves elements along a given axis at the given
596-
indexes. The given indexes must be either a list or an ndarray of integer
596+
indexes. The given indices must be either a list or an ndarray of integer
597597
index positions. ``take`` will also accept negative integers as relative positions to the end of the object.
598598

599599
.. ipython:: python
@@ -711,7 +711,7 @@ order is ``cab``).
711711
712712
df2.sort_index()
713713
714-
Group by operations on the index will preserve the index nature as well.
714+
Groupby operations on the index will preserve the index nature as well.
715715

716716
.. ipython:: python
717717

doc/source/conf.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,21 @@
6464
'sphinx.ext.extlinks',
6565
'sphinx.ext.todo',
6666
'numpydoc',
67-
# 'IPython.sphinxext.ipython_directive',
68-
# 'IPython.sphinxext.ipython_console_highlighting',
69-
# 'matplotlib.sphinxext.plot_directive',
67+
'IPython.sphinxext.ipython_directive',
68+
'IPython.sphinxext.ipython_console_highlighting',
69+
'matplotlib.sphinxext.plot_directive',
7070
'sphinx.ext.intersphinx',
7171
'sphinx.ext.coverage',
7272
'sphinx.ext.mathjax',
7373
'sphinx.ext.ifconfig',
7474
'sphinx.ext.linkcode',
75-
# 'nbsphinx',
75+
'nbsphinx',
7676
'sphinxcontrib.spelling'
7777
]
7878

7979
exclude_patterns = ['**.ipynb_checkpoints']
8080

8181
spelling_word_list_filename = 'spelling_wordlist.txt'
82-
spelling_show_suggestions = False
8382
spelling_ignore_pypi_package_names = True
8483

8584
with open("index.rst") as f:

doc/source/cookbook.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ Rolling Apply to multiple columns where function returns a Scalar (Volume Weight
723723
s = pd.concat([ (pd.Series(vwap(df.iloc[i:i+window]), index=[df.index[i+window]])) for i in range(len(df)-window) ]);
724724
s.round(2)
725725
726-
Time series
726+
Timeseries
727727
----------
728728

729729
`Between times

doc/source/spelling_wordlist.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ iterables
1313
sparsified
1414
df
1515
loc
16+
Timeseries
1617
ndarrays
1718
ndarray
1819
dtype
@@ -2542,9 +2543,6 @@ fromDict
25422543
levshape
25432544
putmask
25442545
asi
2545-
2546-
2547-
2548-
2546+
repl
25492547

25502548

0 commit comments

Comments
 (0)