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, 168 insertions, 164 deletions

diff --git a/time/southamerica b/time/southamerica
index c3c5c99fbe..cb5b34bfc6 100644
--- a/time/southamerica
+++ b/time/southamerica
@@ -1,33 +1,35 @@
-# @(#)southamerica	7.12
+# @(#)southamerica	7.13
 
 # 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> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1996-09-03):
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks, The International Atlas (3rd edition),
 # San Diego: ACS Publications, Inc. (1991).
 # Except where otherwise noted, it is the source for the data below.
 #
-# I invented the abbreviations marked `*' in the following table;
-# the rest are from earlier versions of this file, or from other sources.
-# Some of these are just plausible excuses for common English abbreviations.
+# The following abbreviations are used in this file.
 # Corrections are welcome!
 #		std	dst
 #		LMT		Local Mean Time
 #	-2:00	FST	FDT	Fernando de Noronha
-#	-3:00	EST	EDT	Eastern South America (conflicts with -5:00)
-#	-3:00	ARST	ARDT	Argentina
-#	-4:00	AST	ADT	Andes*, Antilles*, Asuncion*, Atlantic
-#	-4:00	CST	CDT	Chile (conflicts with -6:00)
+#	-3:00	EST	EDT	Eastern Brazil
 #	-4:00	WST	WDT	Western Brazil
-#	-5:00	AST	ADT	Acre (conflicts with -4:00)
-#	-5:00	EST	EDT	Eastern, Ecuador*
-#	-6:00	CST	CDT	Archipelago of Columbus*, Central
-#	-7:00	MST	MDT	Mataveri*, Mountain
+#	-4:00	AST	ADT	Atlantic
+#	-5:00	AST	ADT	Acre
 #
-# See the `africa' file for Zone naming conventions.
+# See the `africa' file for time zone naming and abbreviation conventions.
+# Earlier editions of these tables used the North American style (e.g. ARST and
+# ARDT for Argentine Standard and Daylight Time), but the following quote
+# suggests that it's better to use European style (e.g. ART and ARST).
+#	I suggest the use of _Summer time_ instead of the more cumbersome
+#	_daylight-saving time_.  _Summer time_ seems to be in general use
+#	in Europe and South America.
+#	-- E O Cutler, _New York Times_ (1937-02-14), quoted in
+#	H L Mencken, _The American Language: Supplement I_ (1960), p 466
+
 
 # From Guy Harris:
 # From Official Airline Guide - Worldwide Edition (1987).  Countries not
@@ -55,35 +57,35 @@
 # AR was chosen because they are the ISO letters that represent Argentina.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Arg	1930	only	-	Dec	 1	0:00	1:00	D
-Rule	Arg	1931	only	-	Apr	 1	0:00	0	S
-Rule	Arg	1931	only	-	Oct	15	0:00	1:00	D
-Rule	Arg	1932	1940	-	Mar	 1	0:00	0	S
-Rule	Arg	1932	1939	-	Nov	 1	0:00	1:00	D
-Rule	Arg	1940	only	-	Jul	 1	0:00	1:00	D
-Rule	Arg	1941	only	-	Jun	15	0:00	0	S
-Rule	Arg	1941	only	-	Oct	15	0:00	1:00	D
-Rule	Arg	1943	only	-	Aug	 1	0:00	0	S
-Rule	Arg	1943	only	-	Oct	15	0:00	1:00	D
-Rule	Arg	1946	only	-	Mar	 1	0:00	0	S
-Rule	Arg	1946	only	-	Oct	 1	0:00	1:00	D
-Rule	Arg	1963	only	-	Oct	 1	0:00	0	S
-Rule	Arg	1963	only	-	Dec	15	0:00	1:00	D
-Rule	Arg	1964	1966	-	Mar	 1	0:00	0	S
-Rule	Arg	1964	1966	-	Oct	15	0:00	1:00	D
-Rule	Arg	1967	only	-	Apr	 1	0:00	0	S
-Rule	Arg	1967	1968	-	Oct	Sun<=7	0:00	1:00	D
-Rule	Arg	1968	1969	-	Apr	Sun<=7	0:00	0	S
-Rule	Arg	1974	only	-	Jan	23	0:00	1:00	D
-Rule	Arg	1974	only	-	May	 1	0:00	0	S
-Rule	Arg	1974	1976	-	Oct	Sun<=7	0:00	1:00	D
-Rule	Arg	1975	1977	-	Apr	Sun<=7	0:00	0	S
-Rule	Arg	1985	only	-	Nov	 2	0:00	1:00	D
-Rule	Arg	1986	only	-	Mar	14	0:00	0	S
-Rule	Arg	1986	1987	-	Oct	25	0:00	1:00	D
-Rule	Arg	1987	only	-	Feb	13	0:00	0	S
-Rule	Arg	1988	only	-	Feb	 7	0:00	0	S
-Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	D
+Rule	Arg	1930	only	-	Dec	 1	0:00	1:00	S
+Rule	Arg	1931	only	-	Apr	 1	0:00	0	-
+Rule	Arg	1931	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1932	1940	-	Mar	 1	0:00	0	-
+Rule	Arg	1932	1939	-	Nov	 1	0:00	1:00	S
+Rule	Arg	1940	only	-	Jul	 1	0:00	1:00	S
+Rule	Arg	1941	only	-	Jun	15	0:00	0	-
+Rule	Arg	1941	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1943	only	-	Aug	 1	0:00	0	-
+Rule	Arg	1943	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1946	only	-	Mar	 1	0:00	0	-
+Rule	Arg	1946	only	-	Oct	 1	0:00	1:00	S
+Rule	Arg	1963	only	-	Oct	 1	0:00	0	-
+Rule	Arg	1963	only	-	Dec	15	0:00	1:00	S
+Rule	Arg	1964	1966	-	Mar	 1	0:00	0	-
+Rule	Arg	1964	1966	-	Oct	15	0:00	1:00	S
+Rule	Arg	1967	only	-	Apr	 1	0:00	0	-
+Rule	Arg	1967	1968	-	Oct	Sun<=7	0:00	1:00	S
+Rule	Arg	1968	1969	-	Apr	Sun<=7	0:00	0	-
+Rule	Arg	1974	only	-	Jan	23	0:00	1:00	S
+Rule	Arg	1974	only	-	May	 1	0:00	0	-
+Rule	Arg	1974	1976	-	Oct	Sun<=7	0:00	1:00	S
+Rule	Arg	1975	1977	-	Apr	Sun<=7	0:00	0	-
+Rule	Arg	1985	only	-	Nov	 2	0:00	1:00	S
+Rule	Arg	1986	only	-	Mar	14	0:00	0	-
+Rule	Arg	1986	1987	-	Oct	25	0:00	1:00	S
+Rule	Arg	1987	only	-	Feb	13	0:00	0	-
+Rule	Arg	1988	only	-	Feb	 7	0:00	0	-
+Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
 #
 # From Hernan G. Otero <hernan@isoft.com.ar> (June 26, 1995):
 # These corrections were contributed by InterSoft Argentina S.A.,
@@ -92,8 +94,8 @@ Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	D
 # (Argentinian Naval Hydrography Institute)
 #
 # Shanks gives 1989 Mar 16 and stops after 1990 Mar 4; go with Otero.
-Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	S
-Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	D
+Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	-
+Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	S
 #
 # From Hernan G. Otero <hernan@isoft.com.ar> (June 26, 1995):
 # From this moment on, the law that mandated the daylight saving
@@ -102,23 +104,23 @@ Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	D
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Buenos_Aires -3:53:48 -	LMT	1894 Nov
-			-4:17	-	CMT	1920 May    # Cordoba Mean Time
-			-4:00	-	AST	1930 Dec
-			-4:00	Arg	A%sT	1969 Oct 5
+			-4:16:44 -	CMT	1920 May    # Cordoba Mean Time
+			-4:00	-	ART	1930 Dec
+			-4:00	Arg	AR%sT	1969 Oct 5
 			-3:00	Arg	AR%sT
 
 # Aruba
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12	# Oranjestad
-			-4:30	-	NAST	1965	# Netherlands Antilles
+			-4:30	-	ANT	1965 # Netherlands Antilles Time
 			-4:00	-	AST
 
 # Bolivia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/La_Paz	-4:32:36 -	LMT	1890
-			-4:33	-	LPMT	1931 Oct 15 # La Paz Mean Time
-			-4:33	1:00	LPDT	1932 Mar 21
-			-4:00	-	AST
+			-4:32:36 -	LPMT	1931 Oct 15 # La Paz Mean Time
+			-4:32:36 1:00	BOST	1932 Mar 21 # Bolivia ST
+			-4:00	-	BOT	# Bolivia Time
 
 # Brazil
 
@@ -164,26 +166,26 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # about time zone changes after 1990 Feb 11.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Brazil	1931	only	-	Oct	 3	11:00	1	D
+Rule	Brazil	1931	only	-	Oct	 3	11:00	1:00	D
 Rule	Brazil	1932	1933	-	Apr	 1	 0:00	0	S
-Rule	Brazil	1932	only	-	Oct	 3	 0:00	1	D
-Rule	Brazil	1949	1952	-	Dec	 1	 0:00	1	D
+Rule	Brazil	1932	only	-	Oct	 3	 0:00	1:00	D
+Rule	Brazil	1949	1952	-	Dec	 1	 0:00	1:00	D
 Rule	Brazil	1950	only	-	Apr	16	 0:00	0	S
 Rule	Brazil	1951	1953	-	Apr	 1	 0:00	0	S
-Rule	Brazil	1963	only	-	Dec	 9	 0:00	1	D
+Rule	Brazil	1963	only	-	Dec	 9	 0:00	1:00	D
 Rule	Brazil	1964	only	-	Mar	 1	 0:00	0	S
-Rule	Brazil	1965	only	-	Jan	31	 0:00	1	D
+Rule	Brazil	1965	only	-	Jan	31	 0:00	1:00	D
 Rule	Brazil	1965	only	-	Apr	 1	 0:00	0	S
-Rule	Brazil	1965	only	-	Dec	 1	 0:00	1	D
+Rule	Brazil	1965	only	-	Dec	 1	 0:00	1:00	D
 Rule	Brazil	1966	1968	-	Mar	 1	 0:00	0	S
-Rule	Brazil	1966	1967	-	Nov	 1	 0:00	1	D
-Rule	Brazil	1985	only	-	Nov	 2	 0:00	1	D
+Rule	Brazil	1966	1967	-	Nov	 1	 0:00	1:00	D
+Rule	Brazil	1985	only	-	Nov	 2	 0:00	1:00	D
 Rule	Brazil	1986	only	-	Mar	15	 0:00	0	S
-Rule	Brazil	1986	1987	-	Oct	Sat<=28	 0:00	1	D
+Rule	Brazil	1986	1987	-	Oct	Sat<=28	 0:00	1:00	D
 Rule	Brazil	1987	only	-	Feb	14	 0:00	0	S
 Rule	Brazil	1988	only	-	Feb	 7	 0:00	0	S
 Rule	Brazil	1989	only	-	Jan	22	 0:00	0	S
-Rule	Brazil	1988	max	-	Oct	Sun>=15	 0:00	1	D
+Rule	Brazil	1988	max	-	Oct	Sun>=15	 0:00	1:00	D
 Rule	Brazil	1990	max	-	Feb	Sun>=8	 0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Noronha	-2:09:40 -	LMT	1914
@@ -209,21 +211,21 @@ Zone America/Porto_Acre	-4:31:12 -	LMT	1914
 # of October....  The law is the same for March and October.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Chile	1918	only	-	Sep	1	0:00	1:00	D
-Rule	Chile	1919	only	-	Jul	2	0:00	0	S
-Rule	Chile	1927	1931	-	Sep	1	0:00	1:00	D
-Rule	Chile	1928	1932	-	Apr	1	0:00	0	S
-Rule	Chile	1969	max	-	Oct	Sun>=9	0:00	1:00	D
-Rule	Chile	1970	max	-	Mar	Sun>=9	0:00	0	S
+Rule	Chile	1918	only	-	Sep	1	0:00	1:00	S
+Rule	Chile	1919	only	-	Jul	2	0:00	0	-
+Rule	Chile	1927	1931	-	Sep	1	0:00	1:00	S
+Rule	Chile	1928	1932	-	Apr	1	0:00	0	-
+Rule	Chile	1969	max	-	Oct	Sun>=9	0:00	1:00	S
+Rule	Chile	1970	max	-	Mar	Sun>=9	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Santiago	-4:42:40 -	LMT	1890
-			-4:43	-	SMT	1910	    # Santiago Mean Time
-			-5:00	Chile	C%sT	1932 Sep
-			-4:00	Chile	C%sT
+			-4:42:40 -	SMT	1910	    # Santiago Mean Time
+			-5:00	Chile	CL%sT	1932 Sep    # Chile Time
+			-4:00	Chile	CL%sT
 Zone Pacific/Easter	-7:17:28 -	LMT	1890	    # Mataveri
-			-7:17	-	MMT	1932 Sep    # Mataveri Mean Time
-			-7:00	Chile	M%sT	1982 Mar 14
-			-6:00	Chile	C%sT
+			-7:17:28 -	MMT	1932 Sep    # Mataveri Mean Time
+			-7:00	Chile	EAS%sT	1982 Mar 14 # Easter I Time
+			-6:00	Chile	EAS%sT
 #
 # Whitman says Juan Fernandez Is are like America/Santiago.
 # San Ambrosio, San Felix
@@ -233,56 +235,57 @@ Zone Pacific/Easter	-7:17:28 -	LMT	1890	    # Mataveri
 # Colombia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Bogota	-4:56:20 -	LMT	1884 Mar 13
-			-4:56	-	BMT	1914 Nov 23 # Bogota Mean Time
-			-5:00	-	EST
+			-4:56:20 -	BMT	1914 Nov 23 # Bogota Mean Time
+			-5:00	-	COT	# Colombia Time
 # Malpelo, Providencia, San Andres
 # no information; probably like America/Bogota
 
 # Curacao
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Curacao	-4:35:44 -	LMT	1912 Feb 12	# Willemstad
-			-4:30	-	NAST	1965	# Netherlands Antilles
+			-4:30	-	ANT	1965 # Netherlands Antilles Time
 			-4:00	-	AST
 
 # Ecuador
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Guayaquil	-5:19:20 -	LMT	1890
-			-5:14	-	QMT	1931 # Quito Mean Time
-			-5:00	-	EST
+			-5:14:00 -	QMT	1931 # Quito Mean Time
+			-5:00	-	ECT	     # Ecuador Time
 Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
-			-5:00	-	EST	1986
-			-6:00	-	CST
+			-5:00	-	ECT	1986
+			-6:00	-	GALT	     # Galapagos Time
 
 # Falklands
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Falk	1937	1938	-	Sep	lastSun	0:00	1:00	D
-Rule	Falk	1938	1942	-	Mar	Sun>=19	0:00	0	S
-Rule	Falk	1939	only	-	Oct	1	0:00	1:00	D
-Rule	Falk	1940	1942	-	Sep	lastSun	0:00	1:00	D
-Rule	Falk	1943	only	-	Jan	1	0:00	0	S
-Rule	Falk	1983	only	-	Sep	lastSun	0:00	1:00	D
-Rule	Falk	1984	1985	-	Apr	lastSun	0:00	0	S
-Rule	Falk	1984	only	-	Sep	16	0:00	1:00	D
-Rule	Falk	1985	max	-	Sep	Sun>=9	0:00	1:00	D
-Rule	Falk	1986	max	-	Apr	Sun>=16	0:00	0	S
+Rule	Falk	1937	1938	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1938	1942	-	Mar	Sun>=19	0:00	0	-
+Rule	Falk	1939	only	-	Oct	1	0:00	1:00	S
+Rule	Falk	1940	1942	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1943	only	-	Jan	1	0:00	0	-
+Rule	Falk	1983	only	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1984	1985	-	Apr	lastSun	0:00	0	-
+Rule	Falk	1984	only	-	Sep	16	0:00	1:00	S
+Rule	Falk	1985	max	-	Sep	Sun>=9	0:00	1:00	S
+Rule	Falk	1986	max	-	Apr	Sun>=16	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
-			-3:51	-	SMT	1912 Mar 12  # Stanley Mean Time
-			-4:00	Falk	A%sT	1983 May
-			-3:00	Falk	E%sT	1985 Sep 15
-			-4:00	Falk	A%sT
+			-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
 
 # French Guiana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Cayenne	-3:29:20 -	LMT	1911 Jul
-			-4:00	-	AST	1967 Oct
-			-3:00	-	EST
+			-4:00	-	GFT	1967 Oct # French Guiana Time
+			-3:00	-	GFT
 
 # Guyana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
-			-3:45	-	BGST	1975 Jul 31  # British Guiana ST
-			-3:00	-	EST
+			-3:45	-	GBGT	1966 May 26 # Br Guiana Time
+			-3:45	-	GYT	1975 Jul 31 # Guyana Time
+			-3:00	-	GYT
 
 
 # Paraguay
@@ -297,39 +300,39 @@ Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
 
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Para	1975	1978	-	Oct	 1	0:00	1:00	D
-Rule	Para	1975	1978	-	Mar	 1	0:00	0	S
+Rule	Para	1975	1978	-	Oct	 1	0:00	1:00	S
+Rule	Para	1975	1978	-	Mar	 1	0:00	0	-
 # Shanks says 1979 was all DST.
-Rule	Para	1980	max	-	Apr	 1	0:00	0	S
-Rule	Para	1980	1988	-	Oct	 1	0:00	1:00	D
-Rule	Para	1989	only	-	Oct	22	0:00	1:00	D
-Rule	Para	1990	max	-	Oct	 1	0:00	1:00	D
+Rule	Para	1980	max	-	Apr	 1	0:00	0	-
+Rule	Para	1980	1988	-	Oct	 1	0:00	1:00	S
+Rule	Para	1989	only	-	Oct	22	0:00	1:00	S
+Rule	Para	1990	max	-	Oct	 1	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Asuncion	-3:50:40 -	LMT	1890
-			-3:51	-	AMT	1931 Oct 10 # Asuncion Mean Time
-			-4:00	-	AST	1972 Oct
-			-3:00	-	EST	1974 Apr
-			-4:00	Para	A%sT
+			-3:50:40 -	AMT	1931 Oct 10 # Asuncion Mean Time
+			-4:00	-	PYT	1972 Oct # Paraguay Time
+			-3:00	-	PYT	1974 Apr
+			-4:00	Para	PY%sT
 
 # Peru
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Peru	1938	only	-	Jan	 1	0:00	1:00	D
-Rule	Peru	1938	only	-	Apr	 1	0:00	0	S
-Rule	Peru	1938	1939	-	Sep	lastSun	0:00	1:00	D
-Rule	Peru	1939	1940	-	Mar	Sun>=24	0:00	0	S
-Rule	Peru	1987	only	-	Jan	 1	0:00	1:00	D
-Rule	Peru	1987	only	-	Apr	 1	0:00	0	S
-Rule	Peru	1990	only	-	Jan	 1	0:00	1:00	D
-Rule	Peru	1990	only	-	Apr	 1	0:00	0	S
+Rule	Peru	1938	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1938	only	-	Apr	 1	0:00	0	-
+Rule	Peru	1938	1939	-	Sep	lastSun	0:00	1:00	S
+Rule	Peru	1939	1940	-	Mar	Sun>=24	0:00	0	-
+Rule	Peru	1987	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1987	only	-	Apr	 1	0:00	0	-
+Rule	Peru	1990	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1990	only	-	Apr	 1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Lima	-5:08:12 -	LMT	1890
-			-5:09	-	LMT	1908 Jul 28
-			-5:00	Peru	E%sT
+			-5:09	-	LMT	1908 Jul 28 # Lima Mean Time
+			-5:00	Peru	PE%sT	# Peru Time
 
 # South Georgia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890		# Grytviken
-			-2:00	-	FST
+			-2:00	-	GST	# South Georgia Time
 
 # South Sandwich Is
 # uninhabited
@@ -339,8 +342,9 @@ Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890		# Grytviken
 Zone America/Paramaribo	-3:40:40 -	LMT	1911
 			-3:40:52 -	PMT	1935     # Paramaribo Mean Time
 			-3:40:36 -	PMT	1945 Oct # The capital moved?
-			-3:30	-	DGST	1984 Oct # Dutch Guiana Std Time
-			-3:00	-	EST
+			-3:30	-	NEGT	1975 Nov 20 # Dutch Guiana Time
+			-3:30	-	SRT	1984 Oct # Suriname Time
+			-3:00	-	SRT
 
 # Trinidad and Tobago
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -353,55 +357,55 @@ Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Whitman gives 1923 Oct 1; go with Shanks.
-Rule	Uruguay	1923	only	-	Oct	 2	 0:00	0:30	HD
-Rule	Uruguay	1924	1926	-	Apr	 1	 0:00	0	S
-Rule	Uruguay	1924	1925	-	Oct	 1	 0:00	0:30	HD
-Rule	Uruguay	1933	1935	-	Oct	lastSun	 0:00	0:30	HD
+Rule	Uruguay	1923	only	-	Oct	 2	 0:00	0:30	HS
+Rule	Uruguay	1924	1926	-	Apr	 1	 0:00	0	-
+Rule	Uruguay	1924	1925	-	Oct	 1	 0:00	0:30	HS
+Rule	Uruguay	1933	1935	-	Oct	lastSun	 0:00	0:30	HS
 # Shanks gives 1935 Apr 1 0:00 and 1936 Mar 30 0:00; go with Whitman.
-Rule	Uruguay	1934	1936	-	Mar	Sat>=25	23:30s	0	S
-Rule	Uruguay	1936	only	-	Nov	 1	 0:00	0:30	HD
-Rule	Uruguay	1937	1941	-	Mar	lastSun	 0:00	0	S
+Rule	Uruguay	1934	1936	-	Mar	Sat>=25	23:30s	0	-
+Rule	Uruguay	1936	only	-	Nov	 1	 0:00	0:30	HS
+Rule	Uruguay	1937	1941	-	Mar	lastSun	 0:00	0	-
 # Whitman gives 1937 Oct 3; go with Shanks.
-Rule	Uruguay	1937	1940	-	Oct	lastSun	 0:00	0:30	HD
+Rule	Uruguay	1937	1940	-	Oct	lastSun	 0:00	0:30	HS
 # Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
 # and 1943 Apr 13 ``to present time''; go with Shanks.
-Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0	S
-Rule	Uruguay	1942	only	-	Jan	 1	 0:00	0:30	HD
-Rule	Uruguay	1942	only	-	Dec	14	 0:00	1:00	D
-Rule	Uruguay	1943	only	-	Mar	14	 0:00	0	S
-Rule	Uruguay	1959	only	-	May	24	 0:00	1:00	D
-Rule	Uruguay	1959	only	-	Nov	15	 0:00	0	S
-Rule	Uruguay	1960	only	-	Jan	17	 0:00	1:00	D
-Rule	Uruguay	1960	only	-	Mar	 6	 0:00	0	S
-Rule	Uruguay	1965	1967	-	Apr	Sun>=1	 0:00	1:00	D
-Rule	Uruguay	1965	only	-	Sep	26	 0:00	0	S
-Rule	Uruguay	1966	1967	-	Oct	31	 0:00	0	S
-Rule	Uruguay	1968	1970	-	May	27	 0:00	0:30	HD
-Rule	Uruguay	1968	1970	-	Dec	 2	 0:00	0	S
-Rule	Uruguay	1972	only	-	Apr	24	 0:00	1:00	D
-Rule	Uruguay	1972	only	-	Aug	15	 0:00	0	S
-Rule	Uruguay	1974	only	-	Mar	10	 0:00	0:30	HD
-Rule	Uruguay	1974	only	-	Dec	22	 0:00	1:00	D
-Rule	Uruguay	1976	only	-	Oct	 1	 0:00	0	S
-Rule	Uruguay	1977	only	-	Dec	 4	 0:00	1:00	D
-Rule	Uruguay	1978	only	-	Apr	 1	 0:00	0	S
-Rule	Uruguay	1979	only	-	Oct	 1	 0:00	1:00	D
-Rule	Uruguay	1980	only	-	May	 1	 0:00	0	S
-Rule	Uruguay	1987	only	-	Dec	14	 0:00	1:00	D
-Rule	Uruguay	1988	only	-	Mar	14	 0:00	0	S
-Rule	Uruguay	1988	only	-	Dec	11	 0:00	1:00	D
-Rule	Uruguay	1989	only	-	Mar	12	 0:00	0	S
-Rule	Uruguay	1989	only	-	Oct	29	 0:00	1:00	D
-Rule	Uruguay	1990	only	-	Mar	 4	 0:00	0	S
+Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0	-
+Rule	Uruguay	1942	only	-	Jan	 1	 0:00	0:30	HS
+Rule	Uruguay	1942	only	-	Dec	14	 0:00	1:00	S
+Rule	Uruguay	1943	only	-	Mar	14	 0:00	0	-
+Rule	Uruguay	1959	only	-	May	24	 0:00	1:00	S
+Rule	Uruguay	1959	only	-	Nov	15	 0:00	0	-
+Rule	Uruguay	1960	only	-	Jan	17	 0:00	1:00	S
+Rule	Uruguay	1960	only	-	Mar	 6	 0:00	0	-
+Rule	Uruguay	1965	1967	-	Apr	Sun>=1	 0:00	1:00	S
+Rule	Uruguay	1965	only	-	Sep	26	 0:00	0	-
+Rule	Uruguay	1966	1967	-	Oct	31	 0:00	0	-
+Rule	Uruguay	1968	1970	-	May	27	 0:00	0:30	HS
+Rule	Uruguay	1968	1970	-	Dec	 2	 0:00	0	-
+Rule	Uruguay	1972	only	-	Apr	24	 0:00	1:00	S
+Rule	Uruguay	1972	only	-	Aug	15	 0:00	0	-
+Rule	Uruguay	1974	only	-	Mar	10	 0:00	0:30	HS
+Rule	Uruguay	1974	only	-	Dec	22	 0:00	1:00	S
+Rule	Uruguay	1976	only	-	Oct	 1	 0:00	0	-
+Rule	Uruguay	1977	only	-	Dec	 4	 0:00	1:00	S
+Rule	Uruguay	1978	only	-	Apr	 1	 0:00	0	-
+Rule	Uruguay	1979	only	-	Oct	 1	 0:00	1:00	S
+Rule	Uruguay	1980	only	-	May	 1	 0:00	0	-
+Rule	Uruguay	1987	only	-	Dec	14	 0:00	1:00	S
+Rule	Uruguay	1988	only	-	Mar	14	 0:00	0	-
+Rule	Uruguay	1988	only	-	Dec	11	 0:00	1:00	S
+Rule	Uruguay	1989	only	-	Mar	12	 0:00	0	-
+Rule	Uruguay	1989	only	-	Oct	29	 0:00	1:00	S
+Rule	Uruguay	1990	only	-	Mar	 4	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
-			-3:45	-	MMT	1920 May  1	# Montevideo MT
-			-3:30	Uruguay	U%sT	1942 Dec 14	# Uruguay ST
-			-3:00	Uruguay	E%sT
+			-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
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
-			-4:28	-	CMT	1912 Feb 12  # Caracas Mean Time
-			-4:30	-	VZT	1965		# Venezuela Time
-			-4:00	-	AST
+			-4:27:44 -	CMT	1912 Feb 12  # Caracas Mean Time
+			-4:30	-	VET	1965	     # Venezuela Time
+			-4:00	-	VET