From b77b0072222336711cb2277338ac6d62bd30613f Mon Sep 17 00:00:00 2001
From: Derick Rethans <derick@php.net>
Date: Tue, 19 Apr 2016 09:05:50 +0000
Subject: [PATCH] Updated to version 2016.4 (2016d)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@339032 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/datetime/timezones.xml | 718 ++++++++++++++++---------------
 1 file changed, 363 insertions(+), 355 deletions(-)

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