summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-03-05 15:24:07 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-03-05 15:24:07 (GMT)
commit6a59b70cbac0a35f8b520d196105974949153181 (patch)
treef3f32ae39e3aac96e6d23611f403b6c6bf0435f3 /Doc/library
parent80f7102d439446f6e1cf9abacfc5b4eac3796cea (diff)
parent420f698d6e1785c767ef4c19ed25016351501e30 (diff)
downloadcpython-6a59b70cbac0a35f8b520d196105974949153181.zip
cpython-6a59b70cbac0a35f8b520d196105974949153181.tar.gz
cpython-6a59b70cbac0a35f8b520d196105974949153181.tar.bz2
Merge 3.2
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/markup.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/markup.rst b/Doc/library/markup.rst
index 49794ef..1b4cca5 100644
--- a/Doc/library/markup.rst
+++ b/Doc/library/markup.rst
@@ -23,7 +23,7 @@ definition of the Python bindings for the DOM and SAX interfaces.
html.rst
html.parser.rst
html.entities.rst
- pyexpat.rst
+ xml.etree.elementtree.rst
xml.dom.rst
xml.dom.minidom.rst
xml.dom.pulldom.rst
@@ -31,4 +31,4 @@ definition of the Python bindings for the DOM and SAX interfaces.
xml.sax.handler.rst
xml.sax.utils.rst
xml.sax.reader.rst
- xml.etree.elementtree.rst
+ pyexpat.rst