[Python-checkins] fix comma location in various places (GH-19233)
Mathieu Dupuy
webhook-mailer at python.org
Mon Mar 30 17:28:33 EDT 2020
https://github.com/python/cpython/commit/c49016e67c3255b37599b354a8d7995d40663991
commit: c49016e67c3255b37599b354a8d7995d40663991
branch: master
author: Mathieu Dupuy <deronnax at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-03-30T14:28:25-07:00
summary:
fix comma location in various places (GH-19233)
files:
M Doc/install/index.rst
M Doc/library/mailcap.rst
M Doc/library/pprint.rst
M Doc/library/ssl.rst
M Doc/library/textwrap.rst
M Doc/library/tokenize.rst
M Doc/reference/datamodel.rst
M Doc/reference/expressions.rst
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index a91606c0f38e6..e6d5a3e6ebde6 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -532,7 +532,7 @@ scripts will wind up in :file:`/usr/local/python/bin`. If you want them in
python setup.py install --install-scripts=/usr/local/bin
-(This performs an installation using the "prefix scheme," where the prefix is
+(This performs an installation using the "prefix scheme", where the prefix is
whatever your Python interpreter was installed with--- :file:`/usr/local/python`
in this case.)
diff --git a/Doc/library/mailcap.rst b/Doc/library/mailcap.rst
index 896afd1d73062..bf9639bdaca50 100644
--- a/Doc/library/mailcap.rst
+++ b/Doc/library/mailcap.rst
@@ -18,7 +18,7 @@ belonging to a temporary file) and the :program:`xmpeg` program can be
automatically started to view the file.
The mailcap format is documented in :rfc:`1524`, "A User Agent Configuration
-Mechanism For Multimedia Mail Format Information," but is not an Internet
+Mechanism For Multimedia Mail Format Information", but is not an Internet
standard. However, mailcap files are supported on most Unix systems.
diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst
index 207c3f8bca928..16256c549208f 100644
--- a/Doc/library/pprint.rst
+++ b/Doc/library/pprint.rst
@@ -147,7 +147,7 @@ The :mod:`pprint` module also provides several shortcut functions:
.. index:: builtin: eval
- Determine if the formatted representation of *object* is "readable," or can be
+ Determine if the formatted representation of *object* is "readable", or can be
used to reconstruct the value using :func:`eval`. This always returns ``False``
for recursive objects.
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 3e5fcab22d028..570d4f720a25a 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -42,7 +42,7 @@ This module provides a class, :class:`ssl.SSLSocket`, which is derived from the
:class:`socket.socket` type, and provides a socket-like wrapper that also
encrypts and decrypts the data going over the socket with SSL. It supports
additional methods such as :meth:`getpeercert`, which retrieves the
-certificate of the other side of the connection, and :meth:`cipher`,which
+certificate of the other side of the connection, and :meth:`cipher`, which
retrieves the cipher being used for the secure connection.
For more sophisticated applications, the :class:`ssl.SSLContext` class
@@ -2271,7 +2271,7 @@ Visual inspection shows that the certificate does identify the desired service
(('postalCode', '03894-4801'),),
(('countryName', 'US'),),
(('stateOrProvinceName', 'NH'),),
- (('localityName', 'Wolfeboro,'),),
+ (('localityName', 'Wolfeboro'),),
(('organizationName', 'Python Software Foundation'),),
(('commonName', 'www.python.org'),)),
'subjectAltName': (('DNS', 'www.python.org'),
diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst
index 0f11ef401569d..16837104b6ceb 100644
--- a/Doc/library/textwrap.rst
+++ b/Doc/library/textwrap.rst
@@ -239,7 +239,7 @@ hyphenated words; only then will long words be broken if necessary, unless
:attr:`fix_sentence_endings` is false by default.
Since the sentence detection algorithm relies on ``string.lowercase`` for
- the definition of "lowercase letter," and a convention of using two spaces
+ the definition of "lowercase letter", and a convention of using two spaces
after a period to separate sentences on the same line, it is specific to
English-language texts.
diff --git a/Doc/library/tokenize.rst b/Doc/library/tokenize.rst
index 96778f23f8f06..11f569df2e7cd 100644
--- a/Doc/library/tokenize.rst
+++ b/Doc/library/tokenize.rst
@@ -13,7 +13,7 @@
The :mod:`tokenize` module provides a lexical scanner for Python source code,
implemented in Python. The scanner in this module returns comments as tokens
-as well, making it useful for implementing "pretty-printers," including
+as well, making it useful for implementing "pretty-printers", including
colorizers for on-screen displays.
To simplify token stream handling, all :ref:`operator <operators>` and
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index e91e855674dc5..1c2706362b718 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -17,7 +17,7 @@ Objects, values and types
:dfn:`Objects` are Python's abstraction for data. All data in a Python program
is represented by objects or by relations between objects. (In a sense, and in
-conformance to Von Neumann's model of a "stored program computer," code is also
+conformance to Von Neumann's model of a "stored program computer", code is also
represented by objects.)
.. index::
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 3fcc5e17d9a7c..16542cdcec197 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -28,7 +28,7 @@ Arithmetic conversions
.. index:: pair: arithmetic; conversion
When a description of an arithmetic operator below uses the phrase "the numeric
-arguments are converted to a common type," this means that the operator
+arguments are converted to a common type", this means that the operator
implementation for built-in types works as follows:
* If either argument is a complex number, the other is converted to complex;
More information about the Python-checkins
mailing list