[tz] Clerical patches

Tim Parenti tim at timtimeonline.com
Thu Aug 14 01:10:21 UTC 2014


A few more clerical patches, relative to 
7217d26487456e93094be4c3befb6cdccfdc7bcc, dated Wed Aug 13 11:46:39 2014 
-0700.

0001 fixes up some more minor spacing issues missed in my last round of 
patches on 2014-08-09.

0002 fixes another typo in recent additions to NEWS, and adds a space 
after the redirection operator in the new CONTRIBUTING file for added 
clarity.

0003 renames the fields of Link lines to be more descriptive and more 
like the parameters of 'ln'.  (Personally, I have found LINK-FROM and 
LINK-TO to be the opposite of my expectations, and these are not 
particularly descriptive names anyway.)  0004 standardizes Link lines to 
use single tabs.

These can be compared at 
https://github.com/timparenti/tz-experimental/compare/eggert:master...timparenti:2014-08-13-things#top 


-- 
Tim Parenti

-------------- next part --------------
From 38e663666b86981263a8ce43a84050a3b64ca3f0 Mon Sep 17 00:00:00 2001
From: Tim Parenti <tim at timtimeonline.com>
Date: Wed, 13 Aug 2014 13:31:11 -0400
Subject: Typo fix and a minor clarifying edit.

* NEWS: Typo fix.
* CONTRIBUTING: Add a space after the redirection operator for clarity.
---
 CONTRIBUTING |    2 +-
 NEWS         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 5586ec8..d382839 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -8,7 +8,7 @@ free to fill gaps or fix mistakes, and please email improvements
 to tz at iana.org for use in the future.
 
 To email small changes, please run a POSIX shell command like
-'diff -u old/europe new/europe >myfix.patch', and attach
+'diff -u old/europe new/europe > myfix.patch', and attach
 myfix.patch to the email.
 
 For more-elaborate changes, please read the Theory file and browse
diff --git a/NEWS b/NEWS
index 8670c3a..8cb840d 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Unreleased, experimental changes
     Asia/Yekaterinburg the correction is a few minutes.  (Thanks to
     Vladimir Karpinsky.)
 
-    The Portuguese decree of 1911-05-25 took effect on 1912-01-01.
+    The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
     This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
     Atlantic/Azores, and Atlantic/Madeira.  Also, Lisbon's pre-1912
     GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
-- 
1.7.9
-------------- next part --------------
From 9447d06e984833393bd1386b22c6c255133f9e8e Mon Sep 17 00:00:00 2001
From: Tim Parenti <tim at timtimeonline.com>
Date: Wed, 13 Aug 2014 13:31:27 -0400
Subject: More spacing fixes around UNTIL fields.

---
 africa       |   24 +++++++++++-----------
 antarctica   |    2 +-
 asia         |   52 ++++++++++++++++++++++++------------------------
 australasia  |   54 +++++++++++++++++++++++++-------------------------
 backzone     |   54 +++++++++++++++++++++++++-------------------------
 europe       |   62 +++++++++++++++++++++++++++++-----------------------------
 northamerica |   52 ++++++++++++++++++++++++------------------------
 southamerica |   28 +++++++++++++-------------
 8 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/africa b/africa
index 5c9c4f8..6274125 100644
--- a/africa
+++ b/africa
@@ -95,7 +95,7 @@ Rule	Algeria	1980	only	-	Oct	31	 2:00	0	-
 # more precise 0:09:21.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15  0:01
-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
+			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
 			0:00	Algeria	WE%sT	1940 Feb 25  2:00
 			1:00	Algeria	CE%sT	1946 Oct  7
 			0:00	-	WET	1956 Jan 29
@@ -139,7 +139,7 @@ Zone Africa/Bujumbura	1:57:28	-	LMT	1890
 # merely made it official?
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907			# Praia
+Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907 # Praia
 			-2:00	-	CVT	1942 Sep
 			-2:00	1:00	CVST	1945 Oct 15
 			-2:00	-	CVT	1975 Nov 25  2:00
@@ -157,7 +157,7 @@ Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
 
 # Comoros
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul   # Moroni, Gran Comoro
+Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul # Moroni, Gran Comoro
 			3:00	-	EAT
 
 # Democratic Republic of the Congo
@@ -402,8 +402,8 @@ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 # Eritrea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Asmara	2:35:32 -	LMT	1870
-			2:35:32	-	AMT	1890	      # Asmara Mean Time
-			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
+			2:35:32	-	AMT	1890 # Asmara Mean Time
+			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
 			3:00	-	EAT
 
 # Ethiopia
@@ -419,7 +419,7 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
 # anyway.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
-			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
+			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
 			3:00	-	EAT
 
 # Gabon
@@ -648,14 +648,14 @@ Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
 Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	S
 Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
+Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 			4:00 Mauritius	MU%sT	# Mauritius Time
 # Agalega Is, Rodriguez
 # no information; probably like Indian/Mauritius
 
 # Mayotte
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
+Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul # Mamoutzou
 			3:00	-	EAT
 
 # Morocco
@@ -987,7 +987,7 @@ Rule	Namibia	1994	max	-	Sep	Sun>=1	2:00	1:00	S
 Rule	Namibia	1995	max	-	Apr	Sun>=1	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
-			1:30	-	SWAT	1903 Mar	# SW Africa Time
+			1:30	-	SWAT	1903 Mar # SW Africa Time
 			2:00	-	SAST	1942 Sep 20  2:00
 			2:00	1:00	SAST	1943 Mar 21  2:00
 			2:00	-	SAST	1990 Mar 21 # independence
@@ -1013,7 +1013,7 @@ Link Africa/Lagos Africa/Porto-Novo  # Benin
 
 # Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
+Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
 			4:00	-	RET	# Réunion Time
 #
 # Crozet Islands also observes Réunion time; see the 'antarctica' file.
@@ -1050,7 +1050,7 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
 
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	# Victoria
+Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun # Victoria
 			4:00	-	SCT	# Seychelles Time
 # From Paul Eggert (2001-05-30):
 # Aldabra, Farquhar, and Desroches, originally dependencies of the
@@ -1215,7 +1215,7 @@ Rule	Tunisia	2006	2008	-	Oct	lastSun	 2:00s	0	-
 # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tunis	0:40:44 -	LMT	1881 May 12
-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
+			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
 			1:00	Tunisia	CE%sT
 
 # Uganda
diff --git a/antarctica b/antarctica
index 36bbb83..4010103 100644
--- a/antarctica
+++ b/antarctica
@@ -174,7 +174,7 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
+Zone Indian/Kerguelen	0	-	zzz	1950 # Port-aux-Français
 			5:00	-	TFT	# ISO code TF Time
 #
 # year-round base in the main continent
diff --git a/asia b/asia
index 5eba52a..e07e9d0 100644
--- a/asia
+++ b/asia
@@ -119,7 +119,7 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
 # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
-			3:00	-	YERT	1957 Mar    # Yerevan Time
+			3:00	-	YERT	1957 Mar # Yerevan Time
 			4:00 RussiaAsia YER%sT	1991 Mar 31  2:00s
 			3:00	1:00	YERST	1991 Sep 23 # independence
 			3:00 RussiaAsia	AM%sT	1995 Sep 24  2:00s
@@ -136,7 +136,7 @@ Rule	Azer	1997	max	-	Mar	lastSun	 4:00	1:00	S
 Rule	Azer	1997	max	-	Oct	lastSun	 5:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
-			3:00	-	BAKT	1957 Mar    # Baku Time
+			3:00	-	BAKT	1957 Mar # Baku Time
 			4:00 RussiaAsia BAK%sT	1991 Mar 31  2:00s
 			3:00	1:00	BAKST	1991 Aug 30 # independence
 			3:00 RussiaAsia	AZ%sT	1992 Sep lastSat 23:00
@@ -146,7 +146,7 @@ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
 
 # Bahrain
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Manamah
+Zone	Asia/Bahrain	3:22:20 -	LMT	1920 # Manamah
 			4:00	-	GST	1972 Jun
 			3:00	-	AST
 
@@ -228,7 +228,7 @@ Rule	Dhaka	2009	only	-	Dec	31	24:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dhaka	6:01:40 -	LMT	1890
-			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
+			5:53:20	-	HMT	1941 Oct # Howrah Mean Time?
 			6:30	-	BURT	1942 May 15 # Burma Time
 			5:30	-	IST	1942 Sep
 			6:30	-	BURT	1951 Sep 30
@@ -255,7 +255,7 @@ Zone	Indian/Chagos	4:49:40	-	LMT	1907
 
 # Brunei
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar   # Bandar Seri Begawan
+Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar # Bandar Seri Begawan
 			7:30	-	BNT	1933
 			8:00	-	BNT
 
@@ -264,9 +264,9 @@ Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar   # Bandar Seri Begawan
 # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Rangoon	6:24:40 -	LMT	1880		# or Yangon
-			6:24:40	-	RMT	1920	   # Rangoon Mean Time?
-			6:30	-	BURT	1942 May   # Burma Time
+Zone	Asia/Rangoon	6:24:40 -	LMT	1880 # or Yangon
+			6:24:40	-	RMT	1920 # Rangoon Mean Time?
+			6:30	-	BURT	1942 May # Burma Time
 			9:00	-	JST	1945 May 3
 			6:30	-	MMT		   # Myanmar Time
 
@@ -835,7 +835,7 @@ Link	Asia/Nicosia	Europe/Nicosia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tbilisi	2:59:11 -	LMT	1880
 			2:59:11	-	TBMT	1924 May  2 # Tbilisi Mean Time
-			3:00	-	TBIT	1957 Mar    # Tbilisi Time
+			3:00	-	TBIT	1957 Mar # Tbilisi Time
 			4:00 RussiaAsia TBI%sT	1991 Mar 31  2:00s
 			3:00	1:00	TBIST	1991 Apr  9 # independence
 			3:00 RussiaAsia GE%sT	1992 # Georgia Time
@@ -887,8 +887,8 @@ Zone	Asia/Dili	8:22:20 -	LMT	1912 Jan  1
 # Ignore this as it predates our 1970 cutoff.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Kolkata	5:53:28 -	LMT	1880	# Kolkata
-			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
+Zone	Asia/Kolkata	5:53:28 -	LMT	1880 # Kolkata
+			5:53:20	-	HMT	1941 Oct # Howrah Mean Time?
 			6:30	-	BURT	1942 May 15 # Burma Time
 			5:30	-	IST	1942 Sep
 			5:30	1:00	IST	1945 Oct 15
@@ -938,7 +938,7 @@ Zone Asia/Jakarta	7:07:12 -	LMT	1867 Aug 10
 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
 # but this must be a typo.
 			7:07:12	-	BMT	1923 Dec 31 23:47:12 # Batavia
-			7:20	-	JAVT	1932 Nov	 # Java Time
+			7:20	-	JAVT	1932 Nov # Java Time
 			7:30	-	WIB	1942 Mar 23
 			9:00	-	JST	1945 Sep 23
 			7:30	-	WIB	1948 May
@@ -947,7 +947,7 @@ Zone Asia/Jakarta	7:07:12 -	LMT	1867 Aug 10
 			7:00	-	WIB
 # west and central Borneo
 Zone Asia/Pontianak	7:17:20	-	LMT	1908 May
-			7:17:20	-	PMT	1932 Nov    # Pontianak MT
+			7:17:20	-	PMT	1932 Nov # Pontianak MT
 			7:30	-	WIB	1942 Jan 29
 			9:00	-	JST	1945 Sep 23
 			7:30	-	WIB	1948 May
@@ -957,7 +957,7 @@ Zone Asia/Pontianak	7:17:20	-	LMT	1908 May
 			7:00	-	WIB
 # Sulawesi, Lesser Sundas, east and south Borneo
 Zone Asia/Makassar	7:57:36 -	LMT	1920
-			7:57:36	-	MMT	1932 Nov    # Macassar MT
+			7:57:36	-	MMT	1932 Nov # Macassar MT
 			8:00	-	WITA	1942 Feb  9
 			9:00	-	JST	1945 Sep 23
 			8:00	-	WITA
@@ -1096,7 +1096,7 @@ Rule	Iran	2036	2037	-	Mar	21	0:00	1:00	D
 Rule	Iran	2036	2037	-	Sep	21	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
-			3:25:44	-	TMT	1946	# Tehran Mean Time
+			3:25:44	-	TMT	1946 # Tehran Mean Time
 			3:30	-	IRST	1977 Nov
 			4:00	Iran	IR%sT	1979
 			3:30	Iran	IR%sT
@@ -1141,7 +1141,7 @@ Rule	Iraq	1991	2007	-	Apr	 1	3:00s	1:00	D
 Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baghdad	2:57:40	-	LMT	1890
-			2:57:36	-	BMT	1918	    # Baghdad Mean Time?
+			2:57:36	-	BMT	1918 # Baghdad Mean Time?
 			3:00	-	AST	1982 May
 			3:00	Iraq	A%sT
 
@@ -1369,7 +1369,7 @@ Rule	Zion	2013	max	-	Oct	lastSun	2:00	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
-			2:20:40	-	JMT	1918	# Jerusalem Mean Time?
+			2:20:40	-	JMT	1918 # Jerusalem Mean Time?
 			2:00	Zion	I%sT
 
 
@@ -1661,7 +1661,7 @@ Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
 			5:00	-	FRUT	1930 Jun 21 # Frunze Time
 			6:00 RussiaAsia FRU%sT	1991 Mar 31  2:00s
 			5:00	1:00	FRUST	1991 Aug 31  2:00 # independence
-			5:00	Kyrgyz	KG%sT	2005 Aug 12    # Kyrgyzstan Time
+			5:00	Kyrgyz	KG%sT	2005 Aug 12 # Kyrgyzstan Time
 			6:00	-	KGT
 
 ###############################################################################
@@ -1778,7 +1778,7 @@ Zone Asia/Kuala_Lumpur	6:46:46 -	LMT	1901 Jan  1
 # and 1982 transition dates are from Mok Ly Yng.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
-			7:30	-	BORT	1933	# Borneo Time
+			7:30	-	BORT	1933 # Borneo Time
 			8:00	NBorneo	BOR%sT	1942 Feb 16
 			9:00	-	JST	1945 Sep 12
 			8:00	-	BORT	1982 Jan  1
@@ -1786,8 +1786,8 @@ Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
 
 # Maldives
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Maldives	4:54:00 -	LMT	1880	# Male
-			4:54:00	-	MMT	1960	# Male Mean Time
+Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Male
+			4:54:00	-	MMT	1960 # Male Mean Time
 			5:00	-	MVT		# Maldives Time
 
 # Mongolia
@@ -1918,11 +1918,11 @@ Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
 Zone	Asia/Hovd	6:06:36 -	LMT	1905 Aug
-			6:00	-	HOVT	1978	# Hovd Time
+			6:00	-	HOVT	1978 # Hovd Time
 			7:00	Mongol	HOV%sT
 # Ulaanbaatar, a.k.a. Ulan Bataar, Ulan Bator, Urga
 Zone	Asia/Ulaanbaatar 7:07:32 -	LMT	1905 Aug
-			7:00	-	ULAT	1978	# Ulaanbaatar Time
+			7:00	-	ULAT	1978 # Ulaanbaatar Time
 			8:00	Mongol	ULA%sT
 # Choibalsan, a.k.a. Bajan Tümen, Bajan Tumen, Chojbalsan,
 # Choybalsan, Sanbejse, Tchoibalsan
@@ -2434,7 +2434,7 @@ Zone	Asia/Manila	-15:56:00 -	LMT	1844 Dec 31
 
 # Qatar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Qatar	3:26:08 -	LMT	1920	# Al Dawhah / Doha
+Zone	Asia/Qatar	3:26:08 -	LMT	1920 # Al Dawhah / Doha
 			4:00	-	GST	1972 Jun
 			3:00	-	AST
 
@@ -2548,7 +2548,7 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Colombo	5:19:24 -	LMT	1880
-			5:19:32	-	MMT	1906	# Moratuwa Mean Time
+			5:19:32	-	MMT	1906 # Moratuwa Mean Time
 			5:30	-	IST	1942 Jan  5
 			5:30	0:30	IHST	1942 Sep
 			5:30	1:00	IST	1945 Oct 16  2:00
@@ -2717,7 +2717,7 @@ Rule	Syria	2012	max	-	Mar	lastFri	0:00	1:00	S
 Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq
+Zone	Asia/Damascus	2:25:12 -	LMT	1920 # Dimashq
 			2:00	Syria	EE%sT
 
 # Tajikistan
diff --git a/australasia b/australasia
index 117e841..e41162d 100644
--- a/australasia
+++ b/australasia
@@ -346,16 +346,16 @@ Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
 Rule	Fiji	2012	2013	-	Jan	Sun>=18	3:00	0	-
 Rule	Fiji	2014	max	-	Jan	Sun>=18	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26	# Suva
+Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
 			12:00	Fiji	FJ%sT	# Fiji Time
 
 # French Polynesia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct	# Rikitea
+Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct # Rikitea
 			 -9:00	-	GAMT	# Gambier Time
 Zone	Pacific/Marquesas -9:18:00 -	LMT	1912 Oct
 			 -9:30	-	MART	# Marquesas Time
-Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct	# Papeete
+Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct # Papeete
 			-10:00	-	TAHT	# Tahiti Time
 # Clipperton (near North America) is administered from French Polynesia;
 # it is uninhabited.
@@ -363,13 +363,13 @@ Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct	# Papeete
 # Guam
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Guam	-14:21:00 -	LMT	1844 Dec 31
-			 9:39:00 -	LMT	1901		# Agana
-			10:00	-	GST	2000 Dec 23	# Guam
+			 9:39:00 -	LMT	1901 # Agana
+			10:00	-	GST	2000 Dec 23 # Guam
 			10:00	-	ChST	# Chamorro Standard Time
 
 # Kiribati
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Tarawa	 11:32:04 -	LMT	1901		# Bairiki
+Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
 			 12:00	-	GILT		 # Gilbert Is Time
 Zone Pacific/Enderbury	-11:24:20 -	LMT	1901
 			-12:00	-	PHOT	1979 Oct # Phoenix Is Time
@@ -395,24 +395,24 @@ Zone Pacific/Majuro	11:24:48 -	LMT	1901
 			12:00	-	MHT
 Zone Pacific/Kwajalein	11:09:20 -	LMT	1901
 			11:00	-	MHT	1969 Oct
-			-12:00	-	KWAT	1993 Aug 20	# Kwajalein Time
+			-12:00	-	KWAT	1993 Aug 20 # Kwajalein Time
 			12:00	-	MHT
 
 # Micronesia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Chuuk	10:07:08 -	LMT	1901
 			10:00	-	CHUT			# Chuuk Time
-Zone Pacific/Pohnpei	10:32:52 -	LMT	1901		# Kolonia
+Zone Pacific/Pohnpei	10:32:52 -	LMT	1901 # Kolonia
 			11:00	-	PONT			# Pohnpei Time
 Zone Pacific/Kosrae	10:51:56 -	LMT	1901
-			11:00	-	KOST	1969 Oct	# Kosrae Time
+			11:00	-	KOST	1969 Oct # Kosrae Time
 			12:00	-	KOST	1999
 			11:00	-	KOST
 
 # Nauru
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15	# Uaobe
-			11:30	-	NRT	1942 Mar 15	# Nauru Time
+Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15 # Uaobe
+			11:30	-	NRT	1942 Mar 15 # Nauru Time
 			9:00	-	JST	1944 Aug 15
 			11:30	-	NRT	1979 May
 			12:00	-	NRT
@@ -489,8 +489,8 @@ Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HS
 Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
 Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
-			-10:30	-	CKT	1978 Nov 12	# Cook Is Time
+Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901 # Avarua
+			-10:30	-	CKT	1978 Nov 12 # Cook Is Time
 			-10:00	Cook	CK%sT
 
 ###############################################################################
@@ -498,39 +498,39 @@ Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
 
 # Niue
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Niue	-11:19:40 -	LMT	1901		# Alofi
-			-11:20	-	NUT	1951	# Niue Time
+Zone	Pacific/Niue	-11:19:40 -	LMT	1901 # Alofi
+			-11:20	-	NUT	1951 # Niue Time
 			-11:30	-	NUT	1978 Oct 1
 			-11:00	-	NUT
 
 # Norfolk
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Norfolk	11:11:52 -	LMT	1901		# Kingston
-			11:12	-	NMT	1951	# Norfolk Mean Time
+Zone	Pacific/Norfolk	11:11:52 -	LMT	1901 # Kingston
+			11:12	-	NMT	1951 # Norfolk Mean Time
 			11:30	-	NFT		# Norfolk Time
 
 # Palau (Belau)
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Palau	8:57:56 -	LMT	1901		# Koror
+Zone Pacific/Palau	8:57:56 -	LMT	1901 # Koror
 			9:00	-	PWT	# Palau Time
 
 # Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
-			9:48:32	-	PMMT	1895	# Port Moresby Mean Time
+			9:48:32	-	PMMT	1895 # Port Moresby Mean Time
 			10:00	-	PGT		# Papua New Guinea Time
 
 # Pitcairn
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901		# Adamstown
+Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901 # Adamstown
 			-8:30	-	PNT	1998 Apr 27  0:00
 			-8:00	-	PST	# Pitcairn Standard Time
 
 # American Samoa
 Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
 			-11:22:48 -	LMT	1911
-			-11:00	-	NST	1967 Apr	# N=Nome
-			-11:00	-	BST	1983 Nov 30	# B=Bering
+			-11:00	-	NST	1967 Apr # N=Nome
+			-11:00	-	BST	1983 Nov 30 # B=Bering
 			-11:00	-	SST			# S=Samoa
 
 # Samoa (formerly and also known as Western Samoa)
@@ -617,7 +617,7 @@ Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 # Solomon Is
 # excludes Bougainville, for which see Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct	# Honiara
+Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct # Honiara
 			11:00	-	SBT	# Solomon Is Time
 
 # Tokelau Is
@@ -641,7 +641,7 @@ Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct	# Honiara
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
-			-11:00	-	TKT 2011 Dec 30	# Tokelau Time
+			-11:00	-	TKT	2011 Dec 30 # Tokelau Time
 			13:00	-	TKT
 
 # Tonga
@@ -727,8 +727,8 @@ Zone Pacific/Funafuti	11:56:52 -	LMT	1901
 Zone Pacific/Midway	-11:49:28 -	LMT	1901
 			-11:00	-	NST	1956 Jun  3
 			-11:00	1:00	NDT	1956 Sep  2
-			-11:00	-	NST	1967 Apr	# N=Nome
-			-11:00	-	BST	1983 Nov 30	# B=Bering
+			-11:00	-	NST	1967 Apr # N=Nome
+			-11:00	-	BST	1983 Nov 30 # B=Bering
 			-11:00	-	SST			# S=Samoa
 
 # Palmyra
@@ -749,7 +749,7 @@ Rule	Vanuatu	1985	1991	-	Sep	Sun>=23	0:00	1:00	S
 Rule	Vanuatu	1992	1993	-	Jan	Sun>=23	0:00	0	-
 Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13		# Vila
+Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 			11:00	Vanuatu	VU%sT	# Vanuatu Time
 
 # Wallis and Futuna
diff --git a/backzone b/backzone
index e25e102..bd6b48b 100644
--- a/backzone
+++ b/backzone
@@ -50,7 +50,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
 
 # Gambia
 Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935	# Banjul Mean Time
+			-1:06:36 -	BMT	1935 # Banjul Mean Time
 			-1:00	-	WAT	1964
 			 0:00	-	GMT
 
@@ -95,7 +95,7 @@ Zone	Africa/Juba	2:06:24 -	LMT	1931
 			3:00	-	EAT
 
 # Democratic Republic of the Congo (west)
-Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
+Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov  9
 			1:00	-	WAT
 
 # Gabon
@@ -153,7 +153,7 @@ Zone Africa/Porto-Novo	0:10:28	-	LMT	1912 Jan  1
 
 # São Tomé and Príncipe
 Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
+			-0:36:32 -	LMT	1912 # Lisbon Mean Time
 			 0:00	-	GMT
 
 # Mali (northern)
@@ -179,7 +179,7 @@ Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
 			-3:00	-	ART
 
 # Aruba
-Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12	# Oranjestad
+Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12 # Oranjestad
 			-4:30	-	ANT	1965 # Netherlands Antilles Time
 			-4:00	-	AST
 
@@ -189,7 +189,7 @@ Zone America/Coral_Harbour -5:32:40 -	LMT	1884
 			-5:00	-	EST
 
 # Dominica
-Zone America/Dominica	-4:05:36 -	LMT	1911 Jul  1 0:01	# Roseau
+Zone America/Dominica	-4:05:36 -	LMT	1911 Jul  1  0:01 # Roseau
 			-4:00	-	AST
 
 # Baja California
@@ -203,18 +203,18 @@ Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
 			-8:00	Mexico	P%sT
 
 # Grenada
-Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul	# St George's
+Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul # St George's
 			-4:00	-	AST
 
 # Guadeloupe
-Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8	# Pointe a Pitre
+Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8 # Pointe a Pitre
 			-4:00	 -	AST
 
 # Montserrat
 # From Paul Eggert (2006-03-22):
 # In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
 # world.gazetteer.com says Cork Hill is the most populous location now.
-Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Cork Hill
+Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul  1 0:01 # Cork Hill
 			-4:00	-	AST
 
 # Argentina
@@ -227,30 +227,30 @@ Zone America/Rosario	-4:02:40 -	LMT	1894 Nov
 			-4:00	-	ART	1930 Dec
 			-4:00	Arg	AR%sT	1969 Oct  5
 			-3:00	Arg	AR%sT	1991 Jul
-			-3:00	-	ART	1999 Oct  3 0:00
-			-4:00	Arg	AR%sT	2000 Mar  3 0:00
+			-3:00	-	ART	1999 Oct  3  0:00
+			-4:00	Arg	AR%sT	2000 Mar  3  0:00
 			-3:00	-	ART
 
 # St Kitts-Nevis
-Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2	# Basseterre
+Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2 # Basseterre
 			-4:00	-	AST
 
 # St Lucia
-Zone America/St_Lucia	-4:04:00 -	LMT	1890		# Castries
-			-4:04:00 -	CMT	1912	    # Castries Mean Time
+Zone America/St_Lucia	-4:04:00 -	LMT	1890 # Castries
+			-4:04:00 -	CMT	1912 # Castries Mean Time
 			-4:00	-	AST
 
 # Virgin Is
-Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul    # Charlotte Amalie
+Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul # Charlotte Amalie
 			-4:00	-	AST
 
 # St Vincent and the Grenadines
-Zone America/St_Vincent	-4:04:56 -	LMT	1890		# Kingstown
-			-4:04:56 -	KMT	1912	   # Kingstown Mean Time
+Zone America/St_Vincent	-4:04:56 -	LMT	1890 # Kingstown
+			-4:04:56 -	KMT	1912 # Kingstown Mean Time
 			-4:00	-	AST
 
 # British Virgin Is
-Zone America/Tortola	-4:18:28 -	LMT	1911 Jul    # Road Town
+Zone America/Tortola	-4:18:28 -	LMT	1911 Jul # Road Town
 			-4:00	-	AST
 
 # McMurdo, Ross Island, since 1955-12
@@ -281,7 +281,7 @@ Link Asia/Chongqing Asia/Chungking
 
 # far west China
 Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # or Kashi or Kaxgar
-			5:30	-	KAST	1940	 # Kashgar Time
+			5:30	-	KAST	1940 # Kashgar Time
 			5:00	-	KAST	1980 May
 			8:00	PRC	C%sT
 
@@ -295,18 +295,18 @@ Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
 Zone Atlantic/Jan_Mayen	-1:00	-	EGT
 
 # St Helena
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
+Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
+			-0:22:48 -	JMT	1951 # Jamestown Mean Time
 			 0:00	-	GMT
 
 # Northern Ireland
 Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
-			-0:25:21 -	DMT	1916 May 21 2:00
+			-0:25:21 -	DMT	1916 May 21  2:00
 						# DMT = Dublin/Dunsink MT
-			-0:25:21 1:00	IST	1916 Oct  1 2:00s
+			-0:25:21 1:00	IST	1916 Oct  1  2:00s
 						# IST = Irish Summer Time
 			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31 2:00u
+			 1:00	-	BST	1971 Oct 31  2:00u
 			 0:00	GB-Eire	%s	1996
 			 0:00	EU	GMT/BST
 
@@ -319,7 +319,7 @@ Zone	Europe/Guernsey	-0:09:19 -	LMT	1913 Jun 18
 			 0:00	GB-Eire	%s	1940 Jul  2
 			 1:00	C-Eur	CE%sT	1945 May  8
 			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31 2:00u
+			 1:00	-	BST	1971 Oct 31  2:00u
 			 0:00	GB-Eire	%s	1996
 			 0:00	EU	GMT/BST
 
@@ -338,9 +338,9 @@ Zone	Europe/Guernsey	-0:09:19 -	LMT	1913 Jun 18
 #
 # AT4 of 1883 - The Statutory Time et cetera Act 1883 -
 # LMT Location - 54.1508N -4.4814E - Tynwald Hill ( Manx parliament )
-Zone    Europe/Isle_of_Man -0:17:55 -    LMT 1883 March 30 0:00s
+Zone    Europe/Isle_of_Man -0:17:55 -    LMT 1883 March 30  0:00s
 			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31 2:00u
+			 1:00	-	BST	1971 Oct 31  2:00u
 			 0:00	GB-Eire	%s	1996
 			 0:00	EU	GMT/BST
 
@@ -353,7 +353,7 @@ Zone	Europe/Jersey	-0:08:25 -	LMT	1898 Jun 11 16:00u
 			 0:00	GB-Eire	%s	1940 Jul  2
 			 1:00	C-Eur	CE%sT	1945 May  8
 			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31 2:00u
+			 1:00	-	BST	1971 Oct 31  2:00u
 			 0:00	GB-Eire	%s	1996
 			 0:00	EU	GMT/BST
 
diff --git a/europe b/europe
index 1d99b10..248e304 100644
--- a/europe
+++ b/europe
@@ -526,7 +526,7 @@ Rule	C-Eur	1944	only	-	Oct	 2	 2:00s	0	-
 #    0:00 France WE%sT 1945 Sep 16  3:00
 #
 # Zone Europe/Belgrade 1:22:00 - LMT 1884
-#    1:00 1:00 CEST 1945 Sep 16   2:00s
+#    1:00 1:00 CEST 1945 Sep 16  2:00s
 #
 # Rule France 1945 only - Sep 16  3:00 0 -
 # Rule Belgium 1945 only - Sep 16  2:00s 0 -
@@ -723,7 +723,7 @@ Zone	Europe/Vienna	1:05:21 -	LMT	1893 Apr
 # http://news.tut.by/society/250578.html
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Minsk	1:50:16 -	LMT	1880
-			1:50	-	MMT	1924 May 2 # Minsk Mean Time
+			1:50	-	MMT	1924 May  2 # Minsk Mean Time
 			2:00	-	EET	1930 Jun 21
 			3:00	-	MSK	1941 Jun 28
 			1:00	C-Eur	CE%sT	1944 Jul  3
@@ -844,7 +844,7 @@ Rule	Czech	1948	only	-	Apr	18	2:00s	1:00	S
 Rule	Czech	1949	only	-	Apr	 9	2:00s	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Prague	0:57:44 -	LMT	1850
-			0:57:44	-	PMT	1891 Oct     # Prague Mean Time
+			0:57:44	-	PMT	1891 Oct # Prague Mean Time
 			1:00	C-Eur	CE%sT	1944 Sep 17  2:00s
 			1:00	Czech	CE%sT	1979
 			1:00	EU	CE%sT
@@ -905,7 +905,7 @@ Zone Europe/Copenhagen	 0:50:20 -	LMT	1890
 			 1:00	C-Eur	CE%sT	1945 Apr  2  2:00
 			 1:00	Denmark	CE%sT	1980
 			 1:00	EU	CE%sT
-Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11	# Tórshavn
+Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # Tórshavn
 			 0:00	-	WET	1981
 			 0:00	EU	WE%sT
 #
@@ -1115,7 +1115,7 @@ Rule	Finland	1981	1982	-	Sep	lastSun	3:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Helsinki	1:39:49 -	LMT	1878 May 31
-			1:39:49	-	HMT	1921 May    # Helsinki Mean Time
+			1:39:49	-	HMT	1921 May # Helsinki Mean Time
 			2:00	Finland	EE%sT	1983
 			2:00	EU	EE%sT
 
@@ -1205,7 +1205,7 @@ Rule	France	1976	only	-	Sep	26	 1:00	0	-
 # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 15  0:01
-			0:09:21	-	PMT	1911 Mar 11  0:01  # Paris MT
+			0:09:21	-	PMT	1911 Mar 11  0:01 # Paris Mean Time
 # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
 			0:00	France	WE%sT	1940 Jun 14 23:00
 # Le Corre says Paris stuck with occupied-France time after the liberation;
@@ -1312,7 +1312,7 @@ Rule	Greece	1980	only	-	Apr	 1	0:00	1:00	S
 Rule	Greece	1980	only	-	Sep	28	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Athens	1:34:52 -	LMT	1895 Sep 14
-			1:34:52	-	AMT	1916 Jul 28  0:01     # Athens MT
+			1:34:52	-	AMT	1916 Jul 28  0:01 # Athens Mean Time
 			2:00	Greece	EE%sT	1941 Apr 30
 			1:00	Greece	CE%sT	1944 Apr  4
 			2:00	Greece	EE%sT	1981
@@ -1352,7 +1352,7 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 			1:00	C-Eur	CE%sT	1918
 			1:00	Hungary	CE%sT	1941 Apr  8
 			1:00	C-Eur	CE%sT	1945
-			1:00	Hungary	CE%sT	1980 Sep 28   2:00s
+			1:00	Hungary	CE%sT	1980 Sep 28  2:00s
 			1:00	EU	CE%sT
 
 # Iceland
@@ -1489,7 +1489,7 @@ Rule	Italy	1978	only	-	Oct	 1	0:00s	0	-
 Rule	Italy	1979	only	-	Sep	30	0:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
-			0:49:56	-	RMT	1893 Nov  1 0:00s # Rome Mean
+			0:49:56	-	RMT	1893 Nov  1  0:00s # Rome Mean
 			1:00	Italy	CE%sT	1942 Nov  2  2:00s
 			1:00	C-Eur	CE%sT	1944 Jul
 			1:00	Italy	CE%sT	1980
@@ -1565,8 +1565,8 @@ Rule	Latvia	1989	1996	-	Sep	lastSun	 2:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Riga	1:36:34	-	LMT	1880
-			1:36:34	-	RMT	1918 Apr 15  2:00 #Riga Mean Time
-			1:36:34	1:00	LST	1918 Sep 16  3:00 #Latvian Summer
+			1:36:34	-	RMT	1918 Apr 15  2:00 # Riga Mean Time
+			1:36:34	1:00	LST	1918 Sep 16  3:00 # Latvian Summer
 			1:36:34	-	RMT	1919 Apr  1  2:00
 			1:36:34	1:00	LST	1919 May 22  3:00
 			1:36:34	-	RMT	1926 May 11
@@ -1632,7 +1632,7 @@ Link Europe/Zurich Europe/Vaduz
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Vilnius	1:41:16	-	LMT	1880
-			1:24:00	-	WMT	1917	    # Warsaw Mean Time
+			1:24:00	-	WMT	1917 # Warsaw Mean Time
 			1:35:36	-	KMT	1919 Oct 10 # Kaunas Mean Time
 			1:00	-	CET	1920 Jul 12
 			2:00	-	EET	1920 Oct  9
@@ -1696,7 +1696,7 @@ Rule	Malta	1975	1979	-	Apr	Sun>=15	2:00	1:00	S
 Rule	Malta	1975	1980	-	Sep	Sun>=15	2:00	0	-
 Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2 0:00s # Valletta
+Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
 			1:00	Italy	CE%sT	1942 Nov  2  2:00s
 			1:00	C-Eur	CE%sT	1945 Apr  2  2:00s
 			1:00	Italy	CE%sT	1973 Mar 31
@@ -1764,7 +1764,7 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 # more precise 0:09:21.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
-			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
+			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
 			0:00	France	WE%sT	1945 Sep 16  3:00
 			1:00	France	CE%sT	1977
 			1:00	EU	CE%sT
@@ -1950,7 +1950,7 @@ Rule	Poland	1961	1964	-	May	lastSun	1:00s	1:00	S
 Rule	Poland	1962	1964	-	Sep	lastSun	1:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Warsaw	1:24:00 -	LMT	1880
-			1:24:00	-	WMT	1915 Aug  5   # Warsaw Mean Time
+			1:24:00	-	WMT	1915 Aug  5 # Warsaw Mean Time
 			1:00	C-Eur	CE%sT	1918 Sep 16  3:00
 			2:00	Poland	EE%sT	1922 Jun
 			1:00	Poland	CE%sT	1940 Jun 23  2:00
@@ -2051,22 +2051,22 @@ Rule	Port	1983	only	-	Mar	lastSun	 2:00s	1:00	S
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Lisbon	-0:36:45 -	LMT	1884
-			-0:36:45 -	LMT	1912 Jan  1  # Lisbon Mean Time
+			-0:36:45 -	LMT	1912 Jan  1 # Lisbon Mean Time
 			 0:00	Port	WE%sT	1966 Apr  3  2:00
 			 1:00	-	CET	1976 Sep 26  1:00
 			 0:00	Port	WE%sT	1983 Sep 25  1:00s
 			 0:00	W-Eur	WE%sT	1992 Sep 27  1:00s
 			 1:00	EU	CE%sT	1996 Mar 31  1:00u
 			 0:00	EU	WE%sT
-Zone Atlantic/Azores	-1:42:40 -	LMT	1884		# Ponta Delgada
-			-1:54:32 -	HMT	1912 Jan  1  # Horta Mean Time
+Zone Atlantic/Azores	-1:42:40 -	LMT	1884 # Ponta Delgada
+			-1:54:32 -	HMT	1912 Jan  1 # Horta Mean Time
 			-2:00	Port	AZO%sT	1966 Apr  3  2:00 # Azores Time
 			-1:00	Port	AZO%sT	1983 Sep 25  1:00s
 			-1:00	W-Eur	AZO%sT	1992 Sep 27  1:00s
 			 0:00	EU	WE%sT	1993 Mar 28  1:00u
 			-1:00	EU	AZO%sT
-Zone Atlantic/Madeira	-1:07:36 -	LMT	1884		# Funchal
-			-1:07:36 -	FMT	1912 Jan  1  # Funchal Mean Time
+Zone Atlantic/Madeira	-1:07:36 -	LMT	1884 # Funchal
+			-1:07:36 -	FMT	1912 Jan  1 # Funchal Mean Time
 			-1:00	Port	MAD%sT	1966 Apr  3  2:00 # Madeira Time
 			 0:00	Port	WE%sT	1983 Sep 25  1:00s
 			 0:00	EU	WE%sT
@@ -2092,7 +2092,7 @@ Rule	Romania	1991	1993	-	Mar	lastSun	 0:00s	1:00	S
 Rule	Romania	1991	1993	-	Sep	lastSun	 0:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
-			1:44:24	-	BMT	1931 Jul 24	# Bucharest MT
+			1:44:24	-	BMT	1931 Jul 24 # Bucharest Mean Time
 			2:00	Romania	EE%sT	1981 Mar 29  2:00s
 			2:00	C-Eur	EE%sT	1991
 			2:00	Romania	EE%sT	1994
@@ -2377,7 +2377,7 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
 			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
 			 4:00	-	STAT	1961 Nov 11
-			 4:00	Russia	VOL%sT	1989 Mar 26 2:00s # Volgograd T
+			 4:00	Russia	VOL%sT	1989 Mar 26  2:00s # Volgograd T
 			 3:00	Russia	VOL%sT	1991 Mar 31  2:00s
 			 4:00	-	VOLT	1992 Mar 29  2:00s
 			 3:00	Russia	MSK	2011 Mar 27  2:00s
@@ -2395,11 +2395,11 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  2:00
 			 3:00	-	SAMT	1930 Jun 21
 			 4:00	-	SAMT	1935 Jan 27
-			 4:00	Russia	KUY%sT	1989 Mar 26 2:00s # Kuybyshev
+			 4:00	Russia	KUY%sT	1989 Mar 26  2:00s # Kuybyshev
 			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
 			 2:00	Russia	EE%sT	1991 Sep 29  2:00s
 			 3:00	-	KUYT	1991 Oct 20  3:00
-			 4:00	Russia	SAM%sT	2010 Mar 28 2:00s # Samara Time
+			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s # Samara Time
 			 3:00	Russia	SAM%sT	2011 Mar 27  2:00s
 			 4:00	-	SAMT
 
@@ -2504,7 +2504,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	1920 Jan  6
 			 7:00	Russia	KRA%sT	1991 Mar 31  2:00s
 			 6:00	Russia	KRA%sT	1992 Jan 19  2:00s
 			 7:00	Russia	KRA%sT	2010 Mar 28  2:00s
-			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s # Novosibirsk T
+			 6:00	Russia	NOV%sT	2011 Mar 27  2:00s # Novosibirsk T
 			 7:00	-	NOVT	2014 Oct 26  2:00s
 			 7:00	-	KRAT	# Krasnoyarsk Time
 
@@ -2655,7 +2655,7 @@ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
 			 8:00	Russia	YAK%sT	1992 Jan 19  2:00s
 			 9:00	Russia	YAK%sT	2004
 			10:00	Russia	VLA%sT	2011 Mar 27  2:00s
-			11:00	-	VLAT	2011 Sep 13 0:00s # Decree 725?
+			11:00	-	VLAT	2011 Sep 13  0:00s # Decree 725?
 			10:00	-	YAKT	2014 Oct 26  2:00s
 			 9:00	-	YAKT
 
@@ -2771,7 +2771,7 @@ Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
 			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
 			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
 			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
-			12:00	-	MAGT	2011 Sep 13 0:00s # Decree 725?
+			12:00	-	MAGT	2011 Sep 13  0:00s # Decree 725?
 			11:00	-	VLAT	2014 Oct 26  2:00s
 			10:00	-	VLAT
 
@@ -2817,7 +2817,7 @@ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 			1:00	-	CET	1941 Apr 18 23:00
 			1:00	C-Eur	CE%sT	1945
 			1:00	-	CET	1945 May  8  2:00s
-			1:00	1:00	CEST	1945 Sep 16   2:00s
+			1:00	1:00	CEST	1945 Sep 16  2:00s
 # Metod Koželj reports that the legal date of
 # transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
 # Shanks & Pottenger don't give as much detail, so go with Koželj.
@@ -2887,7 +2887,7 @@ Rule SpainAfrica 1977	only	-	Sep	28	 0:00	0	-
 Rule SpainAfrica 1978	only	-	Jun	 1	 0:00	1:00	S
 Rule SpainAfrica 1978	only	-	Aug	 4	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Madrid	-0:14:44 -	LMT	1901 Jan  1   0:00s
+Zone	Europe/Madrid	-0:14:44 -	LMT	1901 Jan  1  0:00s
 			 0:00	Spain	WE%sT	1946 Sep 30
 			 1:00	Spain	CE%sT	1979
 			 1:00	EU	CE%sT
@@ -2896,7 +2896,7 @@ Zone	Africa/Ceuta	-0:21:16 -	LMT	1901
 			 0:00	1:00	WEST	1918 Oct  7 23:00
 			 0:00	-	WET	1924
 			 0:00	Spain	WE%sT	1929
-			 0:00 SpainAfrica WE%sT 1984 Mar 16
+			 0:00 SpainAfrica WE%sT	1984 Mar 16
 			 1:00	-	CET	1986
 			 1:00	EU	CE%sT
 Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
@@ -2955,7 +2955,7 @@ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
-			1:00:14	-	SET	1900 Jan  1	# Swedish Time
+			1:00:14	-	SET	1900 Jan  1 # Swedish Time
 			1:00	-	CET	1916 May 14 23:00
 			1:00	1:00	CEST	1916 Oct  1  1:00
 			1:00	-	CET	1980
diff --git a/northamerica b/northamerica
index 5116c47..baa309d 100644
--- a/northamerica
+++ b/northamerica
@@ -341,7 +341,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
 # Jones, Mellette, and Todd Counties in South Dakota;
 # but in practice these other counties were already observing central time.
 # See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
+Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
 			-7:00	US	M%sT	2003 Oct 26  2:00
 			-6:00	US	C%sT
 
@@ -359,7 +359,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
 # at 47 degrees 15' 51" N, 101 degrees 46' 40" W, which yields an offset
 # of 6h47'07".
 
-Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
+Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
 			-7:00	US	M%sT	2010 Nov  7  2:00
 			-6:00	US	C%sT
 
@@ -589,12 +589,12 @@ Zone America/Adak	 12:13:21 -	LMT	1867 Oct 18
 # Note that 1933-05-21 was a Sunday.
 # We're left to guess the time of day when Act 163 was approved; guess noon.
 
-Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 #Schmitt&Cox
-			-10:30	-	HST	1933 Apr 30  2:00 #Laws 1933
-			-10:30	1:00	HDT	1933 May 21 12:00 #Laws 1933+12
-			-10:30	-	HST	1942 Feb  9  2:00 #Schmitt&Cox+2
-			-10:30	1:00	HDT	1945 Sep 30  2:00 #Schmitt&Cox+2
-			-10:30	-	HST	1947 Jun  8  2:00 #Schmitt&Cox+2
+Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 # Schmitt&Cox
+			-10:30	-	HST	1933 Apr 30  2:00 # Laws 1933
+			-10:30	1:00	HDT	1933 May 21 12:00 # Laws 1933+12
+			-10:30	-	HST	1942 Feb  9  2:00 # Schmitt&Cox+2
+			-10:30	1:00	HDT	1945 Sep 30  2:00 # Schmitt&Cox+2
+			-10:30	-	HST	1947 Jun  8  2:00 # Schmitt&Cox+2
 			-10:00	-	HST
 
 Link Pacific/Honolulu Pacific/Johnston
@@ -704,7 +704,7 @@ Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
 Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
 Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
+Zone America/Indiana/Indianapolis -5:44:38 - LMT	1883 Nov 18 12:15:22
 			-6:00	US	C%sT	1920
 			-6:00 Indianapolis C%sT	1942
 			-6:00	US	C%sT	1946
@@ -2330,7 +2330,7 @@ Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
 			-6:00	US	C%sT	1989
 			-6:00	Mexico	C%sT
 # Central Mexico
-Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1 0:23:24
+Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
 			-7:00	-	MST	1927 Jun 10 23:00
 			-6:00	-	CST	1930 Nov 15
 			-7:00	-	MST	1931 May  1 23:00
@@ -2340,7 +2340,7 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1 0:23:24
 			-6:00	-	CST	2002 Feb 20
 			-6:00	Mexico	C%sT
 # Chihuahua (near US border)
-Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan 1 0:02:20
+Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
 			-7:00	-	MST	1927 Jun 10 23:00
 			-6:00	-	CST	1930 Nov 15
 			-7:00	-	MST	1931 May  1 23:00
@@ -2520,8 +2520,8 @@ Rule	Barb	1978	1980	-	Apr	Sun>=15	2:00	1:00	D
 Rule	Barb	1979	only	-	Sep	30	2:00	0	S
 Rule	Barb	1980	only	-	Sep	25	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Barbados	-3:58:29 -	LMT	1924		# Bridgetown
-			-3:58:29 -	BMT	1932	  # Bridgetown Mean Time
+Zone America/Barbados	-3:58:29 -	LMT	1924 # Bridgetown
+			-3:58:29 -	BMT	1932 # Bridgetown Mean Time
 			-4:00	Barb	A%sT
 
 # Belize
@@ -2551,15 +2551,15 @@ Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
 # http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1  2:00    # Hamilton
+Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1  2:00 # Hamilton
 			-4:00	-	AST	1974 Apr 28  2:00
 			-4:00	Canada	A%sT	1976
 			-4:00	US	A%sT
 
 # Cayman Is
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+Zone	America/Cayman	-5:25:32 -	LMT	1890 # Georgetown
+			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
 			-5:00	-	EST
 
 # Costa Rica
@@ -2576,7 +2576,7 @@ Rule	CR	1991	only	-	Jul	 1	0:00	0	S
 Rule	CR	1992	only	-	Mar	15	0:00	0	S
 # There are too many San Josés elsewhere, so we'll use 'Costa Rica'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Costa_Rica	-5:36:13 -	LMT	1890		# San José
+Zone America/Costa_Rica	-5:36:13 -	LMT	1890 # San José
 			-5:36:13 -	SJMT	1921 Jan 15 # San José Mean Time
 			-6:00	CR	C%sT
 # Coco
@@ -2832,7 +2832,7 @@ Rule	Salv	1987	1988	-	Sep	lastSun	0:00	0	S
 # There are too many San Salvadors elsewhere, so use America/El_Salvador
 # instead of America/San_Salvador.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/El_Salvador -5:56:48 -	LMT	1921		# San Salvador
+Zone America/El_Salvador -5:56:48 -	LMT	1921 # San Salvador
 			-6:00	Salv	C%sT
 
 # Grenada
@@ -2985,16 +2985,16 @@ Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
 # unspecified official document, and says "This time is used throughout the
 # island".  Go with Milne.  Round to the nearest second as required by zic.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Jamaica	-5:07:11 -	LMT	1890		# Kingston
-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+Zone	America/Jamaica	-5:07:11 -	LMT	1890 # Kingston
+			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
 			-5:00	-	EST	1974 Apr 28  2:00
 			-5:00	US	E%sT	1984
 			-5:00	-	EST
 
 # Martinique
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Martinique	-4:04:20 -      LMT	1890		# Fort-de-France
-			-4:04:20 -	FFMT	1911 May     # Fort-de-France MT
+Zone America/Martinique	-4:04:20 -      LMT	1890 # Fort-de-France
+			-4:04:20 -	FFMT	1911 May # Fort-de-France MT
 			-4:00	-	AST	1980 Apr  6
 			-4:00	1:00	ADT	1980 Sep 28
 			-4:00	-	AST
@@ -3070,13 +3070,13 @@ Zone	America/Managua	-5:45:08 -	LMT	1890
 # Panama
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Panama	-5:18:08 -	LMT	1890
-			-5:19:36 -	CMT	1908 Apr 22   # Colón Mean Time
+			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
 			-5:00	-	EST
 
 # Puerto Rico
 # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
+Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00 # San Juan
 			-4:00	-	AST	1942 May  3
 			-4:00	US	A%sT	1946
 			-4:00	-	AST
@@ -3088,7 +3088,7 @@ Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
 # St Pierre and Miquelon
 # There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15	# St Pierre
+Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
 			-4:00	-	AST	1980 May
 			-3:00	-	PMST	1987 # Pierre & Miquelon Time
 			-3:00	Canada	PM%sT
@@ -3124,7 +3124,7 @@ Rule	TC	2007	max	-	Mar	Sun>=8	2:00	1:00	D
 Rule	TC	2007	max	-	Nov	Sun>=1	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Grand_Turk	-4:44:32 -	LMT	1890
-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
 			-5:00	TC	E%sT
 
 # British Virgin Is
diff --git a/southamerica b/southamerica
index a6cbdd5..53db706 100644
--- a/southamerica
+++ b/southamerica
@@ -430,7 +430,7 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),
-Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
+Zone America/Argentina/Buenos_Aires -3:53:48 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
 			-4:00	-	ART	1930 Dec
 			-4:00	Arg	AR%sT	1969 Oct  5
@@ -581,7 +581,7 @@ Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-3:00	-	ART
 #
 # Santa Cruz (SC)
-Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
+Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
 			-4:00	-	ART	1930 Dec
 			-4:00	Arg	AR%sT	1969 Oct  5
@@ -593,7 +593,7 @@ Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
 			-3:00	-	ART
 #
 # Tierra del Fuego, Antártida e Islas del Atlántico Sur (TF)
-Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
+Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May # Córdoba Mean Time
 			-4:00	-	ART	1930 Dec
 			-4:00	Arg	AR%sT	1969 Oct  5
@@ -1253,7 +1253,7 @@ Rule	Chile	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Santiago	-4:42:46 -	LMT	1890
-			-4:42:46 -	SMT	1910	    # Santiago Mean Time
+			-4:42:46 -	SMT	1910 # Santiago Mean Time
 			-5:00	-	CLT	1916 Jul  1 # Chile Time
 			-4:42:46 -	SMT	1918 Sep  1 # Santiago Mean Time
 			-4:00	-	CLT	1919 Jul  1 # Chile Time
@@ -1261,7 +1261,7 @@ Zone America/Santiago	-4:42:46 -	LMT	1890
 			-5:00	Chile	CL%sT	1947 May 22 # Chile Time
 			-4:00	Chile	CL%sT
 Zone Pacific/Easter	-7:17:44 -	LMT	1890
-			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
+			-7:17:28 -	EMT	1932 Sep # Easter Mean Time
 			-7:00	Chile	EAS%sT	1982 Mar 13 21:00 # Easter I Time
 			-6:00	Chile	EAS%sT
 #
@@ -1303,7 +1303,7 @@ Zone	America/Bogota	-4:56:16 -	LMT	1884 Mar 13
 # though, as far as we know.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12	# Willemstad
+Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12 # Willemstad
 			-4:30	-	ANT	1965 # Netherlands Antilles Time
 			-4:00	-	AST
 
@@ -1430,8 +1430,8 @@ Rule	Falk	2001	2010	-	Apr	Sun>=15	2:00	0	-
 Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
-			-3:51:24 -	SMT	1912 Mar 12  # Stanley Mean Time
-			-4:00	Falk	FK%sT	1983 May     # Falkland Is Time
+			-3:51:24 -	SMT	1912 Mar 12 # Stanley Mean Time
+			-4:00	Falk	FK%sT	1983 May # Falkland Is Time
 			-3:00	Falk	FK%sT	1985 Sep 15
 			-4:00	Falk	FK%sT	2010 Sep  5  2:00
 			-3:00	-	FKST
@@ -1444,7 +1444,7 @@ Zone America/Cayenne	-3:29:20 -	LMT	1911 Jul
 
 # Guyana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
+Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar # Georgetown
 			-3:45	-	GBGT	1966 May 26 # Br Guiana Time
 			-3:45	-	GYT	1975 Jul 31 # Guyana Time
 			-3:00	-	GYT	1991
@@ -1574,7 +1574,7 @@ Zone	America/Lima	-5:08:12 -	LMT	1890
 
 # South Georgia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890		# Grytviken
+Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890 # Grytviken
 			-2:00	-	GST	# South Georgia Time
 
 # South Sandwich Is
@@ -1583,7 +1583,7 @@ Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890		# Grytviken
 # Suriname
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Paramaribo	-3:40:40 -	LMT	1911
-			-3:40:52 -	PMT	1935     # Paramaribo Mean Time
+			-3:40:52 -	PMT	1935 # Paramaribo Mean Time
 			-3:40:36 -	PMT	1945 Oct # The capital moved?
 			-3:30	-	NEGT	1975 Nov 20 # Dutch Guiana Time
 			-3:30	-	SRT	1984 Oct # Suriname Time
@@ -1680,8 +1680,8 @@ Rule	Uruguay	2006	max	-	Oct	Sun>=1	 2:00	1:00	S
 Rule	Uruguay	2007	max	-	Mar	Sun>=8	 2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
-			-3:44:44 -	MMT	1920 May  1	# Montevideo MT
-			-3:30	Uruguay	UY%sT	1942 Dec 14	# Uruguay Time
+			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
+			-3:30	Uruguay	UY%sT	1942 Dec 14 # Uruguay Time
 			-3:00	Uruguay	UY%sT
 
 # Venezuela
@@ -1697,6 +1697,6 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
-			-4:30	-	VET	1965	     # Venezuela Time
+			-4:30	-	VET	1965 # Venezuela Time
 			-4:00	-	VET	2007 Dec  9  3:00
 			-4:30	-	VET
-- 
1.7.9
-------------- next part --------------
From 98566d759b3a87ce4a1c25631cc1ec8fdd4f4c65 Mon Sep 17 00:00:00 2001
From: Tim Parenti <tim at timtimeonline.com>
Date: Wed, 13 Aug 2014 13:38:47 -0400
Subject: Rename fields of Link lines for clarity.

* zic.8, zoneinfo2tdf.pl: Change names of Link line fields to be more
descriptive and more like the parameters of 'ln'.  LINK-FROM becomes
TARGET, and LINK-TO becomes LINK-NAME.
* africa, asia, australasia, backward, backzone, etcetera, europe,
northamerica, southamerica: Add '# Link' lines and a few '# Zone' lines
where needed.
* NEWS: Document this.
---
 NEWS            |    4 ++++
 africa          |    3 +++
 asia            |    1 +
 australasia     |    1 +
 backward        |    1 +
 backzone        |    8 ++++++++
 etcetera        |    2 ++
 europe          |   11 +++++++++++
 northamerica    |    4 +++-
 southamerica    |    3 +++
 zic.8           |    9 +++++----
 zoneinfo2tdf.pl |    2 +-
 12 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 8cb840d..51ce694 100644
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,10 @@ Unreleased, experimental changes
     A new file CONTRIBUTING is distributed.  (Thanks to Tim Parenti for
     suggesting a CONTRIBUTING file, and to Walter Harms for debugging it.)
 
+    The fields in Link lines have been renamed to be more descriptive
+    and more like the parameters of 'ln'.  LINK-FROM has become TARGET,
+    and LINK-TO has become LINK-NAME.
+
     tz-link.htm mentions Windows Runtime etc. (thanks to Matt Johnson)
     and HP-UX's tztab.
 
diff --git a/africa b/africa
index 6274125..21366ff 100644
--- a/africa
+++ b/africa
@@ -173,6 +173,7 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+# Link	TARGET		LINK-NAME
 Link Africa/Abidjan Africa/Bamako	# Mali
 Link Africa/Abidjan Africa/Banjul	# Gambia
 Link Africa/Abidjan Africa/Conakry	# Guinea
@@ -1001,6 +1002,7 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
+# Link	TARGET		LINK-NAME
 Link Africa/Lagos Africa/Bangui	     # Central African Republic
 Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
 Link Africa/Lagos Africa/Douala	     # Cameroon
@@ -1101,6 +1103,7 @@ Zone	Africa/Khartoum	2:10:08 -	LMT	1931
 			3:00	-	EAT
 
 # South Sudan
+# Link	TARGET		LINK-NAME
 Link Africa/Khartoum Africa/Juba
 
 # Swaziland
diff --git a/asia b/asia
index e07e9d0..827afbc 100644
--- a/asia
+++ b/asia
@@ -795,6 +795,7 @@ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
 
 # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
 # However, for various reasons many users expect to find it under Europe.
+# Link	TARGET		LINK-NAME
 Link	Asia/Nicosia	Europe/Nicosia
 
 # Georgia
diff --git a/australasia b/australasia
index e41162d..1272d6c 100644
--- a/australasia
+++ b/australasia
@@ -470,6 +470,7 @@ Zone Pacific/Chatham	12:13:48 -	LMT	1868 Nov  2
 			12:15	-	CHAST	1946 Jan  1
 			12:45	Chatham	CHA%sT
 
+# Link	TARGET		LINK-NAME
 Link Pacific/Auckland Antarctica/McMurdo
 
 # Auckland Is
diff --git a/backward b/backward
index 36f6aba..d7d9e2e 100644
--- a/backward
+++ b/backward
@@ -4,6 +4,7 @@
 # This file provides links between current names for time zones
 # and their old names.  Many names changed in late 1993.
 
+# Link	TARGET		LINK-NAME
 Link	Africa/Asmara		Africa/Asmera
 Link	Africa/Abidjan		Africa/Timbuktu
 Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
diff --git a/backzone b/backzone
index bd6b48b..22cf4db 100644
--- a/backzone
+++ b/backzone
@@ -39,6 +39,7 @@
 # commentary and rules associated with the entry.
 
 # Mali (southern)
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Bamako	-0:32:00 -	LMT	1912
 			 0:00	-	GMT	1934 Feb 26
 			-1:00	-	WAT	1960 Jun 20
@@ -84,6 +85,7 @@ Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
 Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
 Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
 Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Freetown	-0:53:00 -	LMT	1882
 			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
 			-1:00	SL	%s	1957
@@ -166,6 +168,7 @@ Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar  2
 
 # Chubut, Argentina
 # The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit.
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
 			-4:00	-	ART	1930 Dec
@@ -261,6 +264,7 @@ Link Antarctica/McMurdo Antarctica/South_Pole
 # China
 # Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
 # Heilongjiang (except Mohe county), Jilin
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Harbin	8:26:44	-	LMT	1928 # or Haerbin
 			8:30	-	CHAT	1932 Mar # Changbai Time
 			8:00	-	CST	1940
@@ -277,9 +281,11 @@ Zone	Asia/Harbin	8:26:44	-	LMT	1928 # or Haerbin
 Zone	Asia/Chongqing	7:06:20	-	LMT	1928 # or Chungking
 			7:00	-	LONT	1980 May # Long-shu Time
 			8:00	PRC	C%sT
+# Link	TARGET		LINK-NAME
 Link Asia/Chongqing Asia/Chungking
 
 # far west China
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # or Kashi or Kaxgar
 			5:30	-	KAST	1940 # Kashgar Time
 			5:00	-	KAST	1980 May
@@ -300,6 +306,7 @@ Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
 			 0:00	-	GMT
 
 # Northern Ireland
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
 			-0:25:21 -	DMT	1916 May 21  2:00
 						# DMT = Dublin/Dunsink MT
@@ -406,4 +413,5 @@ Zone	Europe/Zagreb	1:03:52	-	LMT	1884
 			1:00	EU	CE%sT
 
 # US minor outlying islands
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Johnston	-10:00	-	HST
diff --git a/etcetera b/etcetera
index c2e2532..00687a8 100644
--- a/etcetera
+++ b/etcetera
@@ -16,6 +16,8 @@ Zone	Etc/UCT		0	-	UCT
 # but it belongs here, not in the file 'backward',
 # as functions like gmtime load the "GMT" file to handle leap seconds properly.
 # We want this to work even on installations that omit the other older names.
+#
+# Link	TARGET		LINK-NAME
 Link	Etc/GMT				GMT
 
 Link	Etc/UTC				Etc/Universal
diff --git a/europe b/europe
index 248e304..2a6d3ba 100644
--- a/europe
+++ b/europe
@@ -455,9 +455,11 @@ Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1  0:00s
 			 1:00	-	BST	1971 Oct 31  2:00u
 			 0:00	GB-Eire	%s	1996
 			 0:00	EU	GMT/BST
+# Link	TARGET		LINK-NAME
 Link	Europe/London	Europe/Jersey
 Link	Europe/London	Europe/Guernsey
 Link	Europe/London	Europe/Isle_of_Man
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
 			-0:25:21 -	DMT	1916 May 21  2:00
 			-0:25:21 1:00	IST	1916 Oct  1  2:00s
@@ -1120,6 +1122,7 @@ Zone	Europe/Helsinki	1:39:49 -	LMT	1878 May 31
 			2:00	EU	EE%sT
 
 # Ã…land Is
+# Link	TARGET		LINK-NAME
 Link	Europe/Helsinki	Europe/Mariehamn
 
 
@@ -1271,6 +1274,7 @@ Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
 # From Arthur David Olson (2012-03-03):
 # Büsingen and Zurich have shared clocks since 1970.
 
+# Link	TARGET		LINK-NAME
 Link	Europe/Zurich	Europe/Busingen
 
 # Georgia
@@ -1495,6 +1499,7 @@ Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
 			1:00	Italy	CE%sT	1980
 			1:00	EU	CE%sT
 
+# Link	TARGET		LINK-NAME
 Link	Europe/Rome	Europe/Vatican
 Link	Europe/Rome	Europe/San_Marino
 
@@ -1595,6 +1600,7 @@ Zone	Europe/Riga	1:36:34	-	LMT	1880
 #    From a report of the duke's government to the high council,
 #    regarding the introduction of a time law, of 31 May 1977.
 
+# Link	TARGET		LINK-NAME
 Link Europe/Zurich Europe/Vaduz
 
 
@@ -1911,6 +1917,8 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895 Jan  1
 #
 # All these events predate our cutoff date of 1970, so use Europe/Oslo
 # for these regions.
+
+# Link	TARGET		LINK-NAME
 Link	Europe/Oslo	Arctic/Longyearbyen
 
 # Poland
@@ -2823,6 +2831,7 @@ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 # Shanks & Pottenger don't give as much detail, so go with Koželj.
 			1:00	-	CET	1982 Nov 27
 			1:00	EU	CE%sT
+# Link	TARGET		LINK-NAME
 Link Europe/Belgrade Europe/Ljubljana	# Slovenia
 Link Europe/Belgrade Europe/Podgorica	# Montenegro
 Link Europe/Belgrade Europe/Sarajevo	# Bosnia and Herzegovina
@@ -2830,6 +2839,7 @@ Link Europe/Belgrade Europe/Skopje	# Macedonia
 Link Europe/Belgrade Europe/Zagreb	# Croatia
 
 # Slovakia
+# Link	TARGET		LINK-NAME
 Link Europe/Prague Europe/Bratislava
 
 # Slovenia
@@ -3185,6 +3195,7 @@ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
 			2:00	EU	EE%sT	2014 Mar 30  1:00u
 			2:00	-	EET	2014 Mar 31  1:00u
 			2:00	EU	EE%sT
+# Link	TARGET		LINK-NAME
 Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 
 # Ukraine
diff --git a/northamerica b/northamerica
index baa309d..9546989 100644
--- a/northamerica
+++ b/northamerica
@@ -589,6 +589,7 @@ Zone America/Adak	 12:13:21 -	LMT	1867 Oct 18
 # Note that 1933-05-21 was a Sunday.
 # We're left to guess the time of day when Act 163 was approved; guess noon.
 
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 # Schmitt&Cox
 			-10:30	-	HST	1933 Apr 30  2:00 # Laws 1933
 			-10:30	1:00	HDT	1933 May 21 12:00 # Laws 1933+12
@@ -596,7 +597,7 @@ Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 # Schmitt&Cox
 			-10:30	1:00	HDT	1945 Sep 30  2:00 # Schmitt&Cox+2
 			-10:30	-	HST	1947 Jun  8  2:00 # Schmitt&Cox+2
 			-10:00	-	HST
-
+# Link	TARGET		LINK-NAME
 Link Pacific/Honolulu Pacific/Johnston
 
 # Now we turn to US areas that have diverged from the consensus since 1970.
@@ -622,6 +623,7 @@ Link Pacific/Honolulu Pacific/Johnston
 # Shanks says the 1944 experiment came to an end on 1944-03-17.
 # Go with the Arizona State Library instead.
 
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 11:31:42
 			-7:00	US	M%sT	1944 Jan  1  0:01
 			-7:00	-	MST	1944 Apr  1  0:01
diff --git a/southamerica b/southamerica
index 53db706..4d53f8c 100644
--- a/southamerica
+++ b/southamerica
@@ -605,6 +605,7 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
 			-3:00	-	ART
 
 # Aruba
+# Link	TARGET		LINK-NAME
 Link America/Curacao America/Aruba
 
 # Bolivia
@@ -1312,6 +1313,7 @@ Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12 # Willemstad
 # The name "Lower Prince's Quarter" is both longer than fourteen characters
 # and contains an apostrophe; use "Lower_Princes" below.
 
+# Link	TARGET		LINK-NAME
 Link	America/Curacao	America/Lower_Princes	# Sint Maarten
 Link	America/Curacao	America/Kralendijk	# Caribbean Netherlands
 
@@ -1595,6 +1597,7 @@ Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 			-4:00	-	AST
 
 # These all agree with Trinidad and Tobago since 1970.
+# Link	TARGET		LINK-NAME
 Link America/Port_of_Spain America/Anguilla
 Link America/Port_of_Spain America/Dominica
 Link America/Port_of_Spain America/Grenada
diff --git a/zic.8 b/zic.8
index 2e5318a..2bca284 100644
--- a/zic.8
+++ b/zic.8
@@ -398,7 +398,7 @@ A link line has the form
 .nf
 .ti +.5i
 .ta \w'Link\0\0'u +\w'Europe/Istanbul\0\0'u
-Link	LINK-FROM	LINK-TO
+Link	TARGET	LINK-NAME
 .sp
 For example:
 .sp
@@ -407,12 +407,12 @@ Link	Europe/Istanbul	Asia/Istanbul
 .sp
 .fi
 The
-.B LINK-FROM
+.B TARGET
 field should appear as the
 .B NAME
 field in some zone line.
 The
-.B LINK-TO
+.B LINK-NAME
 field is used as an alternate name for that zone;
 it has the same syntax as a zone line's
 .B NAME
@@ -503,12 +503,13 @@ Zone	Europe/Zurich	0:34:08	\*-	LMT	1853 Jul 16
 		1:00	Swiss	CE%sT	1981
 		1:00	EU	CE%sT
 .sp
+.ta \w'# Link\0\0'u +\w'Europe/Zurich\0\0'u +\w'NAME\0\0'u
+# Link	TARGET	LINK-NAME
 Link	Europe/Zurich	Switzerland
 .sp
 .in
 .fi
 In this example, the zone is named Europe/Zurich but it has an alias
-
 as Switzerland.  This example says that Zurich was 34 minutes and 8
 seconds west of UT until 1853-07-16 at 00:00, when the legal offset
 was changed to 7\(de\|26\(fm\|22.50\(sd; although this works out to
diff --git a/zoneinfo2tdf.pl b/zoneinfo2tdf.pl
index c01d11a..e05ec01 100755
--- a/zoneinfo2tdf.pl
+++ b/zoneinfo2tdf.pl
@@ -40,7 +40,7 @@ while (<>) {
     # Rule  NAME  FROM  TO  TYPE  IN  ON  AT  SAVE  LETTER/S
     @fields == 10 or warn "bad rule line";
   } elsif ($type eq 'link') {
-    # Link  LINK-FROM  LINK-TO
+    # Link  TARGET  LINK-NAME
     @fields == 3 or warn "bad link line";
   } elsif ($type eq 'leap') {
     # Leap  YEAR  MONTH  DAY  HH:MM:SS  CORR  R/S
-- 
1.7.9
-------------- next part --------------
From 661c09c6c296b0644045329c6a77dddd6a192400 Mon Sep 17 00:00:00 2001
From: Tim Parenti <tim at timtimeonline.com>
Date: Wed, 13 Aug 2014 13:39:26 -0400
Subject: Use tabs in Link lines.

* backward: Also remove repeated tabs in Link lines here.
---
 africa       |   40 ++++++++++----------
 australasia  |    2 +-
 backward     |  119 +++++++++++++++++++++++++++++-----------------------------
 backzone     |    2 +-
 europe       |   14 +++---
 northamerica |    2 +-
 southamerica |   26 ++++++------
 7 files changed, 103 insertions(+), 102 deletions(-)

diff --git a/africa b/africa
index 21366ff..8c53060 100644
--- a/africa
+++ b/africa
@@ -174,16 +174,16 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
 # Link	TARGET		LINK-NAME
-Link Africa/Abidjan Africa/Bamako	# Mali
-Link Africa/Abidjan Africa/Banjul	# Gambia
-Link Africa/Abidjan Africa/Conakry	# Guinea
-Link Africa/Abidjan Africa/Dakar	# Senegal
-Link Africa/Abidjan Africa/Freetown	# Sierra Leone
-Link Africa/Abidjan Africa/Lome		# Togo
-Link Africa/Abidjan Africa/Nouakchott	# Mauritania
-Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
-Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
-Link Africa/Abidjan Atlantic/St_Helena	# St Helena
+Link	Africa/Abidjan	Africa/Bamako	# Mali
+Link	Africa/Abidjan	Africa/Banjul	# Gambia
+Link	Africa/Abidjan	Africa/Conakry	# Guinea
+Link	Africa/Abidjan	Africa/Dakar	# Senegal
+Link	Africa/Abidjan	Africa/Freetown	# Sierra Leone
+Link	Africa/Abidjan	Africa/Lome	# Togo
+Link	Africa/Abidjan	Africa/Nouakchott	# Mauritania
+Link	Africa/Abidjan	Africa/Ouagadougou	# Burkina Faso
+Link	Africa/Abidjan	Africa/Sao_Tome	# São Tomé and Príncipe
+Link	Africa/Abidjan	Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1003,15 +1003,15 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 # Link	TARGET		LINK-NAME
-Link Africa/Lagos Africa/Bangui	     # Central African Republic
-Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
-Link Africa/Lagos Africa/Douala	     # Cameroon
-Link Africa/Lagos Africa/Kinshasa    # Dem. Rep. of the Congo (west)
-Link Africa/Lagos Africa/Libreville  # Gabon
-Link Africa/Lagos Africa/Luanda	     # Angola
-Link Africa/Lagos Africa/Malabo	     # Equatorial Guinea
-Link Africa/Lagos Africa/Niamey	     # Niger
-Link Africa/Lagos Africa/Porto-Novo  # Benin
+Link	Africa/Lagos	Africa/Bangui	# Central African Republic
+Link	Africa/Lagos	Africa/Brazzaville	# Rep. of the Congo
+Link	Africa/Lagos	Africa/Douala	# Cameroon
+Link	Africa/Lagos	Africa/Kinshasa	# Dem. Rep. of the Congo (west)
+Link	Africa/Lagos	Africa/Libreville	# Gabon
+Link	Africa/Lagos	Africa/Luanda	# Angola
+Link	Africa/Lagos	Africa/Malabo	# Equatorial Guinea
+Link	Africa/Lagos	Africa/Niamey	# Niger
+Link	Africa/Lagos	Africa/Porto-Novo	# Benin
 
 # Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1104,7 +1104,7 @@ Zone	Africa/Khartoum	2:10:08 -	LMT	1931
 
 # South Sudan
 # Link	TARGET		LINK-NAME
-Link Africa/Khartoum Africa/Juba
+Link	Africa/Khartoum	Africa/Juba
 
 # Swaziland
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/australasia b/australasia
index 1272d6c..3b5a986 100644
--- a/australasia
+++ b/australasia
@@ -471,7 +471,7 @@ Zone Pacific/Chatham	12:13:48 -	LMT	1868 Nov  2
 			12:45	Chatham	CHA%sT
 
 # Link	TARGET		LINK-NAME
-Link Pacific/Auckland Antarctica/McMurdo
+Link	Pacific/Auckland	Antarctica/McMurdo
 
 # Auckland Is
 # uninhabited; M�ori and Moriori, colonial settlers, pastoralists, sealers,
diff --git a/backward b/backward
index d7d9e2e..f592cc7 100644
--- a/backward
+++ b/backward
@@ -4,16 +4,16 @@
 # This file provides links between current names for time zones
 # and their old names.  Many names changed in late 1993.
 
-# Link	TARGET		LINK-NAME
-Link	Africa/Asmara		Africa/Asmera
-Link	Africa/Abidjan		Africa/Timbuktu
+# Link	TARGET	LINK-NAME
+Link	Africa/Asmara	Africa/Asmera
+Link	Africa/Abidjan	Africa/Timbuktu
 Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
-Link	America/Adak		America/Atka
+Link	America/Adak	America/Atka
 Link	America/Argentina/Buenos_Aires	America/Buenos_Aires
 Link	America/Argentina/Catamarca	America/Catamarca
 Link	America/Atikokan	America/Coral_Harbour
 Link	America/Argentina/Cordoba	America/Cordoba
-Link	America/Tijuana		America/Ensenada
+Link	America/Tijuana	America/Ensenada
 Link	America/Indiana/Indianapolis	America/Fort_Wayne
 Link	America/Indiana/Indianapolis	America/Indianapolis
 Link	America/Argentina/Jujuy	America/Jujuy
@@ -22,7 +22,7 @@ Link	America/Kentucky/Louisville	America/Louisville
 Link	America/Argentina/Mendoza	America/Mendoza
 Link	America/Rio_Branco	America/Porto_Acre
 Link	America/Argentina/Cordoba	America/Rosario
-Link	America/Denver		America/Shiprock
+Link	America/Denver	America/Shiprock
 Link	America/Port_of_Spain	America/Virgin
 Link	Pacific/Auckland	Antarctica/South_Pole
 Link	Asia/Ashgabat		Asia/Ashkhabad
@@ -34,13 +34,14 @@ Link	Asia/Shanghai		Asia/Harbin
 Link	Asia/Urumqi		Asia/Kashgar
 Link	Asia/Kathmandu		Asia/Katmandu
 Link	Asia/Macau		Asia/Macao
+Link	Asia/Doha	Asia/Qatar
 Link	Asia/Ho_Chi_Minh	Asia/Saigon
-Link	Asia/Jerusalem		Asia/Tel_Aviv
-Link	Asia/Thimphu		Asia/Thimbu
-Link	Asia/Makassar		Asia/Ujung_Pandang
+Link	Asia/Jerusalem	Asia/Tel_Aviv
+Link	Asia/Thimphu	Asia/Thimbu
+Link	Asia/Makassar	Asia/Ujung_Pandang
 Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
-Link	Atlantic/Faroe		Atlantic/Faeroe
-Link	Europe/Oslo		Atlantic/Jan_Mayen
+Link	Atlantic/Faroe	Atlantic/Faeroe
+Link	Europe/Oslo	Atlantic/Jan_Mayen
 Link	Australia/Sydney	Australia/ACT
 Link	Australia/Sydney	Australia/Canberra
 Link	Australia/Lord_Howe	Australia/LHI
@@ -50,73 +51,73 @@ Link	Australia/Brisbane	Australia/Queensland
 Link	Australia/Adelaide	Australia/South
 Link	Australia/Hobart	Australia/Tasmania
 Link	Australia/Melbourne	Australia/Victoria
-Link	Australia/Perth		Australia/West
+Link	Australia/Perth	Australia/West
 Link	Australia/Broken_Hill	Australia/Yancowinna
 Link	America/Rio_Branco	Brazil/Acre
-Link	America/Noronha		Brazil/DeNoronha
+Link	America/Noronha	Brazil/DeNoronha
 Link	America/Sao_Paulo	Brazil/East
-Link	America/Manaus		Brazil/West
-Link	America/Halifax		Canada/Atlantic
+Link	America/Manaus	Brazil/West
+Link	America/Halifax	Canada/Atlantic
 Link	America/Winnipeg	Canada/Central
-Link	America/Regina		Canada/East-Saskatchewan
-Link	America/Toronto		Canada/Eastern
+Link	America/Regina	Canada/East-Saskatchewan
+Link	America/Toronto	Canada/Eastern
 Link	America/Edmonton	Canada/Mountain
 Link	America/St_Johns	Canada/Newfoundland
 Link	America/Vancouver	Canada/Pacific
-Link	America/Regina		Canada/Saskatchewan
+Link	America/Regina	Canada/Saskatchewan
 Link	America/Whitehorse	Canada/Yukon
 Link	America/Santiago	Chile/Continental
-Link	Pacific/Easter		Chile/EasterIsland
-Link	America/Havana		Cuba
-Link	Africa/Cairo		Egypt
-Link	Europe/Dublin		Eire
-Link	Europe/London		Europe/Belfast
-Link	Europe/Chisinau		Europe/Tiraspol
-Link	Europe/London		GB
-Link	Europe/London		GB-Eire
-Link	Etc/GMT			GMT+0
-Link	Etc/GMT			GMT-0
-Link	Etc/GMT			GMT0
-Link	Etc/GMT			Greenwich
-Link	Asia/Hong_Kong		Hongkong
+Link	Pacific/Easter	Chile/EasterIsland
+Link	America/Havana	Cuba
+Link	Africa/Cairo	Egypt
+Link	Europe/Dublin	Eire
+Link	Europe/London	Europe/Belfast
+Link	Europe/Chisinau	Europe/Tiraspol
+Link	Europe/London	GB
+Link	Europe/London	GB-Eire
+Link	Etc/GMT	GMT+0
+Link	Etc/GMT	GMT-0
+Link	Etc/GMT	GMT0
+Link	Etc/GMT	Greenwich
+Link	Asia/Hong_Kong	Hongkong
 Link	Atlantic/Reykjavik	Iceland
-Link	Asia/Tehran		Iran
-Link	Asia/Jerusalem		Israel
-Link	America/Jamaica		Jamaica
-Link	Asia/Tokyo		Japan
+Link	Asia/Tehran	Iran
+Link	Asia/Jerusalem	Israel
+Link	America/Jamaica	Jamaica
+Link	Asia/Tokyo	Japan
 Link	Pacific/Kwajalein	Kwajalein
-Link	Africa/Tripoli		Libya
-Link	America/Tijuana		Mexico/BajaNorte
+Link	Africa/Tripoli	Libya
+Link	America/Tijuana	Mexico/BajaNorte
 Link	America/Mazatlan	Mexico/BajaSur
 Link	America/Mexico_City	Mexico/General
 Link	Pacific/Auckland	NZ
-Link	Pacific/Chatham		NZ-CHAT
-Link	America/Denver		Navajo
-Link	Asia/Shanghai		PRC
-Link	Pacific/Pohnpei		Pacific/Ponape
+Link	Pacific/Chatham	NZ-CHAT
+Link	America/Denver	Navajo
+Link	Asia/Shanghai	PRC
+Link	Pacific/Pohnpei	Pacific/Ponape
 Link	Pacific/Pago_Pago	Pacific/Samoa
-Link	Pacific/Chuuk		Pacific/Truk
-Link	Pacific/Chuuk		Pacific/Yap
-Link	Europe/Warsaw		Poland
-Link	Europe/Lisbon		Portugal
-Link	Asia/Taipei		ROC
-Link	Asia/Seoul		ROK
-Link	Asia/Singapore		Singapore
-Link	Europe/Istanbul		Turkey
-Link	Etc/UCT			UCT
+Link	Pacific/Chuuk	Pacific/Truk
+Link	Pacific/Chuuk	Pacific/Yap
+Link	Europe/Warsaw	Poland
+Link	Europe/Lisbon	Portugal
+Link	Asia/Taipei	ROC
+Link	Asia/Seoul	ROK
+Link	Asia/Singapore	Singapore
+Link	Europe/Istanbul	Turkey
+Link	Etc/UCT	UCT
 Link	America/Anchorage	US/Alaska
-Link	America/Adak		US/Aleutian
-Link	America/Phoenix		US/Arizona
-Link	America/Chicago		US/Central
+Link	America/Adak	US/Aleutian
+Link	America/Phoenix	US/Arizona
+Link	America/Chicago	US/Central
 Link	America/Indiana/Indianapolis	US/East-Indiana
 Link	America/New_York	US/Eastern
 Link	Pacific/Honolulu	US/Hawaii
 Link	America/Indiana/Knox	US/Indiana-Starke
-Link	America/Detroit		US/Michigan
-Link	America/Denver		US/Mountain
+Link	America/Detroit	US/Michigan
+Link	America/Denver	US/Mountain
 Link	America/Los_Angeles	US/Pacific
 Link	Pacific/Pago_Pago	US/Samoa
-Link	Etc/UTC			UTC
-Link	Etc/UTC			Universal
-Link	Europe/Moscow		W-SU
-Link	Etc/UTC			Zulu
+Link	Etc/UTC	UTC
+Link	Etc/UTC	Universal
+Link	Europe/Moscow	W-SU
+Link	Etc/UTC	Zulu
diff --git a/backzone b/backzone
index 22cf4db..32cad98 100644
--- a/backzone
+++ b/backzone
@@ -282,7 +282,7 @@ Zone	Asia/Chongqing	7:06:20	-	LMT	1928 # or Chungking
 			7:00	-	LONT	1980 May # Long-shu Time
 			8:00	PRC	C%sT
 # Link	TARGET		LINK-NAME
-Link Asia/Chongqing Asia/Chungking
+Link	Asia/Chongqing	Asia/Chungking
 
 # far west China
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/europe b/europe
index 2a6d3ba..abafcb7 100644
--- a/europe
+++ b/europe
@@ -1601,7 +1601,7 @@ Zone	Europe/Riga	1:36:34	-	LMT	1880
 #    regarding the introduction of a time law, of 31 May 1977.
 
 # Link	TARGET		LINK-NAME
-Link Europe/Zurich Europe/Vaduz
+Link	Europe/Zurich	Europe/Vaduz
 
 
 # Lithuania
@@ -2832,15 +2832,15 @@ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 			1:00	-	CET	1982 Nov 27
 			1:00	EU	CE%sT
 # Link	TARGET		LINK-NAME
-Link Europe/Belgrade Europe/Ljubljana	# Slovenia
-Link Europe/Belgrade Europe/Podgorica	# Montenegro
-Link Europe/Belgrade Europe/Sarajevo	# Bosnia and Herzegovina
-Link Europe/Belgrade Europe/Skopje	# Macedonia
-Link Europe/Belgrade Europe/Zagreb	# Croatia
+Link	Europe/Belgrade	Europe/Ljubljana	# Slovenia
+Link	Europe/Belgrade	Europe/Podgorica	# Montenegro
+Link	Europe/Belgrade	Europe/Sarajevo	# Bosnia and Herzegovina
+Link	Europe/Belgrade	Europe/Skopje	# Macedonia
+Link	Europe/Belgrade	Europe/Zagreb	# Croatia
 
 # Slovakia
 # Link	TARGET		LINK-NAME
-Link Europe/Prague Europe/Bratislava
+Link	Europe/Prague	Europe/Bratislava
 
 # Slovenia
 # See Europe/Belgrade.
diff --git a/northamerica b/northamerica
index 9546989..2f805b1 100644
--- a/northamerica
+++ b/northamerica
@@ -598,7 +598,7 @@ Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 # Schmitt&Cox
 			-10:30	-	HST	1947 Jun  8  2:00 # Schmitt&Cox+2
 			-10:00	-	HST
 # Link	TARGET		LINK-NAME
-Link Pacific/Honolulu Pacific/Johnston
+Link	Pacific/Honolulu	Pacific/Johnston
 
 # Now we turn to US areas that have diverged from the consensus since 1970.
 
diff --git a/southamerica b/southamerica
index 4d53f8c..89bfe69 100644
--- a/southamerica
+++ b/southamerica
@@ -606,7 +606,7 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
 
 # Aruba
 # Link	TARGET		LINK-NAME
-Link America/Curacao America/Aruba
+Link	America/Curacao	America/Aruba
 
 # Bolivia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1598,18 +1598,18 @@ Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 
 # These all agree with Trinidad and Tobago since 1970.
 # Link	TARGET		LINK-NAME
-Link America/Port_of_Spain America/Anguilla
-Link America/Port_of_Spain America/Dominica
-Link America/Port_of_Spain America/Grenada
-Link America/Port_of_Spain America/Guadeloupe
-Link America/Port_of_Spain America/Marigot	# St Martin (French part)
-Link America/Port_of_Spain America/Montserrat
-Link America/Port_of_Spain America/St_Barthelemy # St Barthélemy
-Link America/Port_of_Spain America/St_Kitts	# St Kitts & Nevis
-Link America/Port_of_Spain America/St_Lucia
-Link America/Port_of_Spain America/St_Thomas	# Virgin Islands (US)
-Link America/Port_of_Spain America/St_Vincent
-Link America/Port_of_Spain America/Tortola	# Virgin Islands (UK)
+Link	America/Port_of_Spain	America/Anguilla
+Link	America/Port_of_Spain	America/Dominica
+Link	America/Port_of_Spain	America/Grenada
+Link	America/Port_of_Spain	America/Guadeloupe
+Link	America/Port_of_Spain	America/Marigot	# St Martin (French part)
+Link	America/Port_of_Spain	America/Montserrat
+Link	America/Port_of_Spain	America/St_Barthelemy	# St Barthélemy
+Link	America/Port_of_Spain	America/St_Kitts	# St Kitts & Nevis
+Link	America/Port_of_Spain	America/St_Lucia
+Link	America/Port_of_Spain	America/St_Thomas	# Virgin Islands (US)
+Link	America/Port_of_Spain	America/St_Vincent
+Link	America/Port_of_Spain	America/Tortola	# Virgin Islands (UK)
 
 # Uruguay
 # From Paul Eggert (1993-11-18):
-- 
1.7.9



More information about the tz mailing list