[Python-checkins] cpython (merge 3.2 -> default): Merge #12758: removing confusing mention of UTC from time.time description

[r.david.murray]

http://hg.python.org/cpython/rev/f18767bb66ba
changeset:   75691:f18767bb66ba
parent:      75688:d8ba959a547b
parent:      75690:5615d6b91b53
user:        R David Murray <rdmurray at bitdance.com>
date:        Thu Mar 15 03:09:53 2012 -0400
summary:
  Merge #12758: removing confusing mention of UTC from time.time description

Patch by Dylan Sarber.

(Not sure why hg told me it merged pyexpat.c too, it showed no changes)

files:
  Doc/library/time.rst |  4 ++--
  1 files changed, 2 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
@@ -452,8 +452,8 @@
 
 .. function:: time()
 
-   Return the time as a floating point number expressed in seconds since the epoch,
-   in UTC.  Note that even though the time is always returned as a floating point
+   Return the time in seconds since the epoch as a floating point number.
+   Note that even though the time is always returned as a floating point
    number, not all systems provide time with a better precision than 1 second.
    While this function normally returns non-decreasing values, it can return a
    lower value than a previous call if the system clock has been set back between

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