From b6c60930d042d60084a698c6747335a8f94aac14 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 24 Feb 2008 06:09:56 +0000
Subject: [PATCH] Document the tk package.

---
 pep-3108.txt | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/pep-3108.txt b/pep-3108.txt
index 6812cf689..37660b325 100644
--- a/pep-3108.txt
+++ b/pep-3108.txt
@@ -533,8 +533,40 @@ SimpleHTTPServer   http.server [2]_
 
 .. [2] The ``http.server`` module can combine the specified modules
        safely as they have no naming conflicts.
+
+
+tk package
+//////////
+
+==================  ===============================
+Current Name        Replacement Name
+==================  ===============================
+Canvas              tk.canvas
+Dialog              tk.dialog
+FileDialog          tk.filedialog [4]_
+FixTk               tk._fix
+ScrolledText        tk.scrolledtext
+SimpleDialog        tk.simpledialog [5]_
+Tix                 tk.tix
+Tkconstants         tk.constants
+Tkdnd               tk.dnd
+Tkinter             tk.inter
+tkColorChooser      tk.colorchooser
+tkCommonDialog      tk.commondialog
+tkFileDialog        tk.filedialog [4]_
+tkFont              tk.font
+tkMessageBox        tk.messagebox
+tkSimpleDialog      tk.simpledialog [5]_
+turtle              tk.turtle
+==================  ===============================
+
+.. [4] ``tk.filedialog`` can safely combine ``FileDialog`` and ``tkFileDialog``
+       as there are no naming conflicts.
        
-       
+.. [5] ``tk.simpledialog`` can safely combine ``SimpleDialog`` and
+       ``tkSimpleDialog`` have no naming conflicts.
+
+
 xmlrpc package
 //////////////