From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 1 Dec 2015 04:57:01 +0000 (-0600)
Subject: Issue #25767: Merge with 3.4
X-Git-Tag: v3.6.0a1~970^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee1a0e4b8c5e271ed023ba1c795715695d912194;p=thirdparty%2FPython%2Fcpython.git

Issue #25767: Merge with 3.4
---

ee1a0e4b8c5e271ed023ba1c795715695d912194
diff --cc Doc/library/asyncio-eventloops.rst
index b2e7d7c97227,f42f65a79672..fc589922e423
--- a/Doc/library/asyncio-eventloops.rst
+++ b/Doc/library/asyncio-eventloops.rst
@@@ -107,13 -109,9 +107,13 @@@ Common limits of Windows event loops
  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
 +
 +   :class:`ProactorEventLoop` now supports SSL.
 +
  
  Mac OS X
  ^^^^^^^^