summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorbadhrink <badhrinarayanan.k@gmail.com>2016-06-10 16:11:47 -0500
committerGitHub <noreply@github.com>2016-06-10 16:11:47 -0500
commit24ee6b3541501e9fadd57f67c23e392f8280593e (patch)
tree648771b35f179fad8395d6109e1bcfd64f5e14ec /doc
parent5056c4cef5a320b2f30f5d89175e95eb4184dab1 (diff)
downloadnumpy-24ee6b3541501e9fadd57f67c23e392f8280593e.tar.gz
DOC: Corrections in Datetime Units-arrays.datetime.rst
Changed/corrected Time span - relative and absolute - for second, millisecond and microsecond. There were slight differences and was noted duly in the issue. See #6711 (https://github.com/numpy/numpy/issues/6711)
Diffstat (limited to 'doc')
-rw-r--r--doc/source/reference/arrays.datetime.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/reference/arrays.datetime.rst b/doc/source/reference/arrays.datetime.rst
index f5b454875..cbc696ae8 100644
--- a/doc/source/reference/arrays.datetime.rst
+++ b/doc/source/reference/arrays.datetime.rst
@@ -177,9 +177,9 @@ And here are the time units:
======== ================ ======================= ==========================
h hour +/- 1.0e15 years [1.0e15 BC, 1.0e15 AD]
m minute +/- 1.7e13 years [1.7e13 BC, 1.7e13 AD]
- s second +/- 2.9e12 years [ 2.9e9 BC, 2.9e9 AD]
- ms millisecond +/- 2.9e9 years [ 2.9e6 BC, 2.9e6 AD]
- us microsecond +/- 2.9e6 years [290301 BC, 294241 AD]
+ s second +/- 2.9e11 years [2.9e11 BC, 2.9e11 AD]
+ ms millisecond +/- 2.9e8 years [ 2.9e8 BC, 2.9e8 AD]
+ us microsecond +/- 2.9e5 years [290301 BC, 294241 AD]
ns nanosecond +/- 292 years [ 1678 AD, 2262 AD]
ps picosecond +/- 106 days [ 1969 AD, 1970 AD]
fs femtosecond +/- 2.6 hours [ 1969 AD, 1970 AD]