From 96a4f07107476c0038ff1302b7ef779cab07e8ae Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Wed, 10 Feb 2016 01:17:51 +0000 Subject: Issues #26310, #26311: Fix typos in the documentation and code comments --- Doc/library/pyexpat.rst | 4 ++-- Doc/library/tkinter.ttk.rst | 2 +- Doc/whatsnew/3.5.rst | 2 +- Lib/email/headerregistry.py | 2 +- Lib/idlelib/NEWS.txt | 2 +- Lib/idlelib/help.py | 2 +- Lib/socketserver.py | 2 +- Misc/NEWS | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst index 620ffb1..bb95431 100644 --- a/Doc/library/pyexpat.rst +++ b/Doc/library/pyexpat.rst @@ -570,9 +570,9 @@ Content Model Descriptions .. sectionauthor:: Fred L. Drake, Jr. -Content modules are described using nested tuples. Each tuple contains four +Content models are described using nested tuples. Each tuple contains four values: the type, the quantifier, the name, and a tuple of children. Children -are simply additional content module descriptions. +are simply additional content model descriptions. The values of the first two fields are constants defined in the :mod:`xml.parsers.expat.model` module. These constants can be collected in two diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst index 4601171..4efdfac 100644 --- a/Doc/library/tkinter.ttk.rst +++ b/Doc/library/tkinter.ttk.rst @@ -299,7 +299,7 @@ Besides the methods inherited from :class:`Widget`: :meth:`Widget.cget`, :meth:`Widget.configure`, :meth:`Widget.identify`, :meth:`Widget.instate` and :meth:`Widget.state`, and the following inherited from :class:`Entry`: :meth:`Entry.bbox`, :meth:`Entry.delete`, :meth:`Entry.icursor`, -:meth:`Entry.index`, :meth:`Entry.inset`, :meth:`Entry.selection`, +:meth:`Entry.index`, :meth:`Entry.insert`, :meth:`Entry.selection`, :meth:`Entry.xview`, it has some other methods, described at :class:`ttk.Combobox`. diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index 53cd602..bb520dc 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -914,7 +914,7 @@ compileall ---------- A new :mod:`compileall` option, :samp:`-j {N}`, allows to run *N* workers -sumultaneously to perform parallel bytecode compilation. +simultaneously to perform parallel bytecode compilation. The :func:`~compileall.compile_dir` function has a corresponding ``workers`` parameter. (Contributed by Claudiu Popa in :issue:`16104`.) diff --git a/Lib/email/headerregistry.py b/Lib/email/headerregistry.py index 468ca9e..4e142ee 100644 --- a/Lib/email/headerregistry.py +++ b/Lib/email/headerregistry.py @@ -16,7 +16,7 @@ from email import _header_value_parser as parser class Address: def __init__(self, display_name='', username='', domain='', addr_spec=None): - """Create an object represeting a full email address. + """Create an object representing a full email address. An address can have a 'display_name', a 'username', and a 'domain'. In addition to specifying the username and domain separately, they may be diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 0eb939b..6c075a3 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. diff --git a/Lib/socketserver.py b/Lib/socketserver.py index 0ce8e81..e16aca5 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -671,7 +671,7 @@ class BaseRequestHandler: client address as self.client_address, and the server (in case it needs access to per-server information) as self.server. Since a separate instance is created for each request, the handle() method - can define arbitrary other instance variariables. + can define other arbitrary instance variables. """ diff --git a/Misc/NEWS b/Misc/NEWS index 66b8d36..1d24f50 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3448,7 +3448,7 @@ IDLE 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. -- cgit v0.12