summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2016-02-26 19:14:56 +0100
committerGeorg Brandl <georg@python.org>2016-02-26 19:14:56 +0100
commitdef4ff6a647f00f9a995c2c6f47ad366c8847d66 (patch)
treed2f81c75223518980206abb380e2e42071885f0c
parent9d66d4af06ad15226b271988cd7f5d0c681924af (diff)
parentadeffcc2f9c9d8941615431106d8e550ebf514a0 (diff)
downloadcpython-git-def4ff6a647f00f9a995c2c6f47ad366c8847d66.tar.gz
merge with 3.5
-rw-r--r--Doc/library/xml.etree.elementtree.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
index dc0274eb0b..fe7ad9841a 100644
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -1044,16 +1044,16 @@ XMLParser Objects
This class is the low-level building block of the module. It uses
:mod:`xml.parsers.expat` for efficient, event-based parsing of XML. It can
- be fed XML data incrementall with the :meth:`feed` method, and parsing events
- are translated to a push API - by invoking callbacks on the *target* object.
- If *target* is omitted, the standard :class:`TreeBuilder` is used. The
- *html* argument was historically used for backwards compatibility and is now
- deprecated. If *encoding* [1]_ is given, the value overrides the encoding
- specified in the XML file.
+ be fed XML data incrementally with the :meth:`feed` method, and parsing
+ events are translated to a push API - by invoking callbacks on the *target*
+ object. If *target* is omitted, the standard :class:`TreeBuilder` is used.
+ The *html* argument was historically used for backwards compatibility and is
+ now deprecated. If *encoding* [1]_ is given, the value overrides the
+ encoding specified in the XML file.
.. deprecated:: 3.4
The *html* argument. The remaining arguments should be passed via
- keywword to prepare for the removal of the *html* argument.
+ keyword to prepare for the removal of the *html* argument.
.. method:: close()