Merge branch 'parser-docs' of https://github.com/jseabold/pandas into jseabold-parser-docs

Author: jreback

pandas/io/parsers.py

@@ -37,7 +37,11 @@
 lineterminator : string (length 1), default None
     Character to break file into lines. Only valid with C parser
 quotechar : string
-quoting : string
+    The character to used to denote the start and end of a quoted item. Quoted items can include the delimiter and it will be ignored.
+quoting : int
+    Controls whether quotes should be recognized. Values are taken from
+    `csv.QUOTE_*` values. Acceptable values are 0, 1, 2, and 3 for
+    QUOTE_MINIMAL, QUOTE_ALL, QUOTE_NONE, and QUOTE_NONNUMERIC, respectively.
 skipinitialspace : boolean, default False
     Skip spaces after delimiter
 escapechar : string