diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-02-10 01:18:36 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-02-10 01:18:36 (GMT) |
| commit | 263c448a2e57378aee775e9a994ab87946233160 (patch) | |
| tree | 17b747db4ffe85f66514a2d13e337ae681d24cf1 /Doc | |
| parent | 15a3095d64e96d0fe7448270f2c5b0bf22f9c4e1 (diff) | |
| parent | 96a4f07107476c0038ff1302b7ef779cab07e8ae (diff) | |
| download | cpython-263c448a2e57378aee775e9a994ab87946233160.zip cpython-263c448a2e57378aee775e9a994ab87946233160.tar.gz cpython-263c448a2e57378aee775e9a994ab87946233160.tar.bz2 | |
Issues #26310, 26311: Merge typo fixes from 3.5
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/pyexpat.rst | 4 | ||||
| -rw-r--r-- | Doc/library/tkinter.ttk.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/3.5.rst | 2 |
3 files changed, 4 insertions, 4 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. <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 -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`.) |