merge with 3.3

birkenfeld · birkenfeld · commit 834a73bf4ff4 · 2013-10-06T09:23:19.000+02:00
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
@@ -160,7 +160,7 @@ the sub-tree below it (its children, their children, and so on).  For example,
 
 :meth:`Element.findall` finds only elements with a tag which are direct
 children of the current element.  :meth:`Element.find` finds the *first* child
-with a particular tag, and :meth:`Element.text` accesses the element's text
+with a particular tag, and :attr:`Element.text` accesses the element's text
 content.  :meth:`Element.get` accesses the element's attributes::
 
    >>> for country in root.findall('country'):
