diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2016-01-02 07:26:53 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2016-01-02 07:26:53 (GMT) |
| commit | fcb6db50d3cce6337f28c9c1b891905cc323ad13 (patch) | |
| tree | 992332cb79ee22f08ab7c589a1c36daa2374ea7b | |
| parent | 9ecf00e7cb6ce94afaa3a47da88bd8cafa32e968 (diff) | |
| parent | d03d1d45f5d66395f66f165e9b097cd2757ce618 (diff) | |
| download | cpython-fcb6db50d3cce6337f28c9c1b891905cc323ad13.zip cpython-fcb6db50d3cce6337f28c9c1b891905cc323ad13.tar.gz cpython-fcb6db50d3cce6337f28c9c1b891905cc323ad13.tar.bz2 | |
merge from 3.4
Issue25917 : Fix howto links in docs. Point the reference documentation instead of wiki.
| -rw-r--r-- | Doc/faq/programming.rst | 3 | ||||
| -rw-r--r-- | Doc/library/functions.rst | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 295445e..94b428d 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1010,8 +1010,7 @@ performance levels: may come up with. This is doubly true for primitives written in C, such as builtins and some extension types. For example, be sure to use either the :meth:`list.sort` built-in method or the related :func:`sorted` - function to do sorting (and see the - `sorting mini-HOWTO <https://wiki.python.org/moin/HowTo/Sorting>`_ for examples + function to do sorting (and see the :ref:`sortinghowto` for examples of moderately advanced usage). * Abstractions tend to create indirections and force the interpreter to work diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index c8de062..6e98cfb 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1306,8 +1306,7 @@ are always available. They are listed here in alphabetical order. compare equal --- this is helpful for sorting in multiple passes (for example, sort by department, then by salary grade). - For sorting examples and a brief sorting tutorial, see `Sorting HowTo - <https://wiki.python.org/moin/HowTo/Sorting/>`_\. + For sorting examples and a brief sorting tutorial, see :ref:`sortinghowto`. .. function:: staticmethod(function) |