commit 3732ed24145c1ac77e99bcf85bccda3af095e696
author Larry Hastings <larry@hastings.org> Sat Mar 15 21:13:56 2014 -0700
committer Larry Hastings <larry@hastings.org> Sat Mar 15 21:13:56 2014 -0700
tree 432a243f5f4d9720ec0cc202ee969f6175e450b7
parent b6b6a6d587d267cbad490232d08faebd30fdb7e2

Merge in all documentation changes since branching 3.4.0rc1.

Doc/library/xml.etree.elementtree.rst

diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
index dfa2b71..c6dbce0 100644
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -952,7 +952,8 @@
    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()