summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-02-10 01:17:51 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-02-10 01:17:51 (GMT)
commit2dafcc25a99cd8ae5e95fa9c7a1d926c90c9c2d4 (patch)
tree168587693fd27da286830c56d2cd40d59360c4d1
parent78a54c03117711de66169230fc4eba7f0abd79af (diff)
downloadcpython-2dafcc25a99cd8ae5e95fa9c7a1d926c90c9c2d4.zip
cpython-2dafcc25a99cd8ae5e95fa9c7a1d926c90c9c2d4.tar.gz
cpython-2dafcc25a99cd8ae5e95fa9c7a1d926c90c9c2d4.tar.bz2
Issues #26310, #26311: Fix typos in the documentation
-rw-r--r--Doc/library/pyexpat.rst4
-rw-r--r--Doc/library/ttk.rst2
-rw-r--r--Lib/SocketServer.py2
-rw-r--r--Lib/idlelib/NEWS.txt2
-rw-r--r--Lib/idlelib/help.py2
-rw-r--r--Misc/NEWS2
6 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
index 5876d1d..0c8e7fc 100644
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -595,9 +595,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 ``model`` object
of the :mod:`xml.parsers.expat` module. These constants can be collected in two
diff --git a/Doc/library/ttk.rst b/Doc/library/ttk.rst
index ad4aa92..051601d 100644
--- a/Doc/library/ttk.rst
+++ b/Doc/library/ttk.rst
@@ -293,7 +293,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 those 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`), this class has some other methods, described at
:class:`ttk.Combobox`.
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 23ce6fc..33f7fb4 100644
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -642,7 +642,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/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index e9e95fd..3336e2f 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -162,7 +162,7 @@ What's New in IDLE 2.7.9?
move version to end.
- Issue #14105: Idle debugger breakpoints no longer disappear
- when inseting or deleting lines.
+ when inserting or deleting lines.
What's New in IDLE 2.7.8?
diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py
index 6398c77..b0e9dc5 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/Misc/NEWS b/Misc/NEWS
index 7ae83ff..a8a4ad1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1159,7 +1159,7 @@ IDLE
move version to end.
- Issue #14105: Idle debugger breakpoints no longer disappear
- when inseting or deleting lines.
+ when inserting or deleting lines.
Extension Modules
-----------------