diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-12 08:02:39 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-12 08:02:39 (GMT) |
commit | f79774bb92b765b449dd8da4876a3298fac02ec7 (patch) | |
tree | 93240816a7fe0437c20d451837db8cab3371942e /Doc | |
parent | e312f4d30429a8ddf0b78be5ab9d49e0fa811e66 (diff) | |
parent | a6229e6ebd82a36ea9c27e9361e4e67e24a8de5b (diff) | |
download | cpython-f79774bb92b765b449dd8da4876a3298fac02ec7.zip cpython-f79774bb92b765b449dd8da4876a3298fac02ec7.tar.gz cpython-f79774bb92b765b449dd8da4876a3298fac02ec7.tar.bz2 |
Merge link additions/fixes with 3.3.
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/howto/unicode.rst | 2 | ||||
-rw-r--r-- | Doc/library/functions.rst | 14 | ||||
-rw-r--r-- | Doc/library/string.rst | 2 | ||||
-rw-r--r-- | Doc/tutorial/introduction.rst | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst index f9eeae4..5d9e027 100644 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -414,7 +414,7 @@ References ---------- The ``str`` type is described in the Python library reference at -:ref:`typesseq`. +:ref:`textseq`. The documentation for the :mod:`unicodedata` module. diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index d6a8d0c..0e836f9 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -122,6 +122,8 @@ are always available. They are listed here in alphabetical order. Without an argument, an array of size 0 is created. + See also :ref:`binaryseq` and :ref:`typebytearray`. + .. _func-bytes: .. function:: bytes([source[, encoding[, errors]]]) @@ -135,6 +137,8 @@ are always available. They are listed here in alphabetical order. Bytes objects can also be created with literals, see :ref:`strings`. + See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`. + .. function:: callable(object) @@ -687,6 +691,8 @@ are always available. They are listed here in alphabetical order. method; if the value returned is equal to *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. + See also :ref:`typeiter`. + One useful application of the second form of :func:`iter` is to read lines of a file until a certain line is reached. The following example reads a file until the :meth:`readline` method returns an empty string:: @@ -707,7 +713,7 @@ are always available. They are listed here in alphabetical order. :noindex: Rather than being a function, :class:`list` is actually a mutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`. .. function:: locals() @@ -1081,7 +1087,7 @@ are always available. They are listed here in alphabetical order. :noindex: Rather than being a function, :class:`range` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`. .. function:: repr(object) @@ -1309,7 +1315,7 @@ are always available. They are listed here in alphabetical order. :noindex: Rather than being a function, :class:`tuple` is actually an immutable - sequence type, as documented in :ref:`typesseq`. + sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`. .. function:: type(object) @@ -1342,6 +1348,8 @@ are always available. They are listed here in alphabetical order. ... >>> X = type('X', (object,), dict(a=1)) + See also :ref:`bltin-type-objects`. + .. function:: vars([object]) diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 79d4e3f..9c63272 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -10,7 +10,7 @@ .. seealso:: - :ref:`typesseq` + :ref:`textseq` :ref:`string-methods` diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst index b6d94ac..c07a668 100644 --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -390,7 +390,7 @@ The built-in function :func:`len` returns the length of a string:: .. seealso:: - :ref:`typesseq` + :ref:`textseq` Strings are examples of *sequence types*, and support the common operations supported by such types. |