[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/97f3bfd6be25
changeset:   85999:97f3bfd6be25
parent:      85995:417903cb287e
parent:      85998:e09d5fe1b1a9
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 09:23:19 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/xml.etree.elementtree.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -160,7 +160,7 @@
 
 :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'):

-- 
Repository URL: http://hg.python.org/cpython