summaryrefslogtreecommitdiffstats
path: root/Doc/faq/programming.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 07:37:29 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 07:37:29 (GMT)
commitcadc3fdcb5ee891b2325f7fa5c98b789ea512aa3 (patch)
tree7cf9c5f4bd20f8074adbf7ffd5eafc79685de9b3 /Doc/faq/programming.rst
parent347c3f6e346bf861b881d96f35feb5434ab8de92 (diff)
parente73778c1ac0e58d3520b37308b970073e818fa00 (diff)
downloadcpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.zip
cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.tar.gz
cpython-cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3.tar.bz2
Merge with 3.4
Diffstat (limited to 'Doc/faq/programming.rst')
-rw-r--r--Doc/faq/programming.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index c30c2b6..b52af60 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1020,7 +1020,7 @@ performance levels:
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 <http://wiki.python.org/moin/HowTo/Sorting>`_ for examples
+ `sorting mini-HOWTO <https://wiki.python.org/moin/HowTo/Sorting>`_ for examples
of moderately advanced usage).
* Abstractions tend to create indirections and force the interpreter to work
@@ -1040,7 +1040,7 @@ yourself.
.. seealso::
The wiki page devoted to `performance tips
- <http://wiki.python.org/moin/PythonSpeed/PerformanceTips>`_.
+ <https://wiki.python.org/moin/PythonSpeed/PerformanceTips>`_.
.. _efficient_string_concatenation: