diff options
| author | Eric Roberts <eric@cryode.com> | 2013-07-16 23:16:52 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2013-07-16 23:16:52 +0200 |
| commit | c3db9cb2b19a61f51f62a6fa3265ef3226aad69f (patch) | |
| tree | 938820118a406b170094c57a9073827f034c07a8 /user_guide_src/source/helpers/date_helper.rst | |
| parent | 70a9a28321c5226d597bb87319524747e714b133 (diff) | |
| parent | ae0cc3e868b1708067df22932c09874033a34be9 (diff) | |
Merge branch 'refs/heads/develop' into update/changelog
Conflicts:
user_guide_src/source/changelog.rst
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrade_214.rst
Diffstat (limited to 'user_guide_src/source/helpers/date_helper.rst')
| -rw-r--r-- | user_guide_src/source/helpers/date_helper.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst index 3a3454edc..5dfee8b48 100644 --- a/user_guide_src/source/helpers/date_helper.rst +++ b/user_guide_src/source/helpers/date_helper.rst @@ -414,9 +414,9 @@ Note some of the location lists have been abridged for clarity and formatting. =========== ===================================================================== Time Zone Location =========== ===================================================================== -UM2 (UTC - 12:00) Baker/Howland Island -UM1 (UTC - 11:00) Samoa Time Zone, Niue -UM0 (UTC - 10:00) Hawaii-Aleutian Standard Time, Cook Islands +UM12 (UTC - 12:00) Baker/Howland Island +UM11 (UTC - 11:00) Samoa Time Zone, Niue +UM10 (UTC - 10:00) Hawaii-Aleutian Standard Time, Cook Islands UM95 (UTC - 09:30) Marquesas Islands UM9 (UTC - 09:00) Alaska Standard Time, Gambier Islands UM8 (UTC - 08:00) Pacific Standard Time, Clipperton Island @@ -428,7 +428,7 @@ UM4 (UTC - 04:00) Atlantic Standard Time, Eastern Caribbean UM35 (UTC - 03:30) Newfoundland Standard Time UM3 (UTC - 03:00) Argentina, Brazil, French Guiana, Uruguay UM2 (UTC - 02:00) South Georgia/South Sandwich Islands -UM (UTC -1:00) Azores, Cape Verde Islands +UM1 (UTC -1:00) Azores, Cape Verde Islands UTC (UTC) Greenwich Mean Time, Western European Time UP1 (UTC +1:00) Central European Time, West Africa Time UP2 (UTC +2:00) Central Africa Time, Eastern European Time @@ -452,6 +452,6 @@ UP11 (UTC +11:00) Magadan Time, Solomon Islands, Vanuatu UP115 (UTC +11:30) Norfolk Island UP12 (UTC +12:00) Fiji, Gilbert Islands, Kamchatka, New Zealand UP1275 (UTC +12:45) Chatham Islands Standard Time -UP1 (UTC +13:00) Phoenix Islands Time, Tonga +UP13 (UTC +13:00) Phoenix Islands Time, Tonga UP14 (UTC +14:00) Line Islands =========== =====================================================================
\ No newline at end of file |