Merge with 3.5

1 files changed, 13 insertions, 31 deletions

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index fe8e89e..0634e54 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -458,38 +458,20 @@ Python Shell window
   * :kbd:`Return` while on any previous command retrieves that command
 
 
-Syntax colors
--------------
-
-The coloring is applied in a background "thread," so you may occasionally see
-uncolorized text.  To change the color scheme, edit the ``[Colors]`` section in
-:file:`config.txt`.
-
-Python syntax colors:
-   Keywords
-      orange
-
-   Strings
-      green
-
-   Comments
-      red
-
-   Definitions
-      blue
-
-Shell colors:
-   Console output
-      brown
-
-   stdout
-      blue
-
-   stderr
-      dark green
+Text colors
+^^^^^^^^^^^
 
-   stdin
-      black
+Idle defaults to black on white text, but colors text with special meanings.
+For the shell, these are shell output, shell error, user output, and
+user error.  For Python code, at the shell prompt or in an editor, these are
+keywords, builtin class and function names, names following ``class`` and
+``def``, strings, and comments. For any text window, these are the cursor (when
+present), found text (when possible), and selected text.
+
+Text coloring is done in the background, so uncolorized text is occasionally
+visible.  To change the color scheme, use the Configure IDLE dialog
+Highlighting tab.  The marking of debugger breakpoint lines in the editor and
+text in popups and dialogs is not user-configurable.
 
 
 Startup and code execution