diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-12 01:59:34 (GMT) |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-12 01:59:34 (GMT) |
| commit | e312f4d30429a8ddf0b78be5ab9d49e0fa811e66 (patch) | |
| tree | 589d64899bda23689b514cc144879876d95618b7 /Doc/library/functions.rst | |
| parent | 23354f505ea7a25f31ce1f3e72596bf41770631f (diff) | |
| parent | c33899bd713d2194c75802a543d0b350cb3bb276 (diff) | |
| download | cpython-e312f4d30429a8ddf0b78be5ab9d49e0fa811e66.zip cpython-e312f4d30429a8ddf0b78be5ab9d49e0fa811e66.tar.gz cpython-e312f4d30429a8ddf0b78be5ab9d49e0fa811e66.tar.bz2 | |
Merge from 3.3: Add and adjust some string-related links in the docs.
Diffstat (limited to 'Doc/library/functions.rst')
| -rw-r--r-- | Doc/library/functions.rst | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index e969194..d6a8d0c 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1206,7 +1206,8 @@ are always available. They are listed here in alphabetical order. .. function:: str(object='') str(object[, encoding[, errors]]) - Return a string version of an object, using one of the following modes: + Return a :ref:`string <textseq>` version of an object, using one of the + following modes: If *encoding* and/or *errors* are given, :func:`str` will decode the *object* which can either be a byte string or a character buffer using @@ -1229,11 +1230,9 @@ are always available. They are listed here in alphabetical order. Objects can specify what ``str(object)`` returns by defining a :meth:`__str__` special method. - For more information on strings see :ref:`typesseq` which describes sequence - functionality (strings are sequences), and also the string-specific methods - described in the :ref:`string-methods` section. To output formatted strings, - see the :ref:`string-formatting` section. In addition see the - :ref:`stringservices` section. + For more information on strings and string methods, see the :ref:`textseq` + section. To output formatted strings, see the :ref:`string-formatting` + section. In addition, see the :ref:`stringservices` section. .. function:: sum(iterable[, start]) |