From bd31f42a6011ef98922f0743394d08f60ebe50a3 Mon Sep 17 00:00:00 2001
From: Derick Rethans <derick@php.net>
Date: Sun, 9 Oct 2005 12:29:40 +0000
Subject: [PATCH] - Six columns was too wide.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@197977 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/timezones.xml | 270 ++++++++++++++++++++++-----------------
 1 file changed, 153 insertions(+), 117 deletions(-)

diff --git a/appendices/timezones.xml b/appendices/timezones.xml
index 71ea9bdb65..3da41a02ae 100644
--- a/appendices/timezones.xml
+++ b/appendices/timezones.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- AUTO GENERATED, DO NOT MODIFY BY HAND -->
 
 <appendix id="timezones">
@@ -11,7 +11,7 @@
   <title>List of timezones in the group Africa</title>
   <table>
    <title>Africa</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>Africa/Abidjan</entry>
@@ -19,34 +19,36 @@
       <entry>Africa/Addis_Ababa</entry>
       <entry>Africa/Algiers</entry>
       <entry>Africa/Asmera</entry>
-      <entry>Africa/Bamako</entry>
      </row>
      <row>
+      <entry>Africa/Bamako</entry>
       <entry>Africa/Bangui</entry>
       <entry>Africa/Banjul</entry>
       <entry>Africa/Bissau</entry>
       <entry>Africa/Blantyre</entry>
-      <entry>Africa/Brazzaville</entry>
-      <entry>Africa/Bujumbura</entry>
      </row>
      <row>
+      <entry>Africa/Brazzaville</entry>
+      <entry>Africa/Bujumbura</entry>
       <entry>Africa/Cairo</entry>
       <entry>Africa/Casablanca</entry>
       <entry>Africa/Ceuta</entry>
+     </row>
+     <row>
       <entry>Africa/Conakry</entry>
       <entry>Africa/Dakar</entry>
       <entry>Africa/Dar_es_Salaam</entry>
-     </row>
-     <row>
       <entry>Africa/Djibouti</entry>
       <entry>Africa/Douala</entry>
+     </row>
+     <row>
       <entry>Africa/El_Aaiun</entry>
       <entry>Africa/Freetown</entry>
       <entry>Africa/Gaborone</entry>
       <entry>Africa/Harare</entry>
+      <entry>Africa/Johannesburg</entry>
      </row>
      <row>
-      <entry>Africa/Johannesburg</entry>
       <entry>Africa/Kampala</entry>
       <entry>Africa/Khartoum</entry>
       <entry>Africa/Kigali</entry>
@@ -59,27 +61,29 @@
       <entry>Africa/Luanda</entry>
       <entry>Africa/Lubumbashi</entry>
       <entry>Africa/Lusaka</entry>
-      <entry>Africa/Malabo</entry>
      </row>
      <row>
+      <entry>Africa/Malabo</entry>
       <entry>Africa/Maputo</entry>
       <entry>Africa/Maseru</entry>
       <entry>Africa/Mbabane</entry>
       <entry>Africa/Mogadishu</entry>
-      <entry>Africa/Monrovia</entry>
-      <entry>Africa/Nairobi</entry>
      </row>
      <row>
+      <entry>Africa/Monrovia</entry>
+      <entry>Africa/Nairobi</entry>
       <entry>Africa/Ndjamena</entry>
       <entry>Africa/Niamey</entry>
       <entry>Africa/Nouakchott</entry>
+     </row>
+     <row>
       <entry>Africa/Ouagadougou</entry>
       <entry>Africa/Porto-Novo</entry>
       <entry>Africa/Sao_Tome</entry>
-     </row>
-     <row>
       <entry>Africa/Timbuktu</entry>
       <entry>Africa/Tripoli</entry>
+     </row>
+     <row>
       <entry>Africa/Tunis</entry>
       <entry>Africa/Windhoek</entry>
      </row>
@@ -92,7 +96,7 @@
   <title>List of timezones in the group America</title>
   <table>
    <title>America</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>America/Adak</entry>
@@ -100,34 +104,36 @@
       <entry>America/Anguilla</entry>
       <entry>America/Antigua</entry>
       <entry>America/Araguaina</entry>
-      <entry>America/Argentina/Buenos_Aires</entry>
      </row>
      <row>
+      <entry>America/Argentina/Buenos_Aires</entry>
       <entry>America/Argentina/Catamarca</entry>
       <entry>America/Argentina/ComodRivadavia</entry>
       <entry>America/Argentina/Cordoba</entry>
       <entry>America/Argentina/Jujuy</entry>
-      <entry>America/Argentina/La_Rioja</entry>
-      <entry>America/Argentina/Mendoza</entry>
      </row>
      <row>
+      <entry>America/Argentina/La_Rioja</entry>
+      <entry>America/Argentina/Mendoza</entry>
       <entry>America/Argentina/Rio_Gallegos</entry>
       <entry>America/Argentina/San_Juan</entry>
       <entry>America/Argentina/Tucuman</entry>
+     </row>
+     <row>
       <entry>America/Argentina/Ushuaia</entry>
       <entry>America/Aruba</entry>
       <entry>America/Asuncion</entry>
-     </row>
-     <row>
       <entry>America/Atka</entry>
       <entry>America/Bahia</entry>
+     </row>
+     <row>
       <entry>America/Barbados</entry>
       <entry>America/Belem</entry>
       <entry>America/Belize</entry>
       <entry>America/Boa_Vista</entry>
+      <entry>America/Bogota</entry>
      </row>
      <row>
-      <entry>America/Bogota</entry>
       <entry>America/Boise</entry>
       <entry>America/Buenos_Aires</entry>
       <entry>America/Cambridge_Bay</entry>
@@ -140,34 +146,36 @@
       <entry>America/Cayenne</entry>
       <entry>America/Cayman</entry>
       <entry>America/Chicago</entry>
-      <entry>America/Chihuahua</entry>
      </row>
      <row>
+      <entry>America/Chihuahua</entry>
       <entry>America/Coral_Harbour</entry>
       <entry>America/Cordoba</entry>
       <entry>America/Costa_Rica</entry>
       <entry>America/Cuiaba</entry>
-      <entry>America/Curacao</entry>
-      <entry>America/Danmarkshavn</entry>
      </row>
      <row>
+      <entry>America/Curacao</entry>
+      <entry>America/Danmarkshavn</entry>
       <entry>America/Dawson</entry>
       <entry>America/Dawson_Creek</entry>
       <entry>America/Denver</entry>
+     </row>
+     <row>
       <entry>America/Detroit</entry>
       <entry>America/Dominica</entry>
       <entry>America/Edmonton</entry>
-     </row>
-     <row>
       <entry>America/Eirunepe</entry>
       <entry>America/El_Salvador</entry>
+     </row>
+     <row>
       <entry>America/Ensenada</entry>
       <entry>America/Fort_Wayne</entry>
       <entry>America/Fortaleza</entry>
       <entry>America/Glace_Bay</entry>
+      <entry>America/Godthab</entry>
      </row>
      <row>
-      <entry>America/Godthab</entry>
       <entry>America/Goose_Bay</entry>
       <entry>America/Grand_Turk</entry>
       <entry>America/Grenada</entry>
@@ -180,34 +188,36 @@
       <entry>America/Halifax</entry>
       <entry>America/Havana</entry>
       <entry>America/Hermosillo</entry>
-      <entry>America/Indiana/Indianapolis</entry>
      </row>
      <row>
+      <entry>America/Indiana/Indianapolis</entry>
       <entry>America/Indiana/Knox</entry>
       <entry>America/Indiana/Marengo</entry>
       <entry>America/Indiana/Vevay</entry>
       <entry>America/Indianapolis</entry>
-      <entry>America/Inuvik</entry>
-      <entry>America/Iqaluit</entry>
      </row>
      <row>
+      <entry>America/Inuvik</entry>
+      <entry>America/Iqaluit</entry>
       <entry>America/Jamaica</entry>
       <entry>America/Jujuy</entry>
       <entry>America/Juneau</entry>
+     </row>
+     <row>
       <entry>America/Kentucky/Louisville</entry>
       <entry>America/Kentucky/Monticello</entry>
       <entry>America/Knox_IN</entry>
-     </row>
-     <row>
       <entry>America/La_Paz</entry>
       <entry>America/Lima</entry>
+     </row>
+     <row>
       <entry>America/Los_Angeles</entry>
       <entry>America/Louisville</entry>
       <entry>America/Maceio</entry>
       <entry>America/Managua</entry>
+      <entry>America/Manaus</entry>
      </row>
      <row>
-      <entry>America/Manaus</entry>
       <entry>America/Martinique</entry>
       <entry>America/Mazatlan</entry>
       <entry>America/Mendoza</entry>
@@ -220,34 +230,36 @@
       <entry>America/Monterrey</entry>
       <entry>America/Montevideo</entry>
       <entry>America/Montreal</entry>
-      <entry>America/Montserrat</entry>
      </row>
      <row>
+      <entry>America/Montserrat</entry>
       <entry>America/Nassau</entry>
       <entry>America/New_York</entry>
       <entry>America/Nipigon</entry>
       <entry>America/Nome</entry>
-      <entry>America/Noronha</entry>
-      <entry>America/North_Dakota/Center</entry>
      </row>
      <row>
+      <entry>America/Noronha</entry>
+      <entry>America/North_Dakota/Center</entry>
       <entry>America/Panama</entry>
       <entry>America/Pangnirtung</entry>
       <entry>America/Paramaribo</entry>
+     </row>
+     <row>
       <entry>America/Phoenix</entry>
       <entry>America/Port-au-Prince</entry>
       <entry>America/Port_of_Spain</entry>
-     </row>
-     <row>
       <entry>America/Porto_Acre</entry>
       <entry>America/Porto_Velho</entry>
+     </row>
+     <row>
       <entry>America/Puerto_Rico</entry>
       <entry>America/Rainy_River</entry>
       <entry>America/Rankin_Inlet</entry>
       <entry>America/Recife</entry>
+      <entry>America/Regina</entry>
      </row>
      <row>
-      <entry>America/Regina</entry>
       <entry>America/Rio_Branco</entry>
       <entry>America/Rosario</entry>
       <entry>America/Santiago</entry>
@@ -260,34 +272,36 @@
       <entry>America/St_Johns</entry>
       <entry>America/St_Kitts</entry>
       <entry>America/St_Lucia</entry>
-      <entry>America/St_Thomas</entry>
      </row>
      <row>
+      <entry>America/St_Thomas</entry>
       <entry>America/St_Vincent</entry>
       <entry>America/Swift_Current</entry>
       <entry>America/Tegucigalpa</entry>
       <entry>America/Thule</entry>
-      <entry>America/Thunder_Bay</entry>
-      <entry>America/Tijuana</entry>
      </row>
      <row>
+      <entry>America/Thunder_Bay</entry>
+      <entry>America/Tijuana</entry>
       <entry>America/Toronto</entry>
       <entry>America/Tortola</entry>
       <entry>America/Vancouver</entry>
+     </row>
+     <row>
       <entry>America/Virgin</entry>
       <entry>America/Whitehorse</entry>
       <entry>America/Winnipeg</entry>
-     </row>
-     <row>
       <entry>America/Yakutat</entry>
       <entry>America/Yellowknife</entry>
+     </row>
+     <row>
       <entry>Brazil/Acre</entry>
       <entry>Brazil/DeNoronha</entry>
       <entry>Brazil/East</entry>
       <entry>Brazil/West</entry>
+      <entry>Canada/Atlantic</entry>
      </row>
      <row>
-      <entry>Canada/Atlantic</entry>
       <entry>Canada/Central</entry>
       <entry>Canada/East-Saskatchewan</entry>
       <entry>Canada/Eastern</entry>
@@ -300,27 +314,29 @@
       <entry>Canada/Yukon</entry>
       <entry>Chile/Continental</entry>
       <entry>Chile/EasterIsland</entry>
-      <entry>Mexico/BajaNorte</entry>
      </row>
      <row>
+      <entry>Mexico/BajaNorte</entry>
       <entry>Mexico/BajaSur</entry>
       <entry>Mexico/General</entry>
       <entry>US/Alaska</entry>
       <entry>US/Aleutian</entry>
-      <entry>US/Arizona</entry>
-      <entry>US/Central</entry>
      </row>
      <row>
+      <entry>US/Arizona</entry>
+      <entry>US/Central</entry>
       <entry>US/East-Indiana</entry>
       <entry>US/Eastern</entry>
       <entry>US/Hawaii</entry>
+     </row>
+     <row>
       <entry>US/Indiana-Starke</entry>
       <entry>US/Michigan</entry>
       <entry>US/Mountain</entry>
-     </row>
-     <row>
       <entry>US/Pacific</entry>
       <entry>US/Pacific-New</entry>
+     </row>
+     <row>
       <entry>US/Samoa</entry>
      </row>
     </tbody>
@@ -332,7 +348,7 @@
   <title>List of timezones in the group Antarctica</title>
   <table>
    <title>Antarctica</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>Antarctica/Casey</entry>
@@ -340,9 +356,9 @@
       <entry>Antarctica/DumontDUrville</entry>
       <entry>Antarctica/Mawson</entry>
       <entry>Antarctica/McMurdo</entry>
-      <entry>Antarctica/Palmer</entry>
      </row>
      <row>
+      <entry>Antarctica/Palmer</entry>
       <entry>Antarctica/Rothera</entry>
       <entry>Antarctica/South_Pole</entry>
       <entry>Antarctica/Syowa</entry>
@@ -357,7 +373,7 @@
   <title>List of timezones in the group Arctic</title>
   <table>
    <title>Arctic</title>
-   <tgroup cols="1">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>Arctic/Longyearbyen</entry>
@@ -371,7 +387,7 @@
   <title>List of timezones in the group Asia</title>
   <table>
    <title>Asia</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>Asia/Aden</entry>
@@ -379,34 +395,36 @@
       <entry>Asia/Amman</entry>
       <entry>Asia/Anadyr</entry>
       <entry>Asia/Aqtau</entry>
-      <entry>Asia/Aqtobe</entry>
      </row>
      <row>
+      <entry>Asia/Aqtobe</entry>
       <entry>Asia/Ashgabat</entry>
       <entry>Asia/Ashkhabad</entry>
       <entry>Asia/Baghdad</entry>
       <entry>Asia/Bahrain</entry>
-      <entry>Asia/Baku</entry>
-      <entry>Asia/Bangkok</entry>
      </row>
      <row>
+      <entry>Asia/Baku</entry>
+      <entry>Asia/Bangkok</entry>
       <entry>Asia/Beirut</entry>
       <entry>Asia/Bishkek</entry>
       <entry>Asia/Brunei</entry>
+     </row>
+     <row>
       <entry>Asia/Calcutta</entry>
       <entry>Asia/Choibalsan</entry>
       <entry>Asia/Chongqing</entry>
-     </row>
-     <row>
       <entry>Asia/Chungking</entry>
       <entry>Asia/Colombo</entry>
+     </row>
+     <row>
       <entry>Asia/Dacca</entry>
       <entry>Asia/Damascus</entry>
       <entry>Asia/Dhaka</entry>
       <entry>Asia/Dili</entry>
+      <entry>Asia/Dubai</entry>
      </row>
      <row>
-      <entry>Asia/Dubai</entry>
       <entry>Asia/Dushanbe</entry>
       <entry>Asia/Gaza</entry>
       <entry>Asia/Harbin</entry>
@@ -419,34 +437,36 @@
       <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/Katmandu</entry>
-      <entry>Asia/Krasnoyarsk</entry>
-      <entry>Asia/Kuala_Lumpur</entry>
      </row>
      <row>
+      <entry>Asia/Krasnoyarsk</entry>
+      <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>
       <entry>Asia/Makassar</entry>
-     </row>
-     <row>
       <entry>Asia/Manila</entry>
       <entry>Asia/Muscat</entry>
+     </row>
+     <row>
       <entry>Asia/Nicosia</entry>
       <entry>Asia/Novosibirsk</entry>
       <entry>Asia/Omsk</entry>
       <entry>Asia/Oral</entry>
+      <entry>Asia/Phnom_Penh</entry>
      </row>
      <row>
-      <entry>Asia/Phnom_Penh</entry>
       <entry>Asia/Pontianak</entry>
       <entry>Asia/Pyongyang</entry>
       <entry>Asia/Qatar</entry>
@@ -459,34 +479,36 @@
       <entry>Asia/Sakhalin</entry>
       <entry>Asia/Samarkand</entry>
       <entry>Asia/Seoul</entry>
-      <entry>Asia/Shanghai</entry>
      </row>
      <row>
+      <entry>Asia/Shanghai</entry>
       <entry>Asia/Singapore</entry>
       <entry>Asia/Taipei</entry>
       <entry>Asia/Tashkent</entry>
       <entry>Asia/Tbilisi</entry>
-      <entry>Asia/Tehran</entry>
-      <entry>Asia/Tel_Aviv</entry>
      </row>
      <row>
+      <entry>Asia/Tehran</entry>
+      <entry>Asia/Tel_Aviv</entry>
       <entry>Asia/Thimbu</entry>
       <entry>Asia/Thimphu</entry>
       <entry>Asia/Tokyo</entry>
+     </row>
+     <row>
       <entry>Asia/Ujung_Pandang</entry>
       <entry>Asia/Ulaanbaatar</entry>
       <entry>Asia/Ulan_Bator</entry>
-     </row>
-     <row>
       <entry>Asia/Urumqi</entry>
       <entry>Asia/Vientiane</entry>
+     </row>
+     <row>
       <entry>Asia/Vladivostok</entry>
       <entry>Asia/Yakutsk</entry>
       <entry>Asia/Yekaterinburg</entry>
       <entry>Asia/Yerevan</entry>
+      <entry>Indian/Antananarivo</entry>
      </row>
      <row>
-      <entry>Indian/Antananarivo</entry>
       <entry>Indian/Chagos</entry>
       <entry>Indian/Christmas</entry>
       <entry>Indian/Cocos</entry>
@@ -509,7 +531,7 @@
   <title>List of timezones in the group Atlantic</title>
   <table>
    <title>Atlantic</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>Atlantic/Azores</entry>
@@ -517,13 +539,15 @@
       <entry>Atlantic/Canary</entry>
       <entry>Atlantic/Cape_Verde</entry>
       <entry>Atlantic/Faeroe</entry>
-      <entry>Atlantic/Jan_Mayen</entry>
      </row>
      <row>
+      <entry>Atlantic/Jan_Mayen</entry>
       <entry>Atlantic/Madeira</entry>
       <entry>Atlantic/Reykjavik</entry>
       <entry>Atlantic/South_Georgia</entry>
       <entry>Atlantic/St_Helena</entry>
+     </row>
+     <row>
       <entry>Atlantic/Stanley</entry>
      </row>
     </tbody>
@@ -535,7 +559,7 @@
   <title>List of timezones in the group Australia</title>
   <table>
    <title>Australia</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>Australia/ACT</entry>
@@ -543,27 +567,29 @@
       <entry>Australia/Brisbane</entry>
       <entry>Australia/Broken_Hill</entry>
       <entry>Australia/Canberra</entry>
-      <entry>Australia/Currie</entry>
      </row>
      <row>
+      <entry>Australia/Currie</entry>
       <entry>Australia/Darwin</entry>
       <entry>Australia/Hobart</entry>
       <entry>Australia/LHI</entry>
       <entry>Australia/Lindeman</entry>
-      <entry>Australia/Lord_Howe</entry>
-      <entry>Australia/Melbourne</entry>
      </row>
      <row>
+      <entry>Australia/Lord_Howe</entry>
+      <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>
-     </row>
-     <row>
       <entry>Australia/Tasmania</entry>
       <entry>Australia/Victoria</entry>
+     </row>
+     <row>
       <entry>Australia/West</entry>
       <entry>Australia/Yancowinna</entry>
      </row>
@@ -576,7 +602,7 @@
   <title>List of timezones in the group Europe</title>
   <table>
    <title>Europe</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>Europe/Amsterdam</entry>
@@ -584,34 +610,36 @@
       <entry>Europe/Athens</entry>
       <entry>Europe/Belfast</entry>
       <entry>Europe/Belgrade</entry>
-      <entry>Europe/Berlin</entry>
      </row>
      <row>
+      <entry>Europe/Berlin</entry>
       <entry>Europe/Bratislava</entry>
       <entry>Europe/Brussels</entry>
       <entry>Europe/Bucharest</entry>
       <entry>Europe/Budapest</entry>
-      <entry>Europe/Chisinau</entry>
-      <entry>Europe/Copenhagen</entry>
      </row>
      <row>
+      <entry>Europe/Chisinau</entry>
+      <entry>Europe/Copenhagen</entry>
       <entry>Europe/Dublin</entry>
       <entry>Europe/Gibraltar</entry>
       <entry>Europe/Helsinki</entry>
+     </row>
+     <row>
       <entry>Europe/Istanbul</entry>
       <entry>Europe/Kaliningrad</entry>
       <entry>Europe/Kiev</entry>
-     </row>
-     <row>
       <entry>Europe/Lisbon</entry>
       <entry>Europe/Ljubljana</entry>
+     </row>
+     <row>
       <entry>Europe/London</entry>
       <entry>Europe/Luxembourg</entry>
       <entry>Europe/Madrid</entry>
       <entry>Europe/Malta</entry>
+      <entry>Europe/Mariehamn</entry>
      </row>
      <row>
-      <entry>Europe/Mariehamn</entry>
       <entry>Europe/Minsk</entry>
       <entry>Europe/Monaco</entry>
       <entry>Europe/Moscow</entry>
@@ -624,27 +652,29 @@
       <entry>Europe/Riga</entry>
       <entry>Europe/Rome</entry>
       <entry>Europe/Samara</entry>
-      <entry>Europe/San_Marino</entry>
      </row>
      <row>
+      <entry>Europe/San_Marino</entry>
       <entry>Europe/Sarajevo</entry>
       <entry>Europe/Simferopol</entry>
       <entry>Europe/Skopje</entry>
       <entry>Europe/Sofia</entry>
-      <entry>Europe/Stockholm</entry>
-      <entry>Europe/Tallinn</entry>
      </row>
      <row>
+      <entry>Europe/Stockholm</entry>
+      <entry>Europe/Tallinn</entry>
       <entry>Europe/Tirane</entry>
       <entry>Europe/Tiraspol</entry>
       <entry>Europe/Uzhgorod</entry>
+     </row>
+     <row>
       <entry>Europe/Vaduz</entry>
       <entry>Europe/Vatican</entry>
       <entry>Europe/Vienna</entry>
-     </row>
-     <row>
       <entry>Europe/Vilnius</entry>
       <entry>Europe/Warsaw</entry>
+     </row>
+     <row>
       <entry>Europe/Zagreb</entry>
       <entry>Europe/Zaporozhye</entry>
       <entry>Europe/Zurich</entry>
@@ -658,7 +688,7 @@
   <title>List of timezones in the group Pacific</title>
   <table>
    <title>Pacific</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>Pacific/Apia</entry>
@@ -666,34 +696,36 @@
       <entry>Pacific/Chatham</entry>
       <entry>Pacific/Easter</entry>
       <entry>Pacific/Efate</entry>
-      <entry>Pacific/Enderbury</entry>
      </row>
      <row>
+      <entry>Pacific/Enderbury</entry>
       <entry>Pacific/Fakaofo</entry>
       <entry>Pacific/Fiji</entry>
       <entry>Pacific/Funafuti</entry>
       <entry>Pacific/Galapagos</entry>
-      <entry>Pacific/Gambier</entry>
-      <entry>Pacific/Guadalcanal</entry>
      </row>
      <row>
+      <entry>Pacific/Gambier</entry>
+      <entry>Pacific/Guadalcanal</entry>
       <entry>Pacific/Guam</entry>
       <entry>Pacific/Honolulu</entry>
       <entry>Pacific/Johnston</entry>
+     </row>
+     <row>
       <entry>Pacific/Kiritimati</entry>
       <entry>Pacific/Kosrae</entry>
       <entry>Pacific/Kwajalein</entry>
-     </row>
-     <row>
       <entry>Pacific/Majuro</entry>
       <entry>Pacific/Marquesas</entry>
+     </row>
+     <row>
       <entry>Pacific/Midway</entry>
       <entry>Pacific/Nauru</entry>
       <entry>Pacific/Niue</entry>
       <entry>Pacific/Norfolk</entry>
+      <entry>Pacific/Noumea</entry>
      </row>
      <row>
-      <entry>Pacific/Noumea</entry>
       <entry>Pacific/Pago_Pago</entry>
       <entry>Pacific/Palau</entry>
       <entry>Pacific/Pitcairn</entry>
@@ -706,9 +738,9 @@
       <entry>Pacific/Samoa</entry>
       <entry>Pacific/Tahiti</entry>
       <entry>Pacific/Tarawa</entry>
-      <entry>Pacific/Tongatapu</entry>
      </row>
      <row>
+      <entry>Pacific/Tongatapu</entry>
       <entry>Pacific/Truk</entry>
       <entry>Pacific/Wake</entry>
       <entry>Pacific/Wallis</entry>
@@ -723,7 +755,7 @@
   <title>List of timezones in the group Others</title>
   <table>
    <title>Others</title>
-   <tgroup cols="6">
+   <tgroup cols="5">
     <tbody>
      <row>
       <entry>CET</entry>
@@ -731,34 +763,36 @@
       <entry>Cuba</entry>
       <entry>EET</entry>
       <entry>Egypt</entry>
-      <entry>Eire</entry>
      </row>
      <row>
+      <entry>Eire</entry>
       <entry>EST</entry>
       <entry>EST5EDT</entry>
       <entry>Etc/GMT</entry>
       <entry>Etc/GMT+0</entry>
-      <entry>Etc/GMT+1</entry>
-      <entry>Etc/GMT+10</entry>
      </row>
      <row>
+      <entry>Etc/GMT+1</entry>
+      <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>
-     </row>
-     <row>
       <entry>Etc/GMT+6</entry>
       <entry>Etc/GMT+7</entry>
+     </row>
+     <row>
       <entry>Etc/GMT+8</entry>
       <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-10</entry>
       <entry>Etc/GMT-11</entry>
       <entry>Etc/GMT-12</entry>
       <entry>Etc/GMT-13</entry>
@@ -771,34 +805,36 @@
       <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-8</entry>
       <entry>Etc/GMT-9</entry>
       <entry>Etc/GMT0</entry>
       <entry>Etc/Greenwich</entry>
       <entry>Etc/UCT</entry>
-      <entry>Etc/Universal</entry>
-      <entry>Etc/UTC</entry>
      </row>
      <row>
+      <entry>Etc/Universal</entry>
+      <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>
-     </row>
-     <row>
       <entry>GMT-0</entry>
       <entry>GMT0</entry>
+     </row>
+     <row>
       <entry>Greenwich</entry>
       <entry>Hongkong</entry>
       <entry>HST</entry>
       <entry>Iceland</entry>
+      <entry>Iran</entry>
      </row>
      <row>
-      <entry>Iran</entry>
       <entry>Israel</entry>
       <entry>Jamaica</entry>
       <entry>Japan</entry>
@@ -811,25 +847,25 @@
       <entry>MST7MDT</entry>
       <entry>Navajo</entry>
       <entry>NZ</entry>
-      <entry>NZ-CHAT</entry>
      </row>
      <row>
+      <entry>NZ-CHAT</entry>
       <entry>Poland</entry>
       <entry>Portugal</entry>
       <entry>PRC</entry>
       <entry>PST8PDT</entry>
-      <entry>ROC</entry>
-      <entry>ROK</entry>
      </row>
      <row>
+      <entry>ROC</entry>
+      <entry>ROK</entry>
       <entry>Singapore</entry>
       <entry>Turkey</entry>
       <entry>UCT</entry>
+     </row>
+     <row>
       <entry>Universal</entry>
       <entry>UTC</entry>
       <entry>W-SU</entry>
-     </row>
-     <row>
       <entry>WET</entry>
       <entry>Zulu</entry>
      </row>