[Python-checkins] cpython (merge 3.4 -> default): merge
raymond.hettinger
python-checkins at python.org
Sat Mar 29 19:50:41 CET 2014
http://hg.python.org/cpython/rev/36492f927a40
changeset: 90031:36492f927a40
parent: 90028:bc4186df43ad
parent: 90030:59f57d729d9a
user: Raymond Hettinger <python at rcn.com>
date: Sat Mar 29 11:50:29 2014 -0700
summary:
merge
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
@@ -325,7 +325,7 @@
+=======================+======================================================+
| ``tag`` | Selects all child elements with the given tag. |
| | For example, ``spam`` selects all child elements |
-| | named ``spam``, ``spam/egg`` selects all |
+| | named ``spam``, and ``spam/egg`` selects all |
| | grandchildren named ``egg`` in all children named |
| | ``spam``. |
+-----------------------+------------------------------------------------------+
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list