rebase on master

JanLauGe · JanLauGe · commit c56da898a3e0 · 2017-12-29T08:07:07.000Z
diff --git a/pandas/io/excel.py b/pandas/io/excel.py
@@ -221,10 +221,7 @@
 as strings or lists of strings!
 
 >>> pd.read_excel(open('tmp.xlsx','rb'),
-...               true_values='2',
-...               false_values='3',
-...               na_values=['string1', 'string2'],
-...               thousands=',')
+...               na_values=['string1', 'string2'])
       Name  Value
 0      NaN      1
 1      NaN      2
