summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-09-16 00:55:27 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-09-16 00:55:27 (GMT)
commit355bbb0a2ae864acd6c719b3529c6f5cabfdd950 (patch)
tree119bcaa76ccafcb2193765d043ae8479dd7b4462 /Misc
parent993b6f5c7ba072ca58398500570da6e16489f277 (diff)
parent2dc77f0e197b9ca9710d7ae20ff13fe2bea541c4 (diff)
downloadcpython-355bbb0a2ae864acd6c719b3529c6f5cabfdd950.zip
cpython-355bbb0a2ae864acd6c719b3529c6f5cabfdd950.tar.gz
cpython-355bbb0a2ae864acd6c719b3529c6f5cabfdd950.tar.bz2
Issue #28145: Merge spelling fixes from 3.5 into 3.6
Diffstat (limited to 'Misc')
-rw-r--r--Misc/HISTORY2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 73fb1d3..fa2e3c7 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -23445,7 +23445,7 @@ uudecode bug where it complaints about trailing garbage is still there
decimal numbers).
- In string.atof(), don't fail when the "re" module is unavailable.
-Plug the ensueing security leak by supplying an empty __builtins__
+Plug the ensuing security leak by supplying an empty __builtins__
directory to eval().
- A bunch of small fixes and improvements to Tkinter.py.