summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorMariatta <Mariatta@users.noreply.github.com>2017-06-01 02:48:28 (GMT)
committerGitHub <noreply@github.com>2017-06-01 02:48:28 (GMT)
commit1721b06a78a4fd7942d9658ac8add6911a1a03e3 (patch)
tree2f73bbb7e8b41567c638dc962eeb6ffaf1cbeca3 /Doc/library
parent958e815fe014e9a3c64f3568b883c2a7b32a4e2e (diff)
downloadcpython-1721b06a78a4fd7942d9658ac8add6911a1a03e3.zip
cpython-1721b06a78a4fd7942d9658ac8add6911a1a03e3.tar.gz
cpython-1721b06a78a4fd7942d9658ac8add6911a1a03e3.tar.bz2
bpo-22702: Clarify documentation of str.join & bytes.join (GH-156) (GH-1896)
The "iterable iterable" phrasing created confusion between the term reference and the parameter name. This simplifies the phrasing to just use the parameter name without linking directly to the term definition. (cherry picked from commit 08e2f355d04d3cbea5751ce1275306ee3f569b32)
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/stdtypes.rst18
1 files changed, 9 insertions, 9 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 85fafa7..87d8eb8 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1714,10 +1714,10 @@ expression support in the :mod:`re` module).
.. method:: str.join(iterable)
- Return a string which is the concatenation of the strings in the
- :term:`iterable` *iterable*. A :exc:`TypeError` will be raised if there are
- any non-string values in *iterable*, including :class:`bytes` objects. The
- separator between elements is the string providing this method.
+ Return a string which is the concatenation of the strings in *iterable*.
+ A :exc:`TypeError` will be raised if there are any non-string values in
+ *iterable*, including :class:`bytes` objects. The separator between
+ elements is the string providing this method.
.. method:: str.ljust(width[, fillchar])
@@ -2533,11 +2533,11 @@ arbitrary binary data.
bytearray.join(iterable)
Return a bytes or bytearray object which is the concatenation of the
- binary data sequences in the :term:`iterable` *iterable*. A
- :exc:`TypeError` will be raised if there are any values in *iterable*
- that are not :term:`bytes-like objects <bytes-like object>`, including
- :class:`str` objects. The separator between elements is the contents
- of the bytes or bytearray object providing this method.
+ binary data sequences in *iterable*. A :exc:`TypeError` will be raised
+ if there are any values in *iterable* that are not :term:`bytes-like
+ objects <bytes-like object>`, including :class:`str` objects. The
+ separator between elements is the contents of the bytes or
+ bytearray object providing this method.
.. staticmethod:: bytes.maketrans(from, to)