Add renaming notices to xmlrpc modules.
diff --git a/Doc/library/docxmlrpcserver.rst b/Doc/library/docxmlrpcserver.rst
index 958ea95..67cb3b9 100644
--- a/Doc/library/docxmlrpcserver.rst
+++ b/Doc/library/docxmlrpcserver.rst
@@ -1,4 +1,3 @@
-
:mod:`DocXMLRPCServer` --- Self-documenting XML-RPC server
==========================================================
@@ -7,6 +6,11 @@
.. moduleauthor:: Brian Quinlan <brianq@activestate.com>
.. sectionauthor:: Brian Quinlan <brianq@activestate.com>
+.. note::
+ The :mod:`DocXMLRPCServer` module has been merged into :mod:`xmlrpc.server`
+ in Python 3.0. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to 3.0.
+
.. versionadded:: 2.3
diff --git a/Doc/library/simplexmlrpcserver.rst b/Doc/library/simplexmlrpcserver.rst
index c788d55..e77ac77 100644
--- a/Doc/library/simplexmlrpcserver.rst
+++ b/Doc/library/simplexmlrpcserver.rst
@@ -1,4 +1,3 @@
-
:mod:`SimpleXMLRPCServer` --- Basic XML-RPC server
==================================================
@@ -7,6 +6,11 @@
.. moduleauthor:: Brian Quinlan <brianq@activestate.com>
.. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
+.. note::
+ The :mod:`SimpleXMLRPCServer` module has been merged into
+ :mod:`xmlrpc.server` in Python 3.0. The :term:`2to3` tool will automatically
+ adapt imports when converting your sources to 3.0.
+
.. versionadded:: 2.2
diff --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst
index 51d97a2..84f662c 100644
--- a/Doc/library/xmlrpclib.rst
+++ b/Doc/library/xmlrpclib.rst
@@ -6,6 +6,11 @@
.. moduleauthor:: Fredrik Lundh <fredrik@pythonware.com>
.. sectionauthor:: Eric S. Raymond <esr@snark.thyrsus.com>
+.. note::
+ The :mod:`xmlrpclib` module has been renamed to :mod:`xmlrpc.client` in
+ Python 3.0. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to 3.0.
+
.. XXX Not everything is documented yet. It might be good to describe
Marshaller, Unmarshaller, getparser, dumps, loads, and Transport.