diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-09-02 12:51:57 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-09-02 12:51:57 -0400 |
| commit | 13c299509cb55e8ad777efd5cf8ed326255944b1 (patch) | |
| tree | 9ea1ce950fad6cb808639a42e0ef1d7caa3f1e07 /documentation/index.rst | |
| parent | 02a5e8961bdc6362b3f0165bf6b67cdd06a3a37c (diff) | |
| download | six-git-13c299509cb55e8ad777efd5cf8ed326255944b1.tar.gz | |
urllib paragraph doesn't need to be a note
Diffstat (limited to 'documentation/index.rst')
| -rw-r--r-- | documentation/index.rst | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/documentation/index.rst b/documentation/index.rst index aa99b5a..303afa6 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -433,14 +433,11 @@ example, ``cPickle`` no longer exists in Python 3; it was merged with ``pickle``. In these cases, fetching the fast version will load the fast one on Python 2 and the merged module in Python 3. - -.. note:: - - The :mod:`py2:urllib`, :mod:`py2:urllib2`, and :mod:`py2:urlparse` modules - have been combined in the :mod:`py3:urllib` package in Python 3. - The :mod:`six.moves.urllib` package is a version-independent location - for this functionality; its structure mimics the structure of the Python 3 - :mod:`py3:urllib` package. +The :mod:`py2:urllib`, :mod:`py2:urllib2`, and :mod:`py2:urlparse` modules have +been combined in the :mod:`py3:urllib` package in Python 3. The +:mod:`six.moves.urllib` package is a version-independent location for this +functionality; its structure mimics the structure of the Python 3 +:mod:`py3:urllib` package. Supported renames: |