diff options
author | Larry Hastings <larry@hastings.org> | 2014-03-15 21:13:56 -0700 |
---|---|---|
committer | Larry Hastings <larry@hastings.org> | 2014-03-15 21:13:56 -0700 |
commit | dd41bd5789a0cf851e7ceda561ca7e77533a5190 (patch) | |
tree | db01288069f6b30ab02d75e0ac66456864a27861 /Doc/library/xml.etree.elementtree.rst | |
parent | 5ae7d6b3216b1996a0073415661b82470e03407c (diff) | |
download | cpython-dd41bd5789a0cf851e7ceda561ca7e77533a5190.tar.gz |
Merge in all documentation changes since branching 3.4.0rc1.
Diffstat (limited to 'Doc/library/xml.etree.elementtree.rst')
-rw-r--r-- | Doc/library/xml.etree.elementtree.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst index dfa2b71cf5..c6dbce062a 100644 --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -952,7 +952,8 @@ XMLParser Objects specified in the XML file. .. deprecated:: 3.4 - The *html* argument. + The *html* argument. The remaining arguments should be passed via + keywword to prepare for the removal of the *html* argument. .. method:: close() |