mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge with 3.4

Browse source
This commit is contained in:
Terry Jan Reedy 2014-08-23 18:29:02 -04:00
commit 8d2d8894da
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/glossary.rst
View file

@ -849,7 +849,7 @@ Glossary
recognized as ending a line: the Unix end-of-line convention ``'\n'``, recognized as ending a line: the Unix end-of-line convention ``'\n'``,
the Windows convention ``'\r\n'``, and the old Macintosh convention the Windows convention ``'\r\n'``, and the old Macintosh convention
``'\r'``. See :pep:`278` and :pep:`3116`, as well as ``'\r'``. See :pep:`278` and :pep:`3116`, as well as
:func:`str.splitlines` for an additional use. :func:`bytes.splitlines` for an additional use.
view view
The objects returned from :meth:`dict.keys`, :meth:`dict.values`, and The objects returned from :meth:`dict.keys`, :meth:`dict.values`, and