From 41891096734dbcebc81166d2020c484e0d7d066a Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Thu, 29 Mar 2018 16:09:29 -0500
Subject: [PATCH 1/4] DOC: Fixed more warnings

Upstream issue with linking to section headers in nbsphinx.
---
 doc/source/merging.rst          | 4 ++--
 doc/source/whatsnew/v0.17.1.txt | 2 +-
 doc/source/whatsnew/v0.20.0.txt | 4 ++--
 doc/source/whatsnew/v0.23.0.txt | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/source/merging.rst b/doc/source/merging.rst
index cfd3f9e88e4ea..74b21c21252ec 100644
--- a/doc/source/merging.rst
+++ b/doc/source/merging.rst
@@ -583,7 +583,7 @@ and ``right`` is a subclass of DataFrame, the return type will still be
 
 ``merge`` is a function in the pandas namespace, and it is also available as a
 ``DataFrame`` instance method :meth:`~DataFrame.merge`, with the calling 
-``DataFrame `` being implicitly considered the left object in the join.
+``DataFrame`` being implicitly considered the left object in the join.
 
 The related :meth:`~DataFrame.join` method, uses ``merge`` internally for the
 index-on-index (by default) and column(s)-on-index join. If you are joining on
@@ -1202,7 +1202,7 @@ Overlapping value columns
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The merge ``suffixes`` argument takes a tuple of list of strings to append to
-overlapping column names in the input ``DataFrame``s to disambiguate the result
+overlapping column names in the input ``DataFrame``\ s to disambiguate the result
 columns:
 
 .. ipython:: python
diff --git a/doc/source/whatsnew/v0.17.1.txt b/doc/source/whatsnew/v0.17.1.txt
index 6e5e113e859d7..e1b561c4deacb 100644
--- a/doc/source/whatsnew/v0.17.1.txt
+++ b/doc/source/whatsnew/v0.17.1.txt
@@ -58,7 +58,7 @@ We can render the HTML to get the following table.
    :file: whatsnew_0171_html_table.html
 
 :class:`~pandas.core.style.Styler` interacts nicely with the Jupyter Notebook.
-See the :ref:`documentation <style.ipynb>` for more.
+See the :doc:`documentation <style>` for more.
 
 .. _whatsnew_0171.enhancements:
 
diff --git a/doc/source/whatsnew/v0.20.0.txt b/doc/source/whatsnew/v0.20.0.txt
index d04a34f7a44d6..6fbf43080fc46 100644
--- a/doc/source/whatsnew/v0.20.0.txt
+++ b/doc/source/whatsnew/v0.20.0.txt
@@ -389,7 +389,7 @@ For example, after running the following, ``styled.xlsx`` renders as below:
    import os
    os.remove('styled.xlsx')
 
-See the :ref:`Style documentation <style.ipynb#Export-to-Excel>` for more detail.
+See the :doc:`Style documentation <style>` for more detail.
 
 .. _whatsnew_0200.enhancements.intervalindex:
 
@@ -499,7 +499,7 @@ Other Enhancements
 - ``DataFrame.to_excel()`` has a new ``freeze_panes`` parameter to turn on Freeze Panes when exporting to Excel (:issue:`15160`)
 - ``pd.read_html()`` will parse multiple header rows, creating a MutliIndex header. (:issue:`13434`).
 - HTML table output skips ``colspan`` or ``rowspan`` attribute if equal to 1. (:issue:`15403`)
-- :class:`pandas.io.formats.style.Styler` template now has blocks for easier extension, :ref:`see the example notebook <style.ipynb#Subclassing>` (:issue:`15649`)
+- :class:`pandas.io.formats.style.Styler` template now has blocks for easier extension, see the :doc:`example notebook <style>` (:issue:`15649`)
 - :meth:`Styler.render() <pandas.io.formats.style.Styler.render>` now accepts ``**kwargs`` to allow user-defined variables in the template (:issue:`15649`)
 - Compatibility with Jupyter notebook 5.0; MultiIndex column labels are left-aligned and MultiIndex row-labels are top-aligned (:issue:`15379`)
 - ``TimedeltaIndex`` now has a custom date-tick formatter specifically designed for nanosecond level precision (:issue:`8711`)
diff --git a/doc/source/whatsnew/v0.23.0.txt b/doc/source/whatsnew/v0.23.0.txt
index e83f149db1f18..9e561a288f1d8 100644
--- a/doc/source/whatsnew/v0.23.0.txt
+++ b/doc/source/whatsnew/v0.23.0.txt
@@ -330,7 +330,6 @@ for storing ip addresses.
 .. code-block:: ipython
 
    In [3]: ser = pd.Series(values)
-      ...:
 
    In [4]: ser
    Out[4]:
@@ -342,8 +341,9 @@ for storing ip addresses.
 Notice that the dtype is ``ip``. The missing value semantics of the underlying
 array are respected:
 
+.. code-block:: ipython
+
    In [5]: ser.isna()
-      ...:
    Out[5]:
    0     True
    1    False

From d42d71ec4f99071e79a07419102d37bb7638ae41 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Thu, 29 Mar 2018 16:11:15 -0500
Subject: [PATCH 2/4] DOC: Add option to fail on error

---
 doc/make.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/make.py b/doc/make.py
index 4967f30453fd1..3b5f4356128b7 100755
--- a/doc/make.py
+++ b/doc/make.py
@@ -78,7 +78,7 @@ class DocBuilder:
     script.
     """
     def __init__(self, num_jobs=1, include_api=True, single_doc=None,
-                 verbosity=0):
+                 verbosity=0, error=False):
         self.num_jobs = num_jobs
         self.include_api = include_api
         self.verbosity = verbosity
@@ -87,6 +87,7 @@ def __init__(self, num_jobs=1, include_api=True, single_doc=None,
         if single_doc is not None:
             self._process_single_doc(single_doc)
         self.exclude_patterns = self._exclude_patterns
+        self.error = '-W' if error else ''
 
         self._generate_index()
         if self.single_doc_type == 'docstring':
@@ -234,6 +235,7 @@ def _sphinx_build(self, kind):
                          'v' * self.verbosity) if self.verbosity else '',
                      '-d{}'.format(os.path.join(BUILD_PATH, 'doctrees')),
                      '-Dexclude_patterns={}'.format(self.exclude_patterns),
+                     ''.format(self.error),
                      SOURCE_PATH,
                      os.path.join(BUILD_PATH, kind))
 
@@ -336,6 +338,8 @@ def main():
     argparser.add_argument('-v', action='count', dest='verbosity', default=0,
                            help=('increase verbosity (can be repeated), '
                                  'passed to the sphinx build command'))
+    argparser.add_argument('-W', action="store_true", dest='error',
+                           help="Treat Sphinx warnings as errors.")
     args = argparser.parse_args()
 
     if args.command not in cmds:
@@ -351,7 +355,7 @@ def main():
     globals()['pandas'] = importlib.import_module('pandas')
 
     builder = DocBuilder(args.num_jobs, not args.no_api, args.single,
-                         args.verbosity)
+                         args.verbosity, error=args.error)
     getattr(builder, args.command)()
 
 

From f0ed17d2f7471c7bc31e15e32931c517b07b5cc5 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Fri, 30 Mar 2018 15:53:10 -0500
Subject: [PATCH 3/4] Restore nbsphinx links

---
 doc/source/whatsnew/v0.20.0.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/whatsnew/v0.20.0.txt b/doc/source/whatsnew/v0.20.0.txt
index 6fbf43080fc46..5eb6c2fd041d6 100644
--- a/doc/source/whatsnew/v0.20.0.txt
+++ b/doc/source/whatsnew/v0.20.0.txt
@@ -389,7 +389,7 @@ For example, after running the following, ``styled.xlsx`` renders as below:
    import os
    os.remove('styled.xlsx')
 
-See the :doc:`Style documentation <style>` for more detail.
+See the :ref:`Style documentation </style.ipybn#Export-to-Excel>` for more detail.
 
 .. _whatsnew_0200.enhancements.intervalindex:
 
@@ -499,7 +499,7 @@ Other Enhancements
 - ``DataFrame.to_excel()`` has a new ``freeze_panes`` parameter to turn on Freeze Panes when exporting to Excel (:issue:`15160`)
 - ``pd.read_html()`` will parse multiple header rows, creating a MutliIndex header. (:issue:`13434`).
 - HTML table output skips ``colspan`` or ``rowspan`` attribute if equal to 1. (:issue:`15403`)
-- :class:`pandas.io.formats.style.Styler` template now has blocks for easier extension, see the :doc:`example notebook <style>` (:issue:`15649`)
+- :class:`pandas.io.formats.style.Styler` template now has blocks for easier extension, see the :ref:`example notebook </style.ipynb#Subclassing>` (:issue:`15649`)
 - :meth:`Styler.render() <pandas.io.formats.style.Styler.render>` now accepts ``**kwargs`` to allow user-defined variables in the template (:issue:`15649`)
 - Compatibility with Jupyter notebook 5.0; MultiIndex column labels are left-aligned and MultiIndex row-labels are top-aligned (:issue:`15379`)
 - ``TimedeltaIndex`` now has a custom date-tick formatter specifically designed for nanosecond level precision (:issue:`8711`)

From 230c29a46a98259896099d8bc416e33d45f6d7f6 Mon Sep 17 00:00:00 2001
From: Tom Augspurger <tom.w.augspurger@gmail.com>
Date: Fri, 30 Mar 2018 16:01:22 -0500
Subject: [PATCH 4/4] Fixed nb links

remove error changes
---
 doc/make.py                     | 8 ++------
 doc/source/whatsnew/v0.20.0.txt | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/make.py b/doc/make.py
index 3b5f4356128b7..4967f30453fd1 100755
--- a/doc/make.py
+++ b/doc/make.py
@@ -78,7 +78,7 @@ class DocBuilder:
     script.
     """
     def __init__(self, num_jobs=1, include_api=True, single_doc=None,
-                 verbosity=0, error=False):
+                 verbosity=0):
         self.num_jobs = num_jobs
         self.include_api = include_api
         self.verbosity = verbosity
@@ -87,7 +87,6 @@ def __init__(self, num_jobs=1, include_api=True, single_doc=None,
         if single_doc is not None:
             self._process_single_doc(single_doc)
         self.exclude_patterns = self._exclude_patterns
-        self.error = '-W' if error else ''
 
         self._generate_index()
         if self.single_doc_type == 'docstring':
@@ -235,7 +234,6 @@ def _sphinx_build(self, kind):
                          'v' * self.verbosity) if self.verbosity else '',
                      '-d{}'.format(os.path.join(BUILD_PATH, 'doctrees')),
                      '-Dexclude_patterns={}'.format(self.exclude_patterns),
-                     ''.format(self.error),
                      SOURCE_PATH,
                      os.path.join(BUILD_PATH, kind))
 
@@ -338,8 +336,6 @@ def main():
     argparser.add_argument('-v', action='count', dest='verbosity', default=0,
                            help=('increase verbosity (can be repeated), '
                                  'passed to the sphinx build command'))
-    argparser.add_argument('-W', action="store_true", dest='error',
-                           help="Treat Sphinx warnings as errors.")
     args = argparser.parse_args()
 
     if args.command not in cmds:
@@ -355,7 +351,7 @@ def main():
     globals()['pandas'] = importlib.import_module('pandas')
 
     builder = DocBuilder(args.num_jobs, not args.no_api, args.single,
-                         args.verbosity, error=args.error)
+                         args.verbosity)
     getattr(builder, args.command)()
 
 
diff --git a/doc/source/whatsnew/v0.20.0.txt b/doc/source/whatsnew/v0.20.0.txt
index 5eb6c2fd041d6..5f22b518ab6c4 100644
--- a/doc/source/whatsnew/v0.20.0.txt
+++ b/doc/source/whatsnew/v0.20.0.txt
@@ -389,7 +389,7 @@ For example, after running the following, ``styled.xlsx`` renders as below:
    import os
    os.remove('styled.xlsx')
 
-See the :ref:`Style documentation </style.ipybn#Export-to-Excel>` for more detail.
+See the :ref:`Style documentation </style.ipynb#Export-to-Excel>` for more detail.
 
 .. _whatsnew_0200.enhancements.intervalindex: