merge from 3.5
Issue25917 : Fix howto links in docs. Point the reference documentation instead of wiki.
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 @@
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 @@
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)