[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #24330: merge from 3.4

[ned.deily]

https://hg.python.org/cpython/rev/2dfdbbe0701b
changeset:   96808:2dfdbbe0701b
branch:      3.5
parent:      96803:51e05ee9848a
parent:      96807:b9460ee09228
user:        Ned Deily <nad at acm.org>
date:        Sat Jul 04 15:06:21 2015 -0700
summary:
  Issue #24330: merge from 3.4

files:
  Doc/library/idle.rst |  3 ++-
  Lib/idlelib/help.txt |  4 +++-
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -248,7 +248,8 @@
    help sources can be specified.  Non-default user setting are saved in a
    .idlerc directory in the user's home directory.  Problems caused by bad user
    configuration files are solved by editing or deleting one or more of the
-   files in .idlerc.
+   files in .idlerc.  On OS X, open the configuration dialog by selecting
+   Preferences in the application menu.
 
 Configure Extensions
    Open a configuration dialog for setting preferences for extensions
diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -129,7 +129,9 @@
         Configure IDLE -- Open a configuration dialog.  Fonts, indentation,
                           keybindings, and color themes may be altered.
                           Startup Preferences may be set, and additional Help
-                          sources can be specified.
+                          sources can be specified.  On OS X, open the
+                          configuration dialog by selecting Preferences
+                          in the application menu.
 
         ---
         Code Context (toggle) -- Open a pane at the top of the edit window

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