Skip to content

Commit 80610f8

Browse files
author
y-p
committed
Merge pull request #5921 from y-p/PR_doc_fixes
Pr doc fixes
2 parents 9a67dbc + c4b3f0c commit 80610f8

File tree

3 files changed

+6
-48
lines changed

3 files changed

+6
-48
lines changed

doc/source/_templates/autosummary/class.rst

-33
This file was deleted.

doc/source/conf.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import sys
1414
import os
15+
from pandas.compat import u
1516

1617
# If extensions (or modules to document with autodoc) are in another directory,
1718
# add these directories to sys.path here. If the directory is relative to the
@@ -63,8 +64,8 @@
6364
master_doc = 'index'
6465

6566
# General information about the project.
66-
project = u'pandas'
67-
copyright = u'2008-2012, the pandas development team'
67+
project = u('pandas')
68+
copyright = u('2008-2014, the pandas development team')
6869

6970
# The version info for the project you're documenting, acts as replacement for
7071
# |version| and |release|, also used in various other places throughout the
@@ -211,8 +212,8 @@
211212
# (source start file, target name, title, author, documentclass [howto/manual]).
212213
latex_documents = [
213214
('index', 'pandas.tex',
214-
u'pandas: powerful Python data analysis toolkit',
215-
u'Wes McKinney\n\& PyData Development Team', 'manual'),
215+
u('pandas: powerful Python data analysis toolkit'),
216+
u('Wes McKinney\n\& PyData Development Team'), 'manual'),
216217
]
217218

218219
# The name of an image file (relative to this directory) to place at the top of

doc/source/faq.rst

+1-11
Original file line numberDiff line numberDiff line change
@@ -181,17 +181,7 @@ Frequency conversion
181181

182182
Frequency conversion is implemented using the ``resample`` method on TimeSeries
183183
and DataFrame objects (multiple time series). ``resample`` also works on panels
184-
(3D). Here is some code that resamples daily data to montly with
185-
scikits.timeseries:
186-
187-
.. ipython:: python
188-
189-
import scikits.timeseries as ts
190-
data = ts.time_series(np.random.randn(50), start_date='Jan-2000', freq='M')
191-
data
192-
data.convert('A', func=np.mean)
193-
194-
Here is the equivalent pandas code:
184+
(3D). Here is some code that resamples daily data to montly:
195185

196186
.. ipython:: python
197187

0 commit comments

Comments
 (0)