summaryrefslogtreecommitdiff
path: root/Doc/library/xml.etree.elementtree.rst
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-03-15 21:13:56 -0700
committerLarry Hastings <larry@hastings.org>2014-03-15 21:13:56 -0700
commitdd41bd5789a0cf851e7ceda561ca7e77533a5190 (patch)
treedb01288069f6b30ab02d75e0ac66456864a27861 /Doc/library/xml.etree.elementtree.rst
parent5ae7d6b3216b1996a0073415661b82470e03407c (diff)
downloadcpython-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.rst3
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()