diff --git a/doc/source/_templates/autosummary/class.rst b/doc/_templates/autosummary/class.rst
similarity index 100%
rename from doc/source/_templates/autosummary/class.rst
rename to doc/_templates/autosummary/class.rst
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c3c946a5180ba..30d47d0a306a0 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -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'
diff --git a/doc/source/dsintro.rst b/doc/source/dsintro.rst
index 3cc93d2f3e122..7d49e26759dd4 100644
--- a/doc/source/dsintro.rst
+++ b/doc/source/dsintro.rst
@@ -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
 
 
 ************************
@@ -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)
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index c826d95e9c1d7..68f6e3d53cdca 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -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):