[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2

[eli.bendersky]

http://hg.python.org/cpython/rev/009fed42c918
changeset:   75366:009fed42c918
parent:      75364:a92e73dfbff6
parent:      75365:81e606862a89
user:        Eli Bendersky <eliben at gmail.com>
date:        Fri Mar 02 07:41:23 2012 +0200
summary:
  Merge 3.2

files:
  Doc/library/xml.dom.minidom.rst |  8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst
--- a/Doc/library/xml.dom.minidom.rst
+++ b/Doc/library/xml.dom.minidom.rst
@@ -15,6 +15,14 @@
 Model interface.  It is intended to be simpler than the full DOM and also
 significantly smaller.
 
+.. note::
+
+   The :mod:`xml.dom.minidom` module provides an implementation of the W3C-DOM,
+   with an API similar to that in other programming languages.  Users who are
+   unfamiliar with the W3C-DOM interface or who would like to write less code
+   for processing XML files should consider using the
+   :mod:`xml.etree.ElementTree` module instead.
+
 DOM applications typically start by parsing some XML into a DOM.  With
 :mod:`xml.dom.minidom`, this is done through the parse functions::
 

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