mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 07:02:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issues #26310, 26311: Merge typo fixes from 3.5

Browse source
This commit is contained in:
Martin Panter 2016-02-10 01:18:36 +00:00
commit 263c448a2e
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/library/pyexpat.rst
View file

@ -570,9 +570,9 @@ Content Model Descriptions
.. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org> .. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
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 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 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 :mod:`xml.parsers.expat.model` module. These constants can be collected in two

2
Doc/library/tkinter.ttk.rst
View file

@ -299,7 +299,7 @@ Besides the methods inherited from :class:`Widget`: :meth:`Widget.cget`,
:meth:`Widget.configure`, :meth:`Widget.identify`, :meth:`Widget.instate` :meth:`Widget.configure`, :meth:`Widget.identify`, :meth:`Widget.instate`
and :meth:`Widget.state`, and the following inherited from :class:`Entry`: and :meth:`Widget.state`, and the following inherited from :class:`Entry`:
:meth:`Entry.bbox`, :meth:`Entry.delete`, :meth:`Entry.icursor`, :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 :meth:`Entry.xview`, it has some other methods, described at
:class:`ttk.Combobox`. :class:`ttk.Combobox`.

2
Doc/whatsnew/3.5.rst
View file

@ -914,7 +914,7 @@ compileall
---------- ----------
A new :mod:`compileall` option, :samp:`-j {N}`, allows to run *N* workers 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`` The :func:`~compileall.compile_dir` function has a corresponding ``workers``
parameter. (Contributed by Claudiu Popa in :issue:`16104`.) parameter. (Contributed by Claudiu Popa in :issue:`16104`.)

2
Lib/email/headerregistry.py
View file

@ -16,7 +16,7 @@ from email import _header_value_parser as parser
class Address: class Address:
def __init__(self, display_name='', username='', domain='', addr_spec=None): 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 An address can have a 'display_name', a 'username', and a 'domain'. In
addition to specifying the username and domain separately, they may be addition to specifying the username and domain separately, they may be

2
Lib/idlelib/NEWS.txt
View file

@ -149,7 +149,7 @@ What's New in IDLE 3.5.0?
move version to end. move version to end.
- Issue #14105: Idle debugger breakpoints no longer disappear - 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. - Issue #17172: Turtledemo can now be run from Idle.
Currently, the entry is on the Help menu, but it may move to Run. Currently, the entry is on the Help menu, but it may move to Run.

2
Lib/idlelib/help.py
View file

@ -11,7 +11,7 @@ Help => IDLE Help: Display help.html with proper formatting.
Doc/library/idle.rst (Sphinx)=> Doc/build/html/library/idle.html Doc/library/idle.rst (Sphinx)=> Doc/build/html/library/idle.html
(help.copy_strip)=> Lib/idlelib/help.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. HelpText - Display formatted help.html.

2
Lib/socketserver.py
View file

@ -671,7 +671,7 @@ class BaseRequestHandler:
client address as self.client_address, and the server (in case it client address as self.client_address, and the server (in case it
needs access to per-server information) as self.server. Since a needs access to per-server information) as self.server. Since a
separate instance is created for each request, the handle() method separate instance is created for each request, the handle() method
can define arbitrary other instance variariables. can define other arbitrary instance variables.
""" """

2
Misc/NEWS
View file

@ -3936,7 +3936,7 @@ IDLE
move version to end. move version to end.
- Issue #14105: Idle debugger breakpoints no longer disappear - 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. - Issue #17172: Turtledemo can now be run from Idle.
Currently, the entry is on the Help menu, but it may move to Run. Currently, the entry is on the Help menu, but it may move to Run.