From: Martin Panter Date: Wed, 10 Feb 2016 01:17:51 +0000 (+0000) Subject: Issues #26310, #26311: Fix typos in the documentation X-Git-Tag: v2.7.12rc1~237 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dafcc25a99cd8ae5e95fa9c7a1d926c90c9c2d4;p=thirdparty%2FPython%2Fcpython.git Issues #26310, #26311: Fix typos in the documentation --- diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst index 5876d1dbef5f..0c8e7fc2a677 100644 --- a/Doc/library/pyexpat.rst +++ b/Doc/library/pyexpat.rst @@ -595,9 +595,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 ``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 ad4aa9263496..051601d83e23 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 23ce6fc3012d..33f7fb482ac0 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 e9e95fd8d2e1..3336e2f3bef1 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 6398c77586da..b0e9dc59c4d7 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 7ae83ffe26aa..a8a4ad16eb7b 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 -----------------