Skip to content

Misc fixes to doc build #5953

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.

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
4 commits merged into from Jan 15, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ['../_templates']

# The suffix of source filenames.
source_suffix = '.rst'

# The encoding of source files.
# source_encoding = 'utf-8'
source_encoding = 'utf-8'

# The master toctree document.
master_doc = 'index'
Expand Down
7 changes: 7 additions & 0 deletions doc/source/dsintro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
np.set_printoptions(precision=4, suppress=True)
set_option('display.precision', 4, 'display.max_columns', 8)
options.display.max_rows=15
import pandas as pd


************************
Expand Down Expand Up @@ -488,6 +489,12 @@ TimeSeries (which it will be automatically if the index contains datetime
objects), and the DataFrame index also contains dates, the broadcasting will be
column-wise:

.. ipython:: python
:suppress:

import warnings
warnings.filterwarnings("ignore",message='TimeSeries broadcasting',category=FutureWarning)

.. ipython:: python

index = date_range('1/1/2000', periods=8)
Expand Down
2 changes: 1 addition & 1 deletion doc/source/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ life easier is missing. In that case you have several options:
For example, here is an example of adding an ``just_foo_cols()``
method to the dataframe class:

.. ipython:: python
::

import pandas as pd
def just_foo_cols(self):
Expand Down