summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-02-10 01:18:36 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-02-10 01:18:36 (GMT)
commit263c448a2e57378aee775e9a994ab87946233160 (patch)
tree17b747db4ffe85f66514a2d13e337ae681d24cf1 /Lib/idlelib
parent15a3095d64e96d0fe7448270f2c5b0bf22f9c4e1 (diff)
parent96a4f07107476c0038ff1302b7ef779cab07e8ae (diff)
downloadcpython-263c448a2e57378aee775e9a994ab87946233160.zip
cpython-263c448a2e57378aee775e9a994ab87946233160.tar.gz
cpython-263c448a2e57378aee775e9a994ab87946233160.tar.bz2
Issues #26310, 26311: Merge typo fixes from 3.5
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/NEWS.txt2
-rw-r--r--Lib/idlelib/help.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index ce6e3a4..d914b2c 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -149,7 +149,7 @@ What's New in IDLE 3.5.0?
move version to end.
- Issue #14105: Idle debugger breakpoints no longer disappear
- when inseting or deleting lines.
+ when inserting or deleting lines.
- Issue #17172: Turtledemo can now be run from Idle.
Currently, the entry is on the Help menu, but it may move to Run.
diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py
index b31596c..24665a8 100644
--- a/Lib/idlelib/help.py
+++ b/Lib/idlelib/help.py
@@ -11,7 +11,7 @@ Help => IDLE Help: Display help.html with proper formatting.
Doc/library/idle.rst (Sphinx)=> Doc/build/html/library/idle.html
(help.copy_strip)=> Lib/idlelib/help.html
-HelpParser - Parse help.html and and render to tk Text.
+HelpParser - Parse help.html and render to tk Text.
HelpText - Display formatted help.html.