Add notes that tkinter modules will be renamed.
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 8ce622d..0da14d8 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -16,6 +16,14 @@
The typical Python prompt of the interactive shell when entering code for
an indented code block.
+ 2to3
+ A tool that tries to convert Python 2.x code to Python 3.x code by
+ handling most of the incompatibilites that can be detected by parsing the
+ source and traversing the parse tree.
+
+ 2to3 is available in the standard library as :mod:`lib2to3`; a standalone
+ entry point is provided as :file:`Tools/scripts/2to3`.
+
argument
A value passed to a function or method, assigned to a name local to
the body. A function or method may have both positional arguments and
diff --git a/Doc/library/future_builtins.rst b/Doc/library/future_builtins.rst
index e845fe4..d25aff7 100644
--- a/Doc/library/future_builtins.rst
+++ b/Doc/library/future_builtins.rst
@@ -15,7 +15,7 @@
... code using Python 3-style map and filter ...
-The :program:`2to3` tool that ports Python 2 code to Python 3 will recognize
+The :term:`2to3` tool that ports Python 2 code to Python 3 will recognize
this usage and leave the new builtins alone.
.. note::
diff --git a/Doc/library/scrolledtext.rst b/Doc/library/scrolledtext.rst
index 85456b9..5c666c3 100644
--- a/Doc/library/scrolledtext.rst
+++ b/Doc/library/scrolledtext.rst
@@ -13,6 +13,12 @@
setting up a text widget and scroll bar directly. The constructor is the same
as that of the :class:`Tkinter.Text` class.
+.. note::
+
+ :mod:`ScrolledText` has been renamed to :mod:`tkinter.scrolledtext` in Python
+ 3.0. The :term:`2to3` tool will automatically adapt imports when converting
+ your sources to 3.0.
+
The text widget and scrollbar are packed together in a :class:`Frame`, and the
methods of the :class:`Grid` and :class:`Pack` geometry managers are acquired
from the :class:`Frame` object. This allows the :class:`ScrolledText` widget to
diff --git a/Doc/library/tix.rst b/Doc/library/tix.rst
index ff2cfff..dea88fa 100644
--- a/Doc/library/tix.rst
+++ b/Doc/library/tix.rst
@@ -22,6 +22,11 @@
design your application by choosing the most appropriate widgets to match the
special needs of your application and users.
+.. note::
+
+ :mod:`Tix` has been renamed to :mod:`tkinter.tix` in Python 3.0. The
+ :term:`2to3` tool will automatically adapt imports when converting your
+ sources to 3.0.
.. seealso::
diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index d393341..2b1ab84 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -11,6 +11,11 @@
platforms, as well as on Windows and Macintosh systems. (Tk itself is not part
of Python; it is maintained at ActiveState.)
+.. note::
+
+ :mod:`Tkinter` has been renamed to :mod:`tkinter` in Python 3.0. The
+ :term:`2to3` tool will automatically adapt imports when converting your
+ sources to 3.0.
.. seealso::
@@ -107,6 +112,9 @@
:mod:`turtle`
Turtle graphics in a Tk window.
+These have been renamed as well in Python 3.0; they were all made submodules of
+the new ``tkinter`` package.
+
Tkinter Life Preserver
----------------------