diff options
| author | Chris Kerr <cjk34@cam.ac.uk> | 2013-11-12 19:55:56 +0000 |
|---|---|---|
| committer | Chris Kerr <cjk34@cam.ac.uk> | 2013-11-12 19:55:56 +0000 |
| commit | 1a1a757b9165094e25d90985affdb8ddd16551b4 (patch) | |
| tree | d2b0e08ccf46eb23cfec6eb940024e03acfe9848 | |
| parent | 2f348892a3a1b7174decf5d206eead59491596a8 (diff) | |
| download | numpy-1a1a757b9165094e25d90985affdb8ddd16551b4.tar.gz | |
spelling: AC -> AD in years
(could also use BCE and CE to be more politically correct)
| -rw-r--r-- | doc/neps/datetime-proposal.rst | 28 | ||||
| -rw-r--r-- | doc/neps/datetime-proposal3.rst | 24 |
2 files changed, 26 insertions, 26 deletions
diff --git a/doc/neps/datetime-proposal.rst b/doc/neps/datetime-proposal.rst index 1e4087fd9..f8e67340c 100644 --- a/doc/neps/datetime-proposal.rst +++ b/doc/neps/datetime-proposal.rst @@ -66,20 +66,20 @@ table: ------------------------- ----------------------- -------------------------- Code Meaning Relative Time Absolute Time ======== ================ ======================= ========================== - Y year +- 9.2e18 years [9.2e18 BC, 9.2e18 AC] - M month +- 7.6e17 years [7.6e17 BC, 7.6e17 AC] - W week +- 1.7e17 years [1.7e17 BC, 1.7e17 AC] - B business day +- 3.5e16 years [3.5e16 BC, 3.5e16 AC] - D day +- 2.5e16 years [2.5e16 BC, 2.5e16 AC] - h hour +- 1.0e15 years [1.0e15 BC, 1.0e15 AC] - m minute +- 1.7e13 years [1.7e13 BC, 1.7e13 AC] - s second +- 2.9e12 years [ 2.9e9 BC, 2.9e9 AC] - ms millisecond +- 2.9e9 years [ 2.9e6 BC, 2.9e6 AC] - us microsecond +- 2.9e6 years [290301 BC, 294241 AC] - ns nanosecond +- 292 years [ 1678 AC, 2262 AC] - ps picosecond +- 106 days [ 1969 AC, 1970 AC] - fs femtosecond +- 2.6 hours [ 1969 AC, 1970 AC] - as attosecond +- 9.2 seconds [ 1969 AC, 1970 AC] + Y year +- 9.2e18 years [9.2e18 BC, 9.2e18 AD] + M month +- 7.6e17 years [7.6e17 BC, 7.6e17 AD] + W week +- 1.7e17 years [1.7e17 BC, 1.7e17 AD] + B business day +- 3.5e16 years [3.5e16 BC, 3.5e16 AD] + D day +- 2.5e16 years [2.5e16 BC, 2.5e16 AD] + 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] + 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] + as attosecond +- 9.2 seconds [ 1969 AD, 1970 AD] ======== ================ ======================= ========================== A time unit is specified by a string consisting of a base-type given in diff --git a/doc/neps/datetime-proposal3.rst b/doc/neps/datetime-proposal3.rst index 706085f99..fcfb39e54 100644 --- a/doc/neps/datetime-proposal3.rst +++ b/doc/neps/datetime-proposal3.rst @@ -67,18 +67,18 @@ corresponding time spans. ------------------------- -------------------------- Code Meaning ======== ================ ========================== - Y year [9.2e18 BC, 9.2e18 AC] - M month [7.6e17 BC, 7.6e17 AC] - W week [1.7e17 BC, 1.7e17 AC] - B business day [3.5e16 BC, 3.5e16 AC] - D day [2.5e16 BC, 2.5e16 AC] - h hour [1.0e15 BC, 1.0e15 AC] - m minute [1.7e13 BC, 1.7e13 AC] - s second [ 2.9e9 BC, 2.9e9 AC] - ms millisecond [ 2.9e6 BC, 2.9e6 AC] - us microsecond [290301 BC, 294241 AC] - c# ticks (100ns) [ 2757 BC, 31197 AC] - ns nanosecond [ 1678 AC, 2262 AC] + Y year [9.2e18 BC, 9.2e18 AD] + M month [7.6e17 BC, 7.6e17 AD] + W week [1.7e17 BC, 1.7e17 AD] + B business day [3.5e16 BC, 3.5e16 AD] + D day [2.5e16 BC, 2.5e16 AD] + h hour [1.0e15 BC, 1.0e15 AD] + m minute [1.7e13 BC, 1.7e13 AD] + s second [ 2.9e9 BC, 2.9e9 AD] + ms millisecond [ 2.9e6 BC, 2.9e6 AD] + us microsecond [290301 BC, 294241 AD] + c# ticks (100ns) [ 2757 BC, 31197 AD] + ns nanosecond [ 1678 AD, 2262 AD] ======== ================ ========================== The value of an absolute date is thus *an integer number of units of the |