diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-08-23 22:29:02 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-08-23 22:29:02 (GMT) |
| commit | 8d2d8894da1219ed033cc31253ea100db9ea1979 (patch) | |
| tree | 2735d339bdea3f8c3d319ab387e5375c1448637e /Doc | |
| parent | 763826aec1a8ed250069e28bdf812110bcb763d8 (diff) | |
| parent | 004e87048acaf0339e5ec0e564e4de45c3627eb4 (diff) | |
| download | cpython-8d2d8894da1219ed033cc31253ea100db9ea1979.zip cpython-8d2d8894da1219ed033cc31253ea100db9ea1979.tar.gz cpython-8d2d8894da1219ed033cc31253ea100db9ea1979.tar.bz2 | |
Merge with 3.4
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/glossary.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 08ee9db..4411bf8 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -849,7 +849,7 @@ Glossary recognized as ending a line: the Unix end-of-line convention ``'\n'``, the Windows convention ``'\r\n'``, and the old Macintosh convention ``'\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 The objects returned from :meth:`dict.keys`, :meth:`dict.values`, and |