summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-07-04 22:06:21 (GMT)
committerNed Deily <nad@acm.org>2015-07-04 22:06:21 (GMT)
commit2e770ce9a09c129fed6646e5b30560e06a3b8183 (patch)
tree23e1e4483542c5aab756f4773ed899bdf543efaf
parentac4f550bfcae297013f73088d85451dccd96a49a (diff)
parentf1ce6deb4111267ab8de5cd6430c1bcebe1084bc (diff)
downloadcpython-2e770ce9a09c129fed6646e5b30560e06a3b8183.zip
cpython-2e770ce9a09c129fed6646e5b30560e06a3b8183.tar.gz
cpython-2e770ce9a09c129fed6646e5b30560e06a3b8183.tar.bz2
Issue #24330: merge from 3.4
-rw-r--r--Doc/library/idle.rst3
-rw-r--r--Lib/idlelib/help.txt4
2 files changed, 5 insertions, 2 deletions
diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index c842b26..24e22c1 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -248,7 +248,8 @@ Configure IDLE
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
index 7eff370..9540173 100644
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -129,7 +129,9 @@ Options Menu (Shell and Editor):
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