[Python-checkins] cpython (merge 3.5 -> default): merge from 3.5

[senthil.kumaran]

https://hg.python.org/cpython/rev/3a6b1186745f
changeset:   99757:3a6b1186745f
parent:      99754:6446bdf9cdfe
parent:      99756:6b9d8957aeef
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Fri Jan 01 23:27:38 2016 -0800
summary:
  merge from 3.5

Issue25917 : Fix howto links in docs. Point the reference documentation instead of wiki.

files:
  Doc/faq/programming.rst   |  3 +--
  Doc/library/functions.rst |  3 +--
  2 files changed, 2 insertions(+), 4 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- 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
--- 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)
 

-- 
Repository URL: https://hg.python.org/cpython