[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/3037546ed4a7
changeset:   93189:3037546ed4a7
parent:      93187:3b26a0983a3c
parent:      93188:5f086db3b51b
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 28 21:35:42 2014 +0100
summary:
  merge with 3.4

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


diff --git a/Doc/library/time.rst b/Doc/library/time.rst
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -133,8 +133,7 @@
 
    On Unix, return the current processor time as a floating point number expressed
    in seconds.  The precision, and in fact the very definition of the meaning of
-   "processor time", depends on that of the C function of the same name, but in any
-   case, this is the function to use for benchmarking Python or timing algorithms.
+   "processor time", depends on that of the C function of the same name.
 
    On Windows, this function returns wall-clock seconds elapsed since the first
    call to this function, as a floating point number, based on the Win32 function

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