update from main archive 960909 cvs/libc-960910

Mon Sep  9 20:31:27 1996  Ulrich Drepper  <drepper@cygnus.com>

	* version.c (banner): Report to bug-glibc@prep not @gnu.
	Reported by Andreas Jaeger.

	* libio/stdio.h [!__USE_REENTRANT]: Don't define getc as
 	_IO_getc_unlocked.
	[__USE_REENTRANT]: Don't define

Mon Sep  9 15:59:32 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/strrchr.c: Fix bug where NUL byte is not recognized
	when it is the third byte in the string.  Reported by
	NIIBE Yutaka.
	* string/tester.c: Add tests for above bug to strlen, strchr, and
	strrchr tests.

Fri Sep  6 21:23:33 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/fpu/e_acos.c: Deansideclized.  Include
	"math_private.h" to get prototype.
	* sysdeps/m68k/fpu/e_fmod.c: Likewise.
	* sysdeps/m68k/fpu/k_cos.c: Likewise.
	* sysdeps/m68k/fpu/k_sin.c: Likewise.
	* sysdeps/m68k/fpu/k_tan.c: Likewise.

	* sysdeps/m68k/fpu/k_sin.c: Remove uneeded indirection of
	__m81_u.
	* sysdeps/m68k/fpu/k_tan.c: Likewise.

Sun Sep  1 18:01:35 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/fpu/__math.h: Check for __NO_M81_MATH_INLINES
	instead of __NO_MATH_INLINES.
	(__M81_MATH_INLINES): Renamed from __MATH_INLINES.
	* sysdeps/m68k/fpu/e_acos.c: Define __NO_M81_MATH_INLINES.
	* sysdeps/m68k/fpu/e_fmod.c: Likewise.
	* sysdeps/m68k/fpu/k_cos.c: Likewise.
	* sysdeps/m68k/fpu/k_sin.c: Likewise.
	* sysdeps/m68k/fpu/k_tan.c: Likewise.
	* sysdeps/m68k/fpu/s_atan.c: Likewise.
	* sysdeps/m68k/fpu/s_frexp.c: Likewise.
	* sysdeps/m68k/fpu/s_ilogb.c: Likewise.
	* sysdeps/m68k/fpu/s_isinf.c: Likewise.
	* sysdeps/m68k/fpu/s_ldexp.c: Likewise.
	* sysdeps/m68k/fpu/s_modf.c: Likewise.
	* sysdeps/m68k/fpu/k_cos.c: Use inline version of __cos.
	* sysdeps/m68k/fpu/k_sin.c: Likewise.
	* sysdeps/m68k/fpu/k_tan.c: Likewise.

Mon Sep  9 12:55:14 1996  Ulrich Drepper  <drepper@cygnus.com>

	* nss/nss_files/files-parse.c (INT_FIELD_MAYBE_NULL): Check for
	available character before converting number and return with
	error if none is available.

Fri Sep  6 22:09:08 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/init-first.h: New file, generic
	implementation for architectures where parameters are passed on
	stack.
	* sysdeps/unix/sysv/linux/m68k/init-first.h: Removed.
	* sysdeps/unix/sysv/linux/i386/init-first.h: Removed.

Fri Sep  6 22:05:32 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* configure.in: Remove unneeded sysnames frobbing.

Mon Sep  9 05:29:09 1996  Ulrich Drepper  <drepper@cygnus.com>

	* time/zic.c: Update from ADO 96l.
	* time/africa: Update from ADO 96k.
	* time/antarctica: Likewise.
	* time/asia: Likewise.
	* time/australia: Likewise.
	* time/europe: Likewise.
	* time/northamerica: Likewise.
	* time/southamerica: Likewise.

Mon Sep  9 05:03:47 1996  NIIBE Yutaka  <gniibe@mri.co.jp>

	* sysdeps/unix/sysv/linux/i386/init-first.h: Work around buggy
	gcc <= 2.7.2.1 which optimizes away address operations on weak
	objects.

	* nss/nss_files/files-parse.c (INT_FIELD_MAYBE_NULL): New macro.
	Like INT_FIELD but also accept non-existing field.
	* shadow/sgetspent_r.c (LINE_PARSER): Use INT_FIELD_MAYBE_NULL
	for last four fields.
	* shadow/putspent.c (putspent): Print `:' after numeric value.

Mon Sep  9 02:42:48 1996  Richard Henderson  <rth@tamu.edu>

	* libio/stdio.h (BUFSIZ): Define using _IO_BUFSIZ.

Sun Sep  8 16:43:56 1996  Ulrich Drepper  <drepper@cygnus.com>

	* Make-dist: Filter out $(add-ons) from $(subdirs).
	Don't distribute TAGS files.
	($(tardir).tar): Remove dist.tar when all is done.
	* manual/Makefile (distribute): Add libc.info*.
	* libio/Makefile (distribute): Add Banner.
	* inet/Makefile (headers): Add netinet/tcp.h.

	* resolv/Makefile (libresolv-routines): Add getnetnamadr.

	* crypt-README: Removed.
	* gnu-stabs.h: Removed.

	* sysdeps/alpha/copysign.S: Renamed to...
	* sysdeps/alpha/s_copysign.S: ...this.
	* sysdeps/alpha/fabs.S: Renamed to...
	* sysdeps/alpha/s_fabs.S: ...this.

	* sysdeps/m68k/isinfl.c: Renamed to...
	* sysdeps/m68k/s_isinfl.c: ...this.
	* sysdeps/m68k/isnanl.c: Renamed to...
	* sysdeps/m68k/s_isnanl.c: ...this.

	* sysdeps/sparc/sqrt.c: Renamed to...
	* sysdeps/sparc/e_sqrt.c: ...this.  Function name now is
	__ieee754_sqrt.

	* sysdeps/generic/get_str.c: Removed.

	* sysdeps/ieee754/cbrt.c: Removed.
	* sysdeps/ieee754/drem.c: Removed.
	* sysdeps/ieee754/logb.c: Removed.
	* sysdeps/ieee754/sqrt.c: Removed.

	* sysdeps/stub/cbrt.c: Removed.
	* sysdeps/stub/cos.c: Removed.
	* sysdeps/stub/drem.c: Removed.
	* sysdeps/stub/isinf.c: Removed.
	* sysdeps/stub/isinfl.c: Removed.
	* sysdeps/stub/isnanl.c: Removed.
	* sysdeps/stub/logb.c: Removed.
	* sysdeps/stub/sin.c: Removed.
	* sysdeps/stub/sqrt.c: Removed.

	* sysdeps/tahoe/log10.c: Removed.

	* sysdeps/vax/index.s: Removed.
	* sysdeps/vax/rindex.s: Removed.
	* sysdeps/vax/bcmp.s: Removed.
	* sysdeps/vax/log10.c: Removed.
	* sysdeps/vax/infnan.c: Removed.
	* sysdeps/vax/Dist: Add fl.h.

	* sysdeps/unix/sysv/linux/alpha/Dist: Add llseek.S.

	* inet/rcmd.c (rcmd): Make messages more uniform.

Sun Sep  8 14:15:42 1996  Ulrich Drepper  <drepper@cygnus.com>

	* po/de.po: Update.
	* po/es.po: Update.
	* po/ko.po: Update.
	* po/pl.po: New file.
	* po/nl.po: New file.

	take care for a possible clash.  Nobody will name the domain

1 files changed, 252 insertions, 272 deletions

diff --git a/time/asia b/time/asia
index a5d0ab59f5..2cc414f1df 100644
--- a/time/asia
+++ b/time/asia
@@ -1,10 +1,10 @@
-# @(#)asia	7.23
+# @(#)asia	7.24
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert <eggert@twinsun.com> (1995-12-19):
+# From Paul Eggert <eggert@twinsun.com> (1995-07-24):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks, The International Atlas (3rd edition),
@@ -25,42 +25,20 @@
 #		std dst
 #		LMT	Local Mean Time
 #		LST	Local Star Time (Russian ``mestnoe zvezdnoe vremya'')
-#	2:00	EET  EET DST	Eastern European Time
+#	2:00	EET EEST Eastern European Time
 #	2:00	IST IDT	Israel
 #	3:00	AST ADT	Arabia*
-#	3:00	BSK BSD	Baku (was 4:00)*
-#	3:30	IST IDT	Iran
-#	4:00	AMST AMDT Armenia (was 3:00) (was YSK, YSD)*
-#	4:00	TBSK TBSD Tbilisi (was 3:00)*
-#	4:00	GST GDT	Gulf*
-#	4:30	AFT	Afghanistan*
-#	5:00	ASK ASD	Aktau (was SHSK, SHSD)*
-#	5:00	ASK ASD	Ashkhabad (was 4:00)*
-#	5:00	BSK BSD Bishkek (was 6:00) (was FSK, FSD)*
-#	5:00	PKT	Pakistan*
-#	5:00	TSK TSD	Tashkent (was 6:00)*
-#	5:30	IST IST	India
-#	5:45	NPT	Nepal*
-#	6:00	AASK AASD Alma-Ata (was 5:00)*
-#	6:00	BGT	Bengal, Bangladesh*
-#	6:00	DSK DSD	Dushanbe (was 5:00)*
-#	6:30	BMT	Burma*
+#	4:00	GST	Gulf*
+#	5:30	IST	India
 #	7:00	ICT	Indochina*
-#	7:00	JVT	Java*
-#	8:00	BNT	Borneo, Brunei*
-#	8:00	CST CDT	China
-#	8:00	HKT HKST Hong Kong
-#	8:00	PST PDT	Philippines*
-#	8:00	SGT	Singapore
-#	8:00	UST UDT	Ulan Bator*
-#	9:00	JST JDT	Japan
-#	9:00	KST KDT	Korea
-#	9:00	MLT	Moluccas*
-#	9:30	CST	Australian Central Standard Time
+#	8:00	CST	China
+#	9:00	JST	Japan
+#	9:00	KST	Korea
+#	9:30	CST	(Australian) Central Standard Time
 #
 # See the `europe' file for Russia and Turkey in Asia.
 #
-# See the `africa' file for Zone naming conventions.
+# See the `africa' file for time zone naming and abbreviation conventions.
 
 # From Guy Harris:
 # Incorporates data for Singapore from Robert Elz' asia 1.1, as well as
@@ -72,15 +50,15 @@
 
 # These rules for Russia are stolen from the `europe' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule RussiaAsia 1981	1984	-	Apr	1	0:00	1:00	D
-Rule RussiaAsia 1981	1983	-	Oct	1	0:00	0	K
-Rule RussiaAsia 1984	max	-	Sep	lastSun	2:00s	0	K
-Rule RussiaAsia 1985	max	-	Mar	lastSun	2:00s	1:00	D
+Rule RussiaAsia 1981	1984	-	Apr	1	0:00	1:00	S
+Rule RussiaAsia 1981	1983	-	Oct	1	0:00	0	-
+Rule RussiaAsia 1984	max	-	Sep	lastSun	2:00s	0	-
+Rule RussiaAsia 1985	max	-	Mar	lastSun	2:00s	1:00	S
 
 # Afghanistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kabul	4:36:48 -	LMT	1890
-			4:00	-	GST	1945
+			4:00	-	AFT	1945
 			4:30	-	AFT
 
 # Armenia
@@ -90,30 +68,27 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
 # <edd@AIC.NET> reported today that Yerevan probably won't use DST this year,
 # though it did use DST in 1995.  We guess Yerevan stayed in sync with Moscow
 # between 1990 and 1995, but stopped using DST in 1996.
-# Der-Danieliantz also asked for a better abbreviation than `YSK'
-# after independence.  Apparently no abbreviation is in common use;
-# use `AMST/AMDT' since `AM' is the ISO country code for Armenia.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Armenia	1992	1995	-	Sep	lastSun	2:00s	0	S
-Rule	Armenia	1992	1995	-	Mar	lastSun	2:00s	1:00	D
+Rule	Armenia	1991	1995	-	Mar	lastSun	2:00s	1:00	S
+Rule	Armenia	1991	1995	-	Sep	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
-			3:00	-	YSK	1957 Mar
-			4:00 RussiaAsia YS%s	1991 Mar 31 2:00s
-			3:00	1:00	YSD	1991 Sep 29 2:00s
-			3:00	-	AMST	1992 Jan 19 2:00s
-			4:00	Armenia	AM%sT	1996
-			4:00	-	AMST
+			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	Armenia	AM%sT	1992 Jan 19 2:00s # Armenia Time
+			4:00	Armenia	AM%sT
 
 # Azerbaijan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
-			3:00	-	BSK	1957 Mar
-			4:00 RussiaAsia BS%s	1991 Mar 31 2:00s
-			3:00	1:00	BSD	1991 Sep 29 2:00s
-			3:00	-	BSK
+			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	    # Azerbaijan Time
+			3:00	-	AZT
 # Shanks has Baku using Russian DST rules after 1991,
-# but usno1995 has Azerbaijan with no DST.  Go with usno1995.
+# but usno1995 has Azerbaijan with no DST.  Guess no DST after 1991.
 
 # Bahrain
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -124,22 +99,23 @@ Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al-Manamah
 # Bangladesh
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dacca	6:01:40 -	LMT	1890
-			5:53	-	CMT	1941 Oct    # Calcutta Mean Time
-			6:30	-	BMT	1942 May 15
+			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
+			6:30	-	BURT	1942 May 15 # Burma Time
 			5:30	-	IST	1942 Sep
-			6:30	-	BMT	1951 Sep 30
-			6:00	-	BGT
+			6:30	-	BURT	1951 Sep 30
+			6:00	-	DACT	1971 Mar 26 # Dacca Time
+			6:00	-	BDT	# Bangladesh Time
 
 # Bhutan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Thimbu	5:58:36 -	LMT	1947 Aug 15
 			5:30	-	IST	1987 Oct
-			6:00	-	BGT
+			6:00	-	BTT	# Bhutan Time
 
 # British Indian Ocean Territory
 # From Whitman:
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Chagos	5:00	-	PKT
+Zone	Indian/Chagos	5:00	-	IOT	# BIOT Time
 
 # Brunei
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -150,15 +126,15 @@ Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar   # Bandar Seri Begawan
 # Burma / Myanmar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Rangoon	6:24:40 -	LMT	1880		# or Yangon
-			6:25	-	RMT	1920
-			6:30	-	BMT	1942 May
+			6:24:36	-	RMT	1920	   # Rangoon Mean Time?
+			6:30	-	BURT	1942 May   # Burma Time
 			9:00	-	JST	1945 May 3
-			6:30	-	BMT
+			6:30	-	MMT		   # Myanmar Time
 
 # Cambodia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
-			7:06	-	SMT	1911 Mar 11 0:01     # Saigon MT
+			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
 			7:00	-	ICT	1912 May
 			8:00	-	ICT	1931 May
 			7:00	-	ICT
@@ -187,8 +163,7 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
 # CHINA               9 H  AHEAD OF UTC  APR 17 - SEP 10
 
 # From Paul Eggert <eggert@twinsun.com> (1995-12-19):
-# Shanks writes that China switched from the Chinese calendar on 1912 Feb 12.
-# He also writes that China has had a single time zone since 1980 May 1,
+# Shanks writes that China has had a single time zone since 1980 May 1,
 # observing summer DST from 1986 through 1991; this contradicts Devine's
 # note about Time magazine, though apparently _something_ happened in 1986.
 # Go with Shanks for now.  I made up names for the other pre-1980 time zones.
@@ -204,23 +179,23 @@ Rule	PRC	1986	1991	-	Sep	Sun>=11	0:00	0	S
 Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Harbin	8:26:44	-	LMT	1928
-			8:30	-	MAT	1932 Mar    # Manchuria
+			8:30	-	HART	1932 Mar # Harbin Time
 			8:00	-	CST	1940
-			9:00	-	KST	1966 May
-			8:30	-	MAT	1980 May
+			9:00	-	HART	1966 May
+			8:30	-	HART	1980 May
 			8:00	PRC	C%sT
 Zone	Asia/Shanghai	8:05:52	-	LMT	1928
 			8:00	Shang	C%sT	1949
 			8:00	PRC	C%sT
 Zone	Asia/Chungking	7:06:20	-	LMT	1928
-			7:00	-	ICT	1980 May
+			7:00	-	CHUT	1980 May # Chungking Time
 			8:00	PRC	C%sT
 Zone	Asia/Urumqi	5:50:20	-	LMT	1928
-			6:00	-	URT	1980 May    # Urumqi
+			6:00	-	URUT	1980 May # Urumqi Time
 			8:00	PRC	C%sT
 Zone	Asia/Kashgar	5:03:56	-	LMT	1928
-			5:30	-	ETT	1940	    # Eastern Turkestan
-			5:00	-	ETT	1980 May
+			5:30	-	KAST	1940	 # Kashgar Time
+			5:00	-	KAST	1980 May
 			8:00	PRC	C%sT
 
 ###############################################################################
@@ -263,45 +238,47 @@ Rule	HK	1979	1980	-	May	Sun>=8	3:30	1:00	S
 Rule	HK	1979	1980	-	Oct	Sun>=16	3:30	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
-			8:00	HK	HK%sT
+			8:00	HK	HK%sT	1997 Jul  1 # return to China
+			8:00	PRC	C%sT
 
 # Macao
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Macao	1961	1962	-	Mar	Sun>=16	3:30	1:00	D
-Rule	Macao	1961	1964	-	Nov	Sun>=1	3:30	0	S
-Rule	Macao	1963	only	-	Mar	Sun>=16	0:00	1:00	D
-Rule	Macao	1964	only	-	Mar	Sun>=16	3:30	1:00	D
-Rule	Macao	1965	only	-	Mar	Sun>=16	0:00	1:00	D
-Rule	Macao	1965	only	-	Oct	31	0:00	0	S
-Rule	Macao	1966	1971	-	Apr	Sun>=16	3:30	1:00	D
-Rule	Macao	1966	1971	-	Oct	Sun>=16	3:30	0	S
-Rule	Macao	1972	1974	-	Apr	Sun>=15	0:00	1:00	D
-Rule	Macao	1972	1973	-	Oct	Sun>=15	0:00	0	S
-Rule	Macao	1974	1977	-	Oct	Sun>=15	3:30	0	S
-Rule	Macao	1975	1977	-	Apr	Sun>=15	3:30	1:00	D
-Rule	Macao	1978	1980	-	Apr	Sun>=15	0:00	1:00	D
-Rule	Macao	1978	1980	-	Oct	Sun>=15	0:00	0	S
+Rule	Macao	1961	1962	-	Mar	Sun>=16	3:30	1:00	S
+Rule	Macao	1961	1964	-	Nov	Sun>=1	3:30	0	-
+Rule	Macao	1963	only	-	Mar	Sun>=16	0:00	1:00	S
+Rule	Macao	1964	only	-	Mar	Sun>=16	3:30	1:00	S
+Rule	Macao	1965	only	-	Mar	Sun>=16	0:00	1:00	S
+Rule	Macao	1965	only	-	Oct	31	0:00	0	-
+Rule	Macao	1966	1971	-	Apr	Sun>=16	3:30	1:00	S
+Rule	Macao	1966	1971	-	Oct	Sun>=16	3:30	0	-
+Rule	Macao	1972	1974	-	Apr	Sun>=15	0:00	1:00	S
+Rule	Macao	1972	1973	-	Oct	Sun>=15	0:00	0	-
+Rule	Macao	1974	1977	-	Oct	Sun>=15	3:30	0	-
+Rule	Macao	1975	1977	-	Apr	Sun>=15	3:30	1:00	S
+Rule	Macao	1978	1980	-	Apr	Sun>=15	0:00	1:00	S
+Rule	Macao	1978	1980	-	Oct	Sun>=15	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Macao	7:34:20 -	LMT	1912
-			8:00	Macao	C%sT
+			8:00	Macao	MO%sT	1999 Dec 20 # return to China
+			8:00	PRC	C%sT
 
 
 ###############################################################################
 
 # Cyprus
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	" DST"
+Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
 Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
-Rule	Cyprus	1976	only	-	May	15	0:00	1:00	" DST"
+Rule	Cyprus	1976	only	-	May	15	0:00	1:00	S
 Rule	Cyprus	1976	only	-	Oct	11	0:00	0	-
-Rule	Cyprus	1977	1980	-	Apr	Sun>=1	0:00	1:00	" DST"
+Rule	Cyprus	1977	1980	-	Apr	Sun>=1	0:00	1:00	S
 Rule	Cyprus	1977	only	-	Sep	25	0:00	0	-
 Rule	Cyprus	1978	only	-	Oct	2	0:00	0	-
 Rule	Cyprus	1979	max	-	Sep	lastSun	0:00	0	-
-Rule	Cyprus	1981	max	-	Mar	lastSun	0:00	1:00	" DST"
+Rule	Cyprus	1981	max	-	Mar	lastSun	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
-			2:00	Cyprus	EET%s
+			2:00	Cyprus	EE%sT
 
 # Georgia
 # From Paul Eggert <eggert@twinsun.com> (1994-11-19):
@@ -316,18 +293,18 @@ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
 # Most likely we're still missing some rule changes between 1991 and 1994.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tbilisi	2:59:16 -	LMT	1880
-			2:59	-	LST	1924 May  2
-			3:00	-	TBSK	1957 Mar
-			4:00 RussiaAsia TBS%s	1991 Mar 31 2:00s
-			3:00	1:00	TBSD	1991 Sep 29 2:00s
-			3:00 RussiaAsia TBS%s	1994 Sep 25 2:00s
-			4:00	-	TBSK
+			2:59:16	-	TBMT	1924 May  2 # Tbilisi Mean 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	1994 Sep 25 2:00s # Georgia Time
+			4:00	-	GET
 
 # India
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Calcutta	5:53:28 -	LMT	1880
-			5:53	-	CMT	1941 Oct    # Calcutta Mean Time
-			6:30	-	BMT	1942 May 15
+			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
 			5:30	-	IST
@@ -339,36 +316,36 @@ Zone	Asia/Calcutta	5:53:28 -	LMT	1880
 # Indonesia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Jakarta	7:07:12 -	LMT	1867 Aug 10
-			7:07	-	JMT	1924 Jan  1 0:13
-			7:20	-	JVT	1932 Nov
-			7:30	-	JVT	1942 Mar 23
+			7:07:12	-	JMT	1924 Jan  1 0:13 # Jakarta MT
+			7:20	-	JAVT	1932 Nov	 # Java Time
+			7:30	-	JAVT	1942 Mar 23
 			9:00	-	JST	1945 Aug
-			7:30	-	JVT	1948 May
-			8:00	-	JVT	1950 May
-			7:30	-	JVT	1964
-			7:00	-	JVT
+			7:30	-	JAVT	1948 May
+			8:00	-	JAVT	1950 May
+			7:30	-	JAVT	1964
+			7:00	-	JAVT
 Zone Asia/Ujung_Pandang 7:57:36 -	LMT	1920
-			7:58	-	MMT	1932 Nov    # Macassar Mean Time
-			8:00	-	BNT	1942 Feb  9
+			7:57:36	-	MMT	1932 Nov    # Macassar MT
+			8:00	-	BORT	1942 Feb  9 # Borneo Time
 			9:00	-	JST	1945 Aug
-			8:00	-	BNT
+			8:00	-	BORT
 Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
-			9:00	-	MLT	1944
+			9:00	-	JAYT	1944	    # Jayapura Time
 			9:30	-	CST	1964
-			9:00	-	MLT
+			9:00	-	JAYT
 
 # Iran
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
-Rule	Iran	1978	only	-	Oct	21	0:00	0	S
-Rule	Iran	1979	only	-	Sep	19	0:00	0	S
-Rule	Iran	1980	only	-	Sep	23	0:00	0	S
+Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	S
+Rule	Iran	1978	only	-	Oct	21	0:00	0	-
+Rule	Iran	1979	only	-	Sep	19	0:00	0	-
+Rule	Iran	1980	only	-	Sep	23	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
-			3:26	-	TMT	1946
-			3:30	-	IST	1977 Nov
-			4:00	Iran	G%sT	1979
-			3:30	Iran	I%sT
+			3:25:44	-	TMT	1946	# Tehran Mean Time
+			3:30	-	IRT	1977 Nov
+			4:00	Iran	IR%sT	1979
+			3:30	Iran	IR%sT
 
 # Iraq
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -380,7 +357,7 @@ Rule	Iraq	1985	max	-	Sep	lastSun	1:00s	0	S
 Rule	Iraq	1986	max	-	Mar	lastSun	1:00s	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baghdad	2:57:40	-	LMT	1890
-			2:58	-	BMT	1918	    # Baghdad Mean Time
+			2:57:36	-	BMT	1918	    # Baghdad Mean Time?
 			3:00	-	AST	1982 May
 			3:00	Iraq	A%sT
 
@@ -440,12 +417,6 @@ Rule	Zion	1987	only	-	Apr	15	0:00	1:00	D
 Rule	Zion	1987	only	-	Sep	13	0:00	0	S
 Rule	Zion	1988	only	-	Apr	 9	0:00	1:00	D
 Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
-#Rule	Zion	1989	only	-	Apr	29	0:00	1:00	D
-#Rule	Zion	1989	only	-	Sep	 2	0:00	0	S
-#Rule	Zion	1990	only	-	Mar	25	0:00	1:00	D
-#Rule	Zion	1990	only	-	Aug	26	0:00	0	S
-#Rule	Zion	1991	only	-	Mar	10	0:00	1:00	D
-#Rule	Zion	1991	only	-	Sep	 1	0:00	0	S
 
 # From Ephraim Silverberg (1996-01-02):
 #
@@ -466,25 +437,25 @@ Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	1989	only	-	Apr	30	0:00	1:00	D
-Rule	Zion	1989	only	-	Sep	 3	0:00	0:00	S
+Rule	Zion	1989	only	-	Sep	 3	0:00	0	S
 Rule	Zion	1990	only	-	Mar	25	0:00	1:00	D
-Rule	Zion	1990	only	-	Aug	26	0:00	0:00	S
+Rule	Zion	1990	only	-	Aug	26	0:00	0	S
 Rule	Zion	1991	only	-	Mar	24	0:00	1:00	D
-Rule	Zion	1991	only	-	Sep	 1	0:00	0:00	S
+Rule	Zion	1991	only	-	Sep	 1	0:00	0	S
 Rule	Zion	1992	only	-	Mar	29	0:00	1:00	D
-Rule	Zion	1992	only	-	Sep	 6	0:00	0:00	S
+Rule	Zion	1992	only	-	Sep	 6	0:00	0	S
 Rule	Zion	1993	only	-	Apr	 2	0:00	1:00	D
-Rule	Zion	1993	only	-	Sep	 5	0:00	0:00	S
+Rule	Zion	1993	only	-	Sep	 5	0:00	0	S
 
 # The dates for 1994-1995 were obtained from Office of the Spokeswoman for the
 # Ministry of Interior, Jerusalem, Israel.  The spokeswoman can be reached by
 # calling the switchboard at 972-2-701411 and asking for the spokeswoman.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule    Zion    1994    only    -       Apr      1      0:00    1:00    D
-Rule    Zion    1994    only    -       Aug     28      0:00    0:00    S
-Rule    Zion    1995    only    -       Mar     31      0:00    1:00    D
-Rule    Zion    1995    only    -       Sep      3      0:00    0:00    S
+Rule	Zion	1994	only	-	Apr	 1	0:00	1:00	D
+Rule	Zion	1994	only	-	Aug	28	0:00	0	S
+Rule	Zion	1995	only	-	Mar	31	0:00	1:00	D
+Rule	Zion	1995	only	-	Sep	 3	0:00	0	S
 
 # The dates for 1996-1998 were also obtained from Office of the Spokeswoman
 # for the Ministry of Interior, Jerusalem, Israel.  The official announcement
@@ -504,12 +475,12 @@ Rule    Zion    1995    only    -       Sep      3      0:00    0:00    S
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	1996	1998	-	Mar	Fri>=14	0:00	1:00	D
-Rule	Zion	1996	only	-	Sep	16	0:00	0:00	S
-Rule	Zion	1997	1998	-	Oct	Sun>=14	0:00	0:00	S
+Rule	Zion	1996	only	-	Sep	16	0:00	0	S
+Rule	Zion	1997	1998	-	Oct	Sun>=14	0:00	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Jerusalem	2:20:56 -	LMT	1880
-			2:21	-	JMT	1918
+			2:20:40	-	JMT	1918	# Jerusalem Mean Time?
 			2:00	Zion	I%sT
 
 
@@ -531,29 +502,12 @@ Zone	Asia/Jerusalem	2:20:56 -	LMT	1880
 #Rule	Japan	1950	1951	-	May	Sun>=1	2:00	1:00	D
 # but the only locations using it were US military bases.
 # We go with Shanks and omit daylight saving in those years for Asia/Tokyo.
-#
-# The same news article also reports that Japan is likely to go on DST in 1996
-# as follows, where I've guessed the AT and LETTER/S columns:
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-#Rule	Japan	1996	max	-	Apr	Sun>=1	2:00	1:00	D
-#Rule	Japan	1996	max	-	Oct	lastSun	2:00	0	S
 
-# From Shanks (1991):
-# Japan switched from the Japanese calendar on 1893 Jan 1.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tokyo	9:19:04	-	LMT	1896
 			9:00	-	JST
-# If Japan adopts DST in 1996, replace the above line with the following lines:
-#			9:00	-	JST	1996
-#			9:00	Japan	J%sT
-# and uncomment the two `Rule' lines commented out above.
-
-# From Paul Eggert <eggert@twinsun.com> (1995-12-19):
-# Shanks says that the far southern Ryukyu Is (Nansei-Shoto) are 8:00,
-# but we haven't confirmed this.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-#Zone	Asia/Ishigaki	8:16:36	-	LMT	1896
-#			8:00	-	CST
+Zone	Asia/Ishigaki	8:16:36	-	LMT	1896
+			8:00	-	CST
 # There is no information for Marcus.
 # Other Japanese possessions are probably like Asia/Tokyo.
 
@@ -562,26 +516,26 @@ Zone	Asia/Tokyo	9:19:04	-	LMT	1896
 # Most likely Shanks is merely guessing dates from 1992 on.
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule    Jordan	1973	only	-	Jun	6	0:00	1:00	" DST"
+Rule    Jordan	1973	only	-	Jun	6	0:00	1:00	S
 Rule    Jordan	1973	1975	-	Oct	1	0:00	0	-
-Rule    Jordan	1974	1977	-	May	1	0:00	1:00	" DST"
+Rule    Jordan	1974	1977	-	May	1	0:00	1:00	S
 Rule    Jordan	1976	only	-	Nov	1	0:00	0	-
 Rule    Jordan	1977	only	-	Oct	1	0:00	0	-
-Rule    Jordan	1978	only	-	Apr	30	0:00	1:00	" DST"
+Rule    Jordan	1978	only	-	Apr	30	0:00	1:00	S
 Rule    Jordan	1978	only	-	Sep	30	0:00	0	-
-Rule    Jordan	1985	only	-	Apr	1	0:00	1:00	" DST"
+Rule    Jordan	1985	only	-	Apr	1	0:00	1:00	S
 Rule    Jordan	1985	only	-	Oct	1	0:00	0	-
-Rule    Jordan	1986	1988	-	Apr	Fri>=1	0:00	1:00	" DST"
+Rule    Jordan	1986	1988	-	Apr	Fri>=1	0:00	1:00	S
 Rule    Jordan	1986	1990	-	Oct	Fri>=1	0:00	0	-
-Rule    Jordan	1989	only	-	May	8	0:00	1:00	" DST"
-Rule    Jordan	1990	only	-	Apr	27	0:00	1:00	" DST"
-Rule    Jordan	1991	only	-	Apr	19	0:00	1:00	" DST"
+Rule    Jordan	1989	only	-	May	8	0:00	1:00	S
+Rule    Jordan	1990	only	-	Apr	27	0:00	1:00	S
+Rule    Jordan	1991	only	-	Apr	19	0:00	1:00	S
 Rule    Jordan	1991	only	-	Sep	27	0:00	0	-
-Rule    Jordan	1992	max	-	Apr	Fri>=1	0:00	1:00	" DST"
+Rule    Jordan	1992	max	-	Apr	Fri>=1	0:00	1:00	S
 Rule    Jordan	1992	max	-	Oct	Fri>=1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Amman	2:23:44 -	LMT	1931
-			2:00	Jordan	EET%s
+			2:00	Jordan	EE%sT
 
 # Kazakhstan
 # From Paul Eggert (1996-04-19):
@@ -590,25 +544,25 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 # in western Kazakhstan.  Follow Shanks before 1991, Evtichov afterwards.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Alma-Ata	5:07:48 -	LMT	1924 May  2 # or Almaty
-			5:00	-	AASK	1957 Mar
-			6:00 RussiaAsia AAS%s	1991 Mar 31 2:00s
-			5:00	1:00	AASD	1991 Sep 29 2:00s
-			5:00	-	AASK	1992 Jan 19 2:00s
-			6:00 RussiaAsia AAS%s
+			5:00	-	ALMT	1957 Mar # Alma-Ata Time
+			6:00 RussiaAsia ALM%sT	1991 Mar 31 2:00s
+			5:00	1:00	ALMST	1991 Sep 29 2:00s
+			5:00	-	ALMT	1992 Jan 19 2:00s
+			6:00 RussiaAsia ALM%sT
 Zone	Asia/Aktau	3:21:04	-	LMT	1924 May  2 # or Aqtau
-			4:00	-	SHSK	1957 Mar # Fort Shevchenko
-			5:00 RussiaAsia SHS%s	1991 Mar 31 2:00s
-			4:00	1:00	ASD	1991 Sep 29 2:00s
-			4:00	-	ASK	1992 Jan 19 2:00s
-			5:00 RussiaAsia AS%s
+			4:00	-	SHET	1957 Mar # Fort Shevchenko Time
+			5:00 RussiaAsia SHE%sT	1991 Mar 31 2:00s
+			4:00	1:00	AKTST	1991 Sep 29 2:00s
+			4:00	-	AKTT	1992 Jan 19 2:00s # Aktau Time
+			5:00 RussiaAsia AKT%sT
 
 # Kirgizstan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
-			5:00	-	FSK	1957 Mar	# Frunze
-			6:00 RussiaAsia FS%s	1991 Mar 31 2:00s
-			5:00	1:00	FSD	1991 Sep 29 2:00s
-			5:00 RussiaAsia BS%s
+			5:00	-	FRUT	1957 Mar    # Frunze Time
+			6:00 RussiaAsia FRU%sT	1991 Mar 31 2:00s
+			5:00	1:00	FRUST	1991 Aug 31 # independence
+			5:00 RussiaAsia KG%sT		    # Kirgizstan Time
 
 ###############################################################################
 
@@ -653,81 +607,90 @@ Zone	Asia/Kuwait	3:11:56 -	LMT	1950
 # Laos
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jun  9
-			7:06	-	SMT	1911 Mar 11 0:01     # Saigon MT
+			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
 			7:00	-	ICT	1912 May
 			8:00	-	ICT	1931 May
 			7:00	-	ICT
 
 # Lebanon
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Lebanon	1920	only	-	Mar	28	0:00	1:00	" DST"
+Rule	Lebanon	1920	only	-	Mar	28	0:00	1:00	S
 Rule	Lebanon	1920	only	-	Oct	25	0:00	0	-
-Rule	Lebanon	1921	only	-	Apr	3	0:00	1:00	" DST"
+Rule	Lebanon	1921	only	-	Apr	3	0:00	1:00	S
 Rule	Lebanon	1921	only	-	Oct	3	0:00	0	-
-Rule	Lebanon	1922	only	-	Mar	26	0:00	1:00	" DST"
+Rule	Lebanon	1922	only	-	Mar	26	0:00	1:00	S
 Rule	Lebanon	1922	only	-	Oct	8	0:00	0	-
-Rule	Lebanon	1923	only	-	Apr	22	0:00	1:00	" DST"
+Rule	Lebanon	1923	only	-	Apr	22	0:00	1:00	S
 Rule	Lebanon	1923	only	-	Sep	16	0:00	0	-
-Rule	Lebanon	1957	1961	-	May	1	0:00	1:00	" DST"
+Rule	Lebanon	1957	1961	-	May	1	0:00	1:00	S
 Rule	Lebanon	1957	1961	-	Oct	1	0:00	0	-
-Rule	Lebanon	1972	only	-	Jun	22	0:00	1:00	" DST"
+Rule	Lebanon	1972	only	-	Jun	22	0:00	1:00	S
 Rule	Lebanon	1972	1977	-	Oct	1	0:00	0	-
-Rule	Lebanon	1973	1977	-	May	1	0:00	1:00	" DST"
-Rule	Lebanon	1978	only	-	Apr	30	0:00	1:00	" DST"
+Rule	Lebanon	1973	1977	-	May	1	0:00	1:00	S
+Rule	Lebanon	1978	only	-	Apr	30	0:00	1:00	S
 Rule	Lebanon	1978	only	-	Sep	30	0:00	0	-
-Rule	Lebanon	1984	1987	-	May	1	0:00	1:00	" DST"
+Rule	Lebanon	1984	1987	-	May	1	0:00	1:00	S
 Rule	Lebanon	1984	max	-	Oct	16	0:00	0	-
-Rule	Lebanon	1988	only	-	Jun	1	0:00	1:00	" DST"
-Rule	Lebanon	1989	only	-	May	10	0:00	1:00	" DST"
-Rule	Lebanon	1990	max	-	May	1	0:00	1:00	" DST"
+Rule	Lebanon	1988	only	-	Jun	1	0:00	1:00	S
+Rule	Lebanon	1989	only	-	May	10	0:00	1:00	S
+Rule	Lebanon	1990	max	-	May	1	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Beirut	2:22:00 -	LMT	1880
-			2:00	Lebanon	EET%s
+			2:00	Lebanon	EE%sT
 
 # Malaysia
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	NBorneo	1935	1941	-	Sep	14	0:00	0:20	TS
+Rule	NBorneo	1935	1941	-	Dec	14	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Kuala_Lumpur	6:46:48 -	LMT	1880
-			6:55	-	SMT	1905 Jun
-			7:00	-	SGT	1933
-			7:20	-	SGT	1942 Feb 15
+			6:55:24	-	SMT	1905 Jun # Singapore Mean Time
+			7:00	-	MALT	1933	 # Malaya Time
+			7:20	-	MALT	1942 Feb 15
 			9:00	-	JST	1945 Sep 2
-			7:20	-	SGT	1950
-			7:30	-	SGT	1982 May
-			8:00	-	SGT
+			7:20	-	MALT	1950
+			7:30	-	MALT	1982 May
+			8:00	-	MYT	# Malaysia Time
+Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
+			7:30	-	BORT	1933	# Borneo Time
+			8:00	NBorneo	BOR%sT	1942
+			9:00	-	JST	1945 Sep 2
+			8:00	-	BORT	1982 May
+			8:00	-	MYT
 
 # Maldives
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Maldives	4:54:00 -	LMT	1880			# Male
-			4:54	-	MMT	1960
-			5:00	-	PKT
+Zone	Indian/Maldives	4:54:00 -	LMT	1880	# Male
+			4:54:00	-	MMT	1960	# Male Mean Time
+			5:00	-	MVT		# Maldives Time
 
 # Mongolia
-# Shanks says that Mongolia has three time zones,
-# but usno1995 and http://www.odci.gov/cia/publications/95fact/802389h.gif
+# Shanks says that Mongolia has three time zones, but usno1995 and
+# <URL:http://www.odci.gov/cia/publications/95fact/802389h.gif> (1995)
 # both say that it has just one.
 # Let's comment out the western and eastern Mongolian time zones
 # till we know what their principal towns are.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mongol	1981	1984	-	Apr	1	0:00	1:00	T
-Rule	Mongol	1981	1984	-	Oct	1	0:00	0	S
-Rule	Mongol	1985	max	-	Mar	lastSun	2:00	1:00	T
-Rule	Mongol	1985	max	-	Sep	lastSun	3:00	0	S
+Rule	Mongol	1981	1984	-	Apr	1	0:00	1:00	S
+Rule	Mongol	1981	1984	-	Oct	1	0:00	0	-
+Rule	Mongol	1985	max	-	Mar	lastSun	2:00	1:00	S
+Rule	Mongol	1985	max	-	Sep	lastSun	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #Zone	Asia/Dariv	6:14:32 -	LMT	1905 Aug
-#			6:00	-	DST	1978
-#			7:00	Mongol	D%sT
+#			6:00	-	DART	1978	# Dariv Time
+#			7:00	Mongol	DAR%sT
 Zone	Asia/Ulan_Bator	7:07:32 -	LMT	1905 Aug
-			7:00	-	UST	1978
-			8:00	Mongol	U%sT
+			7:00	-	ULAT	1978	# Ulan Bator Time
+			8:00	Mongol	ULA%sT
 #Zone Asia/Baruun-Urt	7:33:00 -	LMT	1905 Aug
-#			8:00	-	BST	1978
-#			9:00	Mongol	B%sT
+#			8:00	-	BART	1978	# Baruun-Urt Time
+#			9:00	Mongol	BAR%sT
 
 # Nepal
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Katmandu	5:41:16 -	LMT	1920
 			5:30	-	IST	1986
-			5:45	-	NPT
+			5:45	-	NPT	# Nepal Time
 
 # Oman
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -740,23 +703,23 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep
 			5:30	1:00	IST	1945 Oct 15
 			5:30	-	IST	1951 Sep 30
-			5:00	-	PKT
+			5:00	-	KART	1971 Mar 26 # Karachi Time
+			5:00	-	PKT	# Pakistan Time
 
 # Palestine
 # These rules for Egypt are stolen from the `africa' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	" DST"
+Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
 Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
-Rule EgyptAsia	1958	only	-	May	 1	0:00	1:00	" DST"
-Rule EgyptAsia	1959	1981	-	May	 1	1:00	1:00	" DST"
+Rule EgyptAsia	1958	only	-	May	 1	0:00	1:00	S
+Rule EgyptAsia	1959	1981	-	May	 1	1:00	1:00	S
 Rule EgyptAsia	1959	1965	-	Sep	30	3:00	0	-
 Rule EgyptAsia	1966	max	-	Oct	 1	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
 			2:00	-	EET	1957 May 10
-			2:00 EgyptAsia	EET%s	1967 Jun 30
+			2:00 EgyptAsia	EE%sT	1967 Jun 30
 			2:00	Zion	I%sT
-# This will undoubtedly change soon.
 
 # Paracel Is
 # no information
@@ -765,18 +728,18 @@ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
 # Howse writes (p 162) that until 1844 the Philippines kept American date.
 # The rest of this data is from Shanks.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Phil	1936	only	-	Nov	1	0:00	1:00	D
-Rule	Phil	1937	only	-	Feb	1	0:00	0	S
-Rule	Phil	1954	only	-	Apr	12	0:00	1:00	D
-Rule	Phil	1954	only	-	Jul	1	0:00	0	S
-Rule	Phil	1978	only	-	Mar	22	0:00	1:00	D
-Rule	Phil	1978	only	-	Sep	21	0:00	0	S
+Rule	Phil	1936	only	-	Nov	1	0:00	1:00	S
+Rule	Phil	1937	only	-	Feb	1	0:00	0	-
+Rule	Phil	1954	only	-	Apr	12	0:00	1:00	S
+Rule	Phil	1954	only	-	Jul	1	0:00	0	-
+Rule	Phil	1978	only	-	Mar	22	0:00	1:00	S
+Rule	Phil	1978	only	-	Sep	21	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Manila	-15:56:00 -	LMT	1844
 			8:04:00 -	LMT	1899 May 11
-			8:00	Phil	P%sT	1942 May
+			8:00	Phil	PH%sT	1942 May
 			9:00	-	JST	1944 Nov
-			8:00	Phil	P%sT
+			8:00	Phil	PH%sT
 
 # Qatar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -792,78 +755,93 @@ Zone	Asia/Riyadh	3:06:52 -	LMT	1950
 # Singapore
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Singapore	6:55:24 -	LMT	1880
-			6:55	-	SMT	1905 Jun
-			7:00	-	SGT	1933
-			7:20	-	SGT	1942 Feb 15
+			6:55:24	-	SMT	1905 Jun # Singapore Mean Time
+			7:00	-	MALT	1933	 # Malaya Time
+			7:20	-	MALT	1942 Feb 15
 			9:00	-	JST	1945 Sep  2
-			7:20	-	SGT	1950
-			7:30	-	SGT	1982 May
+			7:20	-	MALT	1950
+			7:30	-	MALT	1965 Aug  9 # independence
+			7:30	-	SGT	1982 May # Singapore Time
 			8:00	-	SGT
 
 # Spratly Is
 # no information
 
 # Sri Lanka
+# From Paul Eggert (1996-09-03):
+# <URL:http://www.virtual-pc.com/lankaweb/news/items/240596-2.html> (1996-05-24)
+# reported ``the country's standard time will be put forward by one hour at
+# midnight Friday (1830 GMT) `in the light of the present power crisis'.''
+# Transitions before 1996 are from Shanks (1991).
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Colombo	5:19:24 -	LMT	1880
-			5:20	-	JMT	1906
+			5:20	-	CEYT	1906	# Ceylon Time
 			5:30	-	IST	1942 Jan  5
 			5:30	0:30	IHST	1942 Sep
 			5:30	1:00	IST	1945 Oct 16 2:00
-			5:30	-	IST
+			5:30	-	IST	1996 May 25 0:00
+			6:30	-	LKT	# Sri Lanka Time
 
 # Syria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Syria	1920	1923	-	Apr	Sun>=15	2:00	1:00	" DST"
+Rule	Syria	1920	1923	-	Apr	Sun>=15	2:00	1:00	S
 Rule	Syria	1920	1923	-	Oct	Sun>=1	2:00	0	-
-Rule	Syria	1962	only	-	Apr	29	2:00	1:00	" DST"
+Rule	Syria	1962	only	-	Apr	29	2:00	1:00	S
 Rule	Syria	1962	only	-	Oct	1	2:00	0	-
-Rule	Syria	1963	1965	-	May	1	2:00	1:00	" DST"
+Rule	Syria	1963	1965	-	May	1	2:00	1:00	S
 Rule	Syria	1963	only	-	Sep	30	2:00	0	-
 Rule	Syria	1964	only	-	Oct	1	2:00	0	-
 Rule	Syria	1965	only	-	Sep	30	2:00	0	-
-Rule	Syria	1966	only	-	Apr	24	2:00	1:00	" DST"
+Rule	Syria	1966	only	-	Apr	24	2:00	1:00	S
 Rule	Syria	1966	1976	-	Oct	1	2:00	0	-
-Rule	Syria	1967	1978	-	May	1	2:00	1:00	" DST"
+Rule	Syria	1967	1978	-	May	1	2:00	1:00	S
 Rule	Syria	1977	1978	-	Sep	1	2:00	0	-
-Rule	Syria	1983	1984	-	Apr	9	2:00	1:00	" DST"
+Rule	Syria	1983	1984	-	Apr	9	2:00	1:00	S
 Rule	Syria	1983	1984	-	Oct	1	2:00	0	-
-Rule	Syria	1986	only	-	Feb	16	2:00	1:00	" DST"
+Rule	Syria	1986	only	-	Feb	16	2:00	1:00	S
 Rule	Syria	1986	only	-	Oct	9	2:00	0	-
-Rule	Syria	1987	only	-	Mar	1	2:00	1:00	" DST"
+Rule	Syria	1987	only	-	Mar	1	2:00	1:00	S
 Rule	Syria	1987	1988	-	Oct	31	2:00	0	-
-Rule	Syria	1988	only	-	Mar	15	2:00	1:00	" DST"
-Rule	Syria	1989	only	-	Mar	31	2:00	1:00	" DST"
+Rule	Syria	1988	only	-	Mar	15	2:00	1:00	S
+Rule	Syria	1989	only	-	Mar	31	2:00	1:00	S
 Rule	Syria	1989	only	-	Oct	1	2:00	0	-
-Rule	Syria	1990	max	-	Apr	1	2:00	1:00	" DST"
+Rule	Syria	1990	max	-	Apr	1	2:00	1:00	S
 Rule	Syria	1990	max	-	Sep	30	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920
-			2:00	Syria	EET%s
+			2:00	Syria	EE%sT
 
 # Tajikistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
-			5:00	-	DSK	1957 Mar
-			6:00 RussiaAsia DS%s	1991
-			6:00	-	DSK
-# Shanks has Dushanbe at 5:00 (6:00 summer) after 1991 Sep 29 3:00,
-# but usno1995 has it at 6:00.  Go with usno1995.
+			5:00	-	DUST	1957 Mar    # Dushanbe Time
+			6:00 RussiaAsia DUS%sT	1991 Mar 31 2:00s
+			5:00	1:00	DUSST	1991 Sep  9 # independence
+			5:00 RussiaAsia	TJ%sT	1992
+			5:00	-	TJT		    # Tajikistan Time
+# Shanks has Dushanbe at 5:00 (6:00 summer) after 1991,
+# but a cable from the American Embassy at Dushanbe
+# <URL:http://www.itaiep.doc.gov/bisnis/cables/960703ti.html> (1996-07-02)
+# says that Tajikistan is at 5:00.  Guess no DST after 1991.
 
 # Thailand
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Bangkok	6:42:04	-	LMT	1880
-			6:42	-	BMT	1920 Apr
+			6:42:04	-	BMT	1920 Apr # Bangkok Mean Time
 			7:00	-	ICT
 
 # Turkmenistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Ashkhabad	3:53:32 -	LMT	1924 May  2
-			4:00	-	ASK	1957 Mar
-			5:00 RussiaAsia AS%s	1991
-			5:00	-	ASK
-# Shanks has Ashkhabad at 4:00 (5:00 summer) after 1991 Sep 20 3:00,
-# but usno has it at 5:00.  Go with usno1995.
+Zone	Asia/Ashkhabad	3:53:32 -	LMT	1924 May  2 # or Ashgabat
+			4:00	-	ASHT	1957 Mar    # Ashkhabad Time
+			5:00 RussiaAsia ASH%sT	1991 Mar 31 2:00s
+			4:00	1:00	ASHST	1991 Oct 27 # independence
+			4:00 RussiaAsia	TM%sT	1992	    # Turkmenistan Time
+			4:00	-	TMT
+# Shanks has Ashkhabad at 4:00 (5:00 summer) after 1991, but
+# DHL <URL:http://www.dhl.com/dhlinfo/country/turkmeni.html> (1996-07-26)
+# reports 4:00.  Guess no DST after 1991.
 
 # United Arab Emirates
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -873,14 +851,16 @@ Zone	Asia/Dubai	3:41:12 -	LMT	1920
 # Uzbekistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tashkent	4:37:12 -	LMT	1924 May  2
-			5:00	-	TSK	1957 Mar
-			6:00 RussiaAsia TS%s	1991 Mar 31 2:00s
-			5:00	1:00	TSD	1991 Sep 29 2:00s
-			5:00	-	TSK
+			5:00	-	TAST	1957 Mar    # Tashkent Time
+			6:00 RussiaAsia TAS%sT	1991 Mar 31 2:00s
+			5:00	1:00	TASST	1991 Sep 29 2:00s
+			5:00	-	UZT		    # Uzbekistan Time
 # Shanks has Tashkent using DST after 1991, but usno1995 says they don't.
-# Go with usno1995.
-# http://www.odci.gov/cia/publications/95fact/802389h.gif claims that
-# Uzbekistan has two time zones, but we lack data about this.
+# Guess no DST after 1991.
+# <URL:http://www.odci.gov/cia/publications/95fact/802389h.gif> (1995)
+# says that Uzbekistan has two time zones, but a cable
+# <URL:http://www.itaiep.doc.gov/bisnis/cables/960510uz.html> (1996-05-10)
+# from the American Embassy in Tashkent implies that they have just one.
 
 # Vietnam
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
@@ -889,7 +869,7 @@ Zone	Asia/Tashkent	4:37:12 -	LMT	1924 May  2
 # From Shanks (1991):
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Saigon	7:06:40 -	LMT	1906 Jun  9
-			7:06	-	SMT	1911 Mar 11 0:01     # Saigon MT
+			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
 			7:00	-	ICT	1912 May
 			8:00	-	ICT	1931 May
 			7:00	-	ICT