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

[zach.ware]

https://hg.python.org/cpython/rev/fee19d2d7713
changeset:   99404:fee19d2d7713
branch:      3.5
parent:      99401:ef85dc8c0ba0
parent:      99403:f475379bf22c
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Nov 30 22:57:01 2015 -0600
summary:
  Issue #25767: Merge with 3.4

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