From 22f638ec428356997a50536e4c841d40bbb20957 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Fri, 9 Oct 2015 20:09:41 +0200
Subject: [PATCH] DOC: whatsnew fixes

---
 doc/source/whatsnew/v0.12.0.txt | 34 ++++++++++++++++++++++-----------
 doc/source/whatsnew/v0.17.0.txt |  2 +-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/doc/source/whatsnew/v0.12.0.txt b/doc/source/whatsnew/v0.12.0.txt
index fd726af3912f0..4c7d799ec5202 100644
--- a/doc/source/whatsnew/v0.12.0.txt
+++ b/doc/source/whatsnew/v0.12.0.txt
@@ -191,7 +191,7 @@ I/O Enhancements
         df = DataFrame({'a': range(3), 'b': list('abc')})
         print(df)
         html = df.to_html()
-        alist = pd.read_html(html, infer_types=True, index_col=0)
+        alist = pd.read_html(html, index_col=0)
         print(df == alist[0])
 
     Note that ``alist`` here is a Python ``list`` so ``pd.read_html()`` and
@@ -252,19 +252,31 @@ I/O Enhancements
   - Iterator support via ``read_hdf`` that automatically opens and closes the
     store when iteration is finished. This is only for *tables*
 
-    .. ipython:: python
-       :okwarning:
+    .. code-block:: python
 
-         path = 'store_iterator.h5'
-         DataFrame(randn(10,2)).to_hdf(path,'df',table=True)
-         for df in read_hdf(path,'df', chunksize=3):
-            print(df)
+        In [25]: path = 'store_iterator.h5'
+
+        In [26]: DataFrame(randn(10,2)).to_hdf(path,'df',table=True)
+
+        In [27]: for df in read_hdf(path,'df', chunksize=3):
+           ....:    print df
+           ....:
+                  0         1
+        0  0.713216 -0.778461
+        1 -0.661062  0.862877
+        2  0.344342  0.149565
+                  0         1
+        3 -0.626968 -0.875772
+        4 -0.930687 -0.218983
+        5  0.949965 -0.442354
+                  0         1
+        6 -0.402985  1.111358
+        7 -0.241527 -0.670477
+        8  0.049355  0.632633
+                  0         1
+        9 -1.502767 -1.225492
 
-    .. ipython:: python
-         :suppress:
 
-         import os
-         os.remove(path)
 
   - ``read_csv`` will now throw a more informative error message when a file
     contains no columns, e.g., all newline characters
diff --git a/doc/source/whatsnew/v0.17.0.txt b/doc/source/whatsnew/v0.17.0.txt
index 58973d491e263..0b2bb0b5a475c 100644
--- a/doc/source/whatsnew/v0.17.0.txt
+++ b/doc/source/whatsnew/v0.17.0.txt
@@ -517,7 +517,7 @@ Other enhancements
 
 - Allow passing `kwargs` to the interpolation methods (:issue:`10378`).
 
-- Improved error message when concatenating an empty iterable of ``Dataframe``s (:issue:`9157`)
+- Improved error message when concatenating an empty iterable of ``Dataframe`` objects (:issue:`9157`)
 
 - ``pd.read_csv`` can now read bz2-compressed files incrementally, and the C parser can read bz2-compressed files from AWS S3 (:issue:`11070`, :issue:`11072`).