diff --git a/reference/datetime/timezones.xml b/reference/datetime/timezones.xml
index 7e50e3d551..c3749c0654 100644
--- a/reference/datetime/timezones.xml
+++ b/reference/datetime/timezones.xml
@@ -12,6 +12,269 @@
+
+ &date.timezone.;
+
+ &date.timezone.;
+
+
+
+ Africa/Asmera
+ Africa/Timbuktu
+ America/Argentina/ComodRivadavia
+ America/Atka
+
+
+ America/Buenos_Aires
+ America/Catamarca
+ America/Coral_Harbour
+ America/Cordoba
+
+
+ America/Ensenada
+ America/Fort_Wayne
+ America/Indianapolis
+ America/Jujuy
+
+
+ America/Knox_IN
+ America/Louisville
+ America/Mendoza
+ America/Montreal
+
+
+ America/Porto_Acre
+ America/Rosario
+ America/Santa_Isabel
+ America/Shiprock
+
+
+ America/Virgin
+ Antarctica/South_Pole
+ Asia/Ashkhabad
+ Asia/Calcutta
+
+
+ Asia/Chongqing
+ Asia/Chungking
+ Asia/Dacca
+ Asia/Harbin
+
+
+ Asia/Istanbul
+ Asia/Kashgar
+ Asia/Katmandu
+ Asia/Macao
+
+
+ Asia/Saigon
+ Asia/Tel_Aviv
+ Asia/Thimbu
+ Asia/Ujung_Pandang
+
+
+ Asia/Ulan_Bator
+ Atlantic/Faeroe
+ Atlantic/Jan_Mayen
+ Australia/ACT
+
+
+ Australia/Canberra
+ Australia/LHI
+ Australia/North
+ Australia/NSW
+
+
+ Australia/Queensland
+ Australia/South
+ Australia/Tasmania
+ Australia/Victoria
+
+
+ Australia/West
+ Australia/Yancowinna
+ Brazil/Acre
+ Brazil/DeNoronha
+
+
+ Brazil/East
+ Brazil/West
+ Canada/Atlantic
+ Canada/Central
+
+
+ Canada/East-Saskatchewan
+ Canada/Eastern
+ Canada/Mountain
+ Canada/Newfoundland
+
+
+ Canada/Pacific
+ Canada/Saskatchewan
+ Canada/Yukon
+ CET
+
+
+ Chile/Continental
+ Chile/EasterIsland
+ CST6CDT
+ Cuba
+
+
+ EET
+ Egypt
+ Eire
+ EST
+
+
+ EST5EDT
+ Etc/GMT
+ Etc/GMT+0
+ Etc/GMT+1
+
+
+ Etc/GMT+10
+ Etc/GMT+11
+ Etc/GMT+12
+ Etc/GMT+2
+
+
+ Etc/GMT+3
+ Etc/GMT+4
+ Etc/GMT+5
+ Etc/GMT+6
+
+
+ Etc/GMT+7
+ Etc/GMT+8
+ Etc/GMT+9
+ Etc/GMT-0
+
+
+ Etc/GMT-1
+ Etc/GMT-10
+ Etc/GMT-11
+ Etc/GMT-12
+
+
+ Etc/GMT-13
+ Etc/GMT-14
+ Etc/GMT-2
+ Etc/GMT-3
+
+
+ Etc/GMT-4
+ Etc/GMT-5
+ Etc/GMT-6
+ Etc/GMT-7
+
+
+ Etc/GMT-8
+ Etc/GMT-9
+ Etc/GMT0
+ Etc/Greenwich
+
+
+ Etc/UCT
+ Etc/Universal
+ Etc/UTC
+ Etc/Zulu
+
+
+ Europe/Belfast
+ Europe/Nicosia
+ Europe/Tiraspol
+ Factory
+
+
+ GB
+ GB-Eire
+ GMT
+ GMT+0
+
+
+ GMT-0
+ GMT0
+ Greenwich
+ Hongkong
+
+
+ HST
+ Iceland
+ Iran
+ Israel
+
+
+ Jamaica
+ Japan
+ Kwajalein
+ Libya
+
+
+ MET
+ Mexico/BajaNorte
+ Mexico/BajaSur
+ Mexico/General
+
+
+ MST
+ MST7MDT
+ Navajo
+ NZ
+
+
+ NZ-CHAT
+ Pacific/Ponape
+ Pacific/Samoa
+ Pacific/Truk
+
+
+ Pacific/Yap
+ Poland
+ Portugal
+ PRC
+
+
+ PST8PDT
+ ROC
+ ROK
+ Singapore
+
+
+ Turkey
+ UCT
+ Universal
+ US/Alaska
+
+
+ US/Aleutian
+ US/Arizona
+ US/Central
+ US/East-Indiana
+
+
+ US/Eastern
+ US/Hawaii
+ US/Indiana-Starke
+ US/Michigan
+
+
+ US/Mountain
+ US/Pacific
+ US/Pacific-New
+ US/Samoa
+
+
+ W-SU
+ WET
+ Zulu
+
+
+
+
+
+
+
&date.timezone.africa;
@@ -26,81 +289,75 @@
Africa/Asmara
- Africa/Asmera
Africa/Bamako
Africa/Bangui
+ Africa/Banjul
- Africa/Banjul
Africa/Bissau
Africa/Blantyre
Africa/Brazzaville
+ Africa/Bujumbura
- Africa/Bujumbura
Africa/Cairo
Africa/Casablanca
Africa/Ceuta
+ Africa/Conakry
- Africa/Conakry
Africa/Dakar
Africa/Dar_es_Salaam
Africa/Djibouti
+ Africa/Douala
- Africa/Douala
Africa/El_Aaiun
Africa/Freetown
Africa/Gaborone
+ Africa/Harare
- Africa/Harare
Africa/Johannesburg
Africa/Juba
Africa/Kampala
+ Africa/Khartoum
- Africa/Khartoum
Africa/Kigali
Africa/Kinshasa
Africa/Lagos
+ Africa/Libreville
- Africa/Libreville
Africa/Lome
Africa/Luanda
Africa/Lubumbashi
+ Africa/Lusaka
- Africa/Lusaka
Africa/Malabo
Africa/Maputo
Africa/Maseru
+ Africa/Mbabane
- Africa/Mbabane
Africa/Mogadishu
Africa/Monrovia
Africa/Nairobi
+ Africa/Ndjamena
- Africa/Ndjamena
Africa/Niamey
Africa/Nouakchott
Africa/Ouagadougou
-
-
Africa/Porto-Novo
- Africa/Sao_Tome
- Africa/Timbuktu
- Africa/Tripoli
+ Africa/Sao_Tome
+ Africa/Tripoli
Africa/Tunis
Africa/Windhoek
-
-
@@ -123,84 +380,72 @@
America/Araguaina
America/Argentina/Buenos_Aires
America/Argentina/Catamarca
- America/Argentina/ComodRivadavia
+ America/Argentina/Cordoba
- America/Argentina/Cordoba
America/Argentina/Jujuy
America/Argentina/La_Rioja
America/Argentina/Mendoza
+ America/Argentina/Rio_Gallegos
- America/Argentina/Rio_Gallegos
America/Argentina/Salta
America/Argentina/San_Juan
America/Argentina/San_Luis
+ America/Argentina/Tucuman
- America/Argentina/Tucuman
America/Argentina/Ushuaia
America/Aruba
America/Asuncion
+ America/Atikokan
- America/Atikokan
- America/Atka
America/Bahia
America/Bahia_Banderas
-
-
America/Barbados
America/Belem
+
+
America/Belize
America/Blanc-Sablon
-
-
America/Boa_Vista
America/Bogota
- America/Boise
- America/Buenos_Aires
+ America/Boise
America/Cambridge_Bay
America/Campo_Grande
America/Cancun
- America/Caracas
- America/Catamarca
+ America/Caracas
America/Cayenne
America/Cayman
America/Chicago
America/Chihuahua
- America/Coral_Harbour
- America/Cordoba
America/Costa_Rica
-
-
America/Creston
America/Cuiaba
+
+
America/Curacao
America/Danmarkshavn
-
-
America/Dawson
America/Dawson_Creek
+
+
America/Denver
America/Detroit
-
-
America/Dominica
America/Edmonton
- America/Eirunepe
- America/El_Salvador
- America/Ensenada
+ America/Eirunepe
+ America/El_Salvador
America/Fort_Nelson
- America/Fort_Wayne
America/Fortaleza
@@ -234,26 +479,20 @@
America/Indiana/Winamac
- America/Indianapolis
America/Inuvik
America/Iqaluit
America/Jamaica
+ America/Juneau
- America/Jujuy
- America/Juneau
America/Kentucky/Louisville
America/Kentucky/Monticello
-
-
- America/Knox_IN
America/Kralendijk
America/La_Paz
- America/Lima
+ America/Lima
America/Los_Angeles
- America/Louisville
America/Lower_Princes
America/Maceio
@@ -266,104 +505,92 @@
America/Matamoros
America/Mazatlan
- America/Mendoza
America/Menominee
+ America/Merida
- America/Merida
America/Metlakatla
America/Mexico_City
America/Miquelon
+ America/Moncton
- America/Moncton
America/Monterrey
America/Montevideo
- America/Montreal
-
-
America/Montserrat
America/Nassau
+
+
America/New_York
America/Nipigon
-
-
America/Nome
America/Noronha
+
+
America/North_Dakota/Beulah
America/North_Dakota/Center
-
-
America/North_Dakota/New_Salem
America/Ojinaga
+
+
America/Panama
America/Pangnirtung
-
-
America/Paramaribo
America/Phoenix
+
+
America/Port-au-Prince
America/Port_of_Spain
-
-
- America/Porto_Acre
America/Porto_Velho
America/Puerto_Rico
- America/Rainy_River
+ America/Rainy_River
America/Rankin_Inlet
America/Recife
America/Regina
+
+
America/Resolute
-
-
America/Rio_Branco
- America/Rosario
- America/Santa_Isabel
America/Santarem
+ America/Santiago
- America/Santiago
America/Santo_Domingo
America/Sao_Paulo
America/Scoresbysund
+ America/Sitka
- America/Shiprock
- America/Sitka
America/St_Barthelemy
America/St_Johns
-
-
America/St_Kitts
America/St_Lucia
+
+
America/St_Thomas
America/St_Vincent
-
-
America/Swift_Current
America/Tegucigalpa
+
+
America/Thule
America/Thunder_Bay
-
-
America/Tijuana
America/Toronto
+
+
America/Tortola
America/Vancouver
-
-
- America/Virgin
America/Whitehorse
America/Winnipeg
- America/Yakutat
+ America/Yakutat
America/Yellowknife
-
@@ -389,10 +616,10 @@
Antarctica/Rothera
- Antarctica/South_Pole
Antarctica/Syowa
Antarctica/Troll
Antarctica/Vostok
+
@@ -429,139 +656,115 @@
Asia/Aqtau
Asia/Aqtobe
Asia/Ashgabat
- Asia/Ashkhabad
+ Asia/Baghdad
- Asia/Baghdad
Asia/Bahrain
Asia/Baku
Asia/Bangkok
+ Asia/Barnaul
- Asia/Barnaul
Asia/Beirut
Asia/Bishkek
Asia/Brunei
-
-
- Asia/Calcutta
Asia/Chita
+
+
Asia/Choibalsan
- Asia/Chongqing
-
-
- Asia/Chungking
Asia/Colombo
- Asia/Dacca
Asia/Damascus
+ Asia/Dhaka
- Asia/Dhaka
Asia/Dili
Asia/Dubai
Asia/Dushanbe
+ Asia/Gaza
- Asia/Gaza
- Asia/Harbin
Asia/Hebron
Asia/Ho_Chi_Minh
-
-
Asia/Hong_Kong
Asia/Hovd
- Asia/Irkutsk
- Asia/Istanbul
+ Asia/Irkutsk
Asia/Jakarta
Asia/Jayapura
Asia/Jerusalem
- Asia/Kabul
+ Asia/Kabul
Asia/Kamchatka
Asia/Karachi
- Asia/Kashgar
Asia/Kathmandu
- Asia/Katmandu
Asia/Khandyga
Asia/Kolkata
Asia/Krasnoyarsk
+ Asia/Kuala_Lumpur
- Asia/Kuala_Lumpur
Asia/Kuching
Asia/Kuwait
- Asia/Macao
-
-
Asia/Macau
Asia/Magadan
+
+
Asia/Makassar
Asia/Manila
-
-
Asia/Muscat
Asia/Nicosia
+
+
Asia/Novokuznetsk
Asia/Novosibirsk
-
-
Asia/Omsk
Asia/Oral
+
+
Asia/Phnom_Penh
Asia/Pontianak
-
-
Asia/Pyongyang
Asia/Qatar
+
+
Asia/Qyzylorda
Asia/Rangoon
-
-
Asia/Riyadh
- Asia/Saigon
Asia/Sakhalin
- Asia/Samarkand
+ Asia/Samarkand
Asia/Seoul
Asia/Shanghai
Asia/Singapore
- Asia/Srednekolymsk
+ Asia/Srednekolymsk
Asia/Taipei
Asia/Tashkent
Asia/Tbilisi
- Asia/Tehran
- Asia/Tel_Aviv
- Asia/Thimbu
+ Asia/Tehran
Asia/Thimphu
Asia/Tokyo
-
-
Asia/Tomsk
- Asia/Ujung_Pandang
- Asia/Ulaanbaatar
- Asia/Ulan_Bator
+ Asia/Ulaanbaatar
Asia/Urumqi
Asia/Ust-Nera
Asia/Vientiane
- Asia/Vladivostok
+ Asia/Vladivostok
Asia/Yakutsk
Asia/Yekaterinburg
Asia/Yerevan
-
@@ -581,16 +784,16 @@
Atlantic/Cape_Verde
- Atlantic/Faeroe
Atlantic/Faroe
- Atlantic/Jan_Mayen
Atlantic/Madeira
-
-
Atlantic/Reykjavik
Atlantic/South_Georgia
+
+
Atlantic/St_Helena
Atlantic/Stanley
+
+
@@ -604,40 +807,22 @@
- Australia/ACT
Australia/Adelaide
Australia/Brisbane
Australia/Broken_Hill
+ Australia/Currie
- Australia/Canberra
- Australia/Currie
Australia/Darwin
Australia/Eucla
-
-
Australia/Hobart
- Australia/LHI
Australia/Lindeman
+
+
Australia/Lord_Howe
-
-
Australia/Melbourne
- Australia/North
- Australia/NSW
Australia/Perth
-
-
- Australia/Queensland
- Australia/South
Australia/Sydney
- Australia/Tasmania
-
-
- Australia/Victoria
- Australia/West
- Australia/Yancowinna
-
@@ -657,94 +842,88 @@
Europe/Athens
- Europe/Belfast
Europe/Belgrade
Europe/Berlin
Europe/Bratislava
+ Europe/Brussels
- Europe/Brussels
Europe/Bucharest
Europe/Budapest
Europe/Busingen
+ Europe/Chisinau
- Europe/Chisinau
Europe/Copenhagen
Europe/Dublin
Europe/Gibraltar
+ Europe/Guernsey
- Europe/Guernsey
Europe/Helsinki
Europe/Isle_of_Man
Europe/Istanbul
+ Europe/Jersey
- Europe/Jersey
Europe/Kaliningrad
Europe/Kiev
Europe/Kirov
+ Europe/Lisbon
- Europe/Lisbon
Europe/Ljubljana
Europe/London
Europe/Luxembourg
+ Europe/Madrid
- Europe/Madrid
Europe/Malta
Europe/Mariehamn
Europe/Minsk
-
-
Europe/Monaco
- Europe/Moscow
- Europe/Nicosia
- Europe/Oslo
+ Europe/Moscow
+ Europe/Oslo
Europe/Paris
Europe/Podgorica
+
+
Europe/Prague
Europe/Riga
-
-
Europe/Rome
Europe/Samara
+
+
Europe/San_Marino
Europe/Sarajevo
-
-
Europe/Simferopol
Europe/Skopje
+
+
Europe/Sofia
Europe/Stockholm
-
-
Europe/Tallinn
Europe/Tirane
- Europe/Tiraspol
- Europe/Ulyanovsk
+ Europe/Ulyanovsk
Europe/Uzhgorod
Europe/Vaduz
Europe/Vatican
- Europe/Vienna
+ Europe/Vienna
Europe/Vilnius
Europe/Volgograd
Europe/Warsaw
- Europe/Zagreb
+ Europe/Zagreb
Europe/Zaporozhye
Europe/Zurich
-
@@ -832,24 +1011,18 @@
Pacific/Palau
Pacific/Pitcairn
Pacific/Pohnpei
- Pacific/Ponape
+ Pacific/Port_Moresby
- Pacific/Port_Moresby
Pacific/Rarotonga
Pacific/Saipan
- Pacific/Samoa
-
-
Pacific/Tahiti
Pacific/Tarawa
- Pacific/Tongatapu
- Pacific/Truk
+ Pacific/Tongatapu
Pacific/Wake
Pacific/Wallis
- Pacific/Yap
@@ -861,176 +1034,11 @@
&date.timezone.others;
&date.timezone.others;
-
+
- Brazil/Acre
- Brazil/DeNoronha
- Brazil/East
- Brazil/West
-
-
- Canada/Atlantic
- Canada/Central
- Canada/East-Saskatchewan
- Canada/Eastern
-
-
- Canada/Mountain
- Canada/Newfoundland
- Canada/Pacific
- Canada/Saskatchewan
-
-
- Canada/Yukon
- CET
- Chile/Continental
- Chile/EasterIsland
-
-
- CST6CDT
- Cuba
- EET
- Egypt
-
-
- Eire
- EST
- EST5EDT
- Etc/GMT
-
-
- Etc/GMT+0
- Etc/GMT+1
- Etc/GMT+10
- Etc/GMT+11
-
-
- Etc/GMT+12
- Etc/GMT+2
- Etc/GMT+3
- Etc/GMT+4
-
-
- Etc/GMT+5
- Etc/GMT+6
- Etc/GMT+7
- Etc/GMT+8
-
-
- Etc/GMT+9
- Etc/GMT-0
- Etc/GMT-1
- Etc/GMT-10
-
-
- Etc/GMT-11
- Etc/GMT-12
- Etc/GMT-13
- Etc/GMT-14
-
-
- Etc/GMT-2
- Etc/GMT-3
- Etc/GMT-4
- Etc/GMT-5
-
-
- Etc/GMT-6
- Etc/GMT-7
- Etc/GMT-8
- Etc/GMT-9
-
-
- Etc/GMT0
- Etc/Greenwich
- Etc/UCT
- Etc/Universal
-
-
- Etc/UTC
- Etc/Zulu
- Factory
- GB
-
-
- GB-Eire
- GMT
- GMT+0
- GMT-0
-
-
- GMT0
- Greenwich
- Hongkong
- HST
-
-
- Iceland
- Iran
- Israel
- Jamaica
-
-
- Japan
- Kwajalein
- Libya
- MET
-
-
- Mexico/BajaNorte
- Mexico/BajaSur
- Mexico/General
- MST
-
-
- MST7MDT
- Navajo
- NZ
- NZ-CHAT
-
-
- Poland
- Portugal
- PRC
- PST8PDT
-
-
- ROC
- ROK
- Singapore
- Turkey
-
-
- UCT
- Universal
- US/Alaska
- US/Aleutian
-
-
- US/Arizona
- US/Central
- US/East-Indiana
- US/Eastern
-
-
- US/Hawaii
- US/Indiana-Starke
- US/Michigan
- US/Mountain
-
-
- US/Pacific
- US/Pacific-New
- US/Samoa
UTC
-
- W-SU
- WET
- Zulu
-
-