[Python-checkins] cpython (merge 3.2 -> default): Merge whatsnew fixes with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/ad4ebe5ce61d
changeset:   72846:ad4ebe5ce61d
parent:      72843:2580e642e2ee
parent:      72845:ea233722a4b6
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Oct 10 00:31:00 2011 +0300
summary:
  Merge whatsnew fixes with 3.2.

files:
  Doc/whatsnew/2.7.rst |  17 ++++++++++-------
  1 files changed, 10 insertions(+), 7 deletions(-)


diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -1952,7 +1952,7 @@
 version 1.3.  Some of the new features are:
 
 * The various parsing functions now take a *parser* keyword argument
-  giving an :class:`XMLParser` instance that will
+  giving an :class:`~xml.etree.ElementTree.XMLParser` instance that will
   be used.  This makes it possible to override the file's internal encoding::
 
     p = ET.XMLParser(encoding='utf-8')
@@ -1964,8 +1964,8 @@
 
 * ElementTree's code for converting trees to a string has been
   significantly reworked, making it roughly twice as fast in many
-  cases.  The :class:`ElementTree` :meth:`write` and :class:`Element`
-  :meth:`write` methods now have a *method* parameter that can be
+  cases.  The :meth:`ElementTree.write() <xml.etree.ElementTree.ElementTree.write>`
+  and :meth:`Element.write` methods now have a *method* parameter that can be
   "xml" (the default), "html", or "text".  HTML mode will output empty
   elements as ``<empty></empty>`` instead of ``<empty/>``, and text
   mode will skip over elements and only output the text chunks.  If
@@ -1978,11 +1978,12 @@
   declarations are now output on the root element, not scattered throughout
   the resulting XML.  You can set the default namespace for a tree
   by setting the :attr:`default_namespace` attribute and can
-  register new prefixes with :meth:`register_namespace`.  In XML mode,
+  register new prefixes with :meth:`~xml.etree.ElementTree.register_namespace`.  In XML mode,
   you can use the true/false *xml_declaration* parameter to suppress the
   XML declaration.
 
-* New :class:`Element` method: :meth:`extend` appends the items from a
+* New :class:`~xml.etree.ElementTree.Element` method:
+  :meth:`~xml.etree.ElementTree.Element.extend` appends the items from a
   sequence to the element's children.  Elements themselves behave like
   sequences, so it's easy to move children from one element to
   another::
@@ -1998,13 +1999,15 @@
     # Outputs <root><item>1</item>...</root>
     print ET.tostring(new)
 
-* New :class:`Element` method: :meth:`iter` yields the children of the
+* New :class:`Element` method:
+  :meth:`~xml.etree.ElementTree.Element.iter` yields the children of the
   element as a generator.  It's also possible to write ``for child in
   elem:`` to loop over an element's children.  The existing method
   :meth:`getiterator` is now deprecated, as is :meth:`getchildren`
   which constructs and returns a list of children.
 
-* New :class:`Element` method: :meth:`itertext` yields all chunks of
+* New :class:`Element` method:
+  :meth:`~xml.etree.ElementTree.Element.itertext` yields all chunks of
   text that are descendants of the element.  For example::
 
     t = ET.XML("""<list>

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