[Python-checkins] cpython (merge 3.5 -> default): Closes #25767: Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/734247d5d0f9
changeset:   99405:734247d5d0f9
parent:      99402:ac0f7ed0e94d
parent:      99404:fee19d2d7713
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Nov 30 22:57:22 2015 -0600
summary:
  Closes #25767: Merge with 3.5

files:
  Doc/library/asyncio-eventloops.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/asyncio-eventloops.rst b/Doc/library/asyncio-eventloops.rst
--- a/Doc/library/asyncio-eventloops.rst
+++ b/Doc/library/asyncio-eventloops.rst
@@ -107,7 +107,7 @@
 The resolution of the monotonic clock on Windows is usually around 15.6 msec.
 The best resolution is 0.5 msec. The resolution depends on the hardware
 (availability of `HPET
-<http://fr.wikipedia.org/wiki/High_Precision_Event_Timer>`_) and on the Windows
+<http://en.wikipedia.org/wiki/High_Precision_Event_Timer>`_) and on the Windows
 configuration. See :ref:`asyncio delayed calls <asyncio-delayed-calls>`.
 
 .. versionchanged:: 3.5

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