Import 2012j database

14 files changed, 192 insertions, 184 deletions

diff --git a/Makefile b/Makefile
index bafc88b..08d2ff2 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,12 @@ docs: dist
 	cp src/README.txt build/docs/source/index.txt
 	cp conf.py build/docs/source/conf.py
 	sphinx-build build/docs/source build/docs/built
+	chmod -R og-w build/docs/built
+	chmod -R a+rX build/docs/built
 
+upload_docs: docs
+	rsync -e ssh -ravP build/docs/built/ \
+	    web.sourceforge.net:/home/project-web/pytz/htdocs/
 
 .stamp-tzinfo: .stamp-zoneinfo gen_tzinfo.py build/etc/zoneinfo/GMT
 	${PYTHON} gen_tzinfo.py ${TARGET}
diff --git a/elsie.nci.nih.gov/src/Makefile b/elsie.nci.nih.gov/src/Makefile
index ab0f54b..d76a81e 100644
--- a/elsie.nci.nih.gov/src/Makefile
+++ b/elsie.nci.nih.gov/src/Makefile
@@ -2,8 +2,11 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
+# Package name for the code distribution.
+PACKAGE=	tzcode
+
 # Version numbers of the code and data distributions.
-VERSION=	2012h
+VERSION=	2012j
 
 # Change the line below for your time zone (after finding the zone you want in
 # the time zone files, or adding it to a time zone file).
@@ -224,14 +227,20 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
 
 CFLAGS=
 
-# If you want zic's -s option used when installing, uncomment the next line
-# ZFLAGS=	-s
+# Linker flags.  Default to $(LFLAGS) for backwards compatibility
+# to tzcode2012h and earlier.
+
+LDFLAGS=	$(LFLAGS)
 
 zic=		./zic
 ZIC=		$(zic) $(ZFLAGS)
 
 # The name of a Posix-compliant `awk' on your system.
-AWK=		nawk
+AWK=		awk
+
+# The full path name of a Posix-compliant shell that supports the Korn shell's
+# 'select' statement, as an extension.  These days, Bash is the most popular.
+KSHELL=		/bin/bash
 
 # The path where SGML DTDs are kept.
 # The default is appropriate for Ubuntu.
@@ -334,14 +343,14 @@ INSTALL:	ALL install date.1
 		cp date.1 $(MANDIR)/man1/.
 
 version.h:
-		echo >$@ \
-		  'static char const TZVERSION[]="tz$(VERSION)";'
+		(echo 'static char const PKGVERSION[]="($(PACKAGE)) ";' && \
+		 echo 'static char const TZVERSION[]="$(VERSION)";') >$@
 
 zdump:		$(TZDOBJS)
-		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
+		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
 
 zic:		$(TZCOBJS) yearistype
-		$(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
+		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
 
 yearistype:	yearistype.sh
 		cp yearistype.sh yearistype
@@ -376,18 +385,19 @@ zones:		$(REDO)
 $(TZLIB):	$(LIBOBJS)
 		-mkdir $(TOPDIR) $(LIBDIR)
 		ar ru $@ $(LIBOBJS)
-		if [ -x /usr/ucb/ranlib -o -x /usr/bin/ranlib ] ; \
+		if [ -x /usr/ucb/ranlib ] || [ -x /usr/bin/ranlib ]; \
 			then ranlib $@ ; fi
 
 date:		$(DATEOBJS)
-		$(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
-			$(LDLIBS) -lc -o $@
+		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
 
 tzselect:	tzselect.ksh
 		sed \
+			-e 's|#!/bin/bash|#!$(KSHELL)|g' \
 			-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
+			-e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \
 			-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
-			-e 's|\(TZVERSION\)=.*|\1=tz$(VERSION)|' \
+			-e 's|\(TZVERSION\)=.*|\1=$(VERSION)|' \
 			<$? >$@
 		chmod +x $@
 
@@ -402,15 +412,18 @@ check_web:	$(WEB_PAGES)
 clean:
 		rm -f core *.o *.out \
 		  date tzselect version.h zdump zic yearistype
+		rm -f -r tzpublic
 
 maintainer-clean: clean
 		@echo 'This command is intended for maintainers to use; it'
 		@echo 'deletes files that may need special tools to rebuild.'
-		rm -f *.[1-8].txt tzcode*.tar.gz tzdata*.tar.gz
+		rm -f *.[1-8].txt *.asc *.tar.gz
 
 names:
 		@echo $(ENCHILADA)
 
+public:		check check_public set-timestamps tarballs signatures
+
 # Set the time stamps to those of the git repository, if available,
 # and if the files have not changed since then.
 # This uses GNU 'touch' syntax 'touch -d@N FILE',
@@ -430,26 +443,40 @@ set-timestamps:
 # The zics below ensure that each data file can stand on its own.
 # We also do an all-files run to catch links to links.
 
-public:		$(ENCHILADA) set-timestamps
+check_public:	$(ENCHILADA)
 		make maintainer-clean
 		make "CFLAGS=$(GCC_DEBUG_FLAGS)"
-		mkdir -m go-rwx /tmp/,tzpublic
-		-for i in $(TDATA) ; do zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; done
-		for i in $(TDATA) ; do zic -d /tmp/,tzpublic $$i || exit; done
-		zic -v -d /tmp/,tzpublic $(TDATA) || exit
-		rm -f -r /tmp/,tzpublic
+		mkdir tzpublic
+		for i in $(TDATA) ; do \
+		  $(zic) -v -d tzpublic $$i 2>&1 || exit; \
+		done
+		$(zic) -v -d tzpublic $(TDATA)
+		rm -f -r tzpublic
+
+tarballs:	tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
+
+tzcode$(VERSION).tar.gz: $(COMMON) $(DOCS) $(SOURCES) $(MISC)
 		for i in *.[1-8] ; do \
 		  LC_ALL=C sh workman.sh $$i > $$i.txt && \
 		  touch -r $$i $$i.txt || exit; \
 		done
-		$(AWK) -f checktab.awk $(PRIMARY_YDATA)
 		LC_ALL=C && export LC_ALL && \
 		tar $(TARFLAGS) -cf - \
 		    $(COMMON) $(DOCS) $(SOURCES) $(MISC) *.[1-8].txt | \
-		  gzip $(GZIPFLAGS) > tzcode$(VERSION).tar.gz
+		  gzip $(GZIPFLAGS) > $@
+
+tzdata$(VERSION).tar.gz: $(COMMON) $(DATA)
 		LC_ALL=C && export LC_ALL && \
 		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) | \
-		  gzip $(GZIPFLAGS) > tzdata$(VERSION).tar.gz
+		  gzip $(GZIPFLAGS) > $@
+
+signatures:	tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc
+
+tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
+		gpg --armor --detach-sign $?
+
+tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
+		gpg --armor --detach-sign $?
 
 typecheck:
 		make clean
diff --git a/elsie.nci.nih.gov/src/africa b/elsie.nci.nih.gov/src/africa
index 1c6e520..54c7a1e 100644
--- a/elsie.nci.nih.gov/src/africa
+++ b/elsie.nci.nih.gov/src/africa
@@ -4,7 +4,7 @@
 
 # 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).
+# tz@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 #
@@ -424,6 +424,20 @@ Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
 
 # Libya
 
+# From Even Scharning (2012-11-10):
+# Libya set their time one hour back at 02:00 on Saturday November 10.
+# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
+# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
+#
+# Steffen Thorsen forwarded a translation (2012-11-10) in
+# http://mm.icann.org/pipermail/tz/2012-November/018451.html
+#
+# From Tim Parenti (2012-11-11):
+# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
+# The DST rules planned for 2013 and onward roughly mirror those of Europe
+# (either two days before them or five days after them, so as to fall on
+# lastFri instead of lastSun).
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
 Rule	Libya	1952	only	-	Jan	 1	0:00	0	-
@@ -438,17 +452,21 @@ Rule	Libya	1986	only	-	Apr	 4	0:00	1:00	S
 Rule	Libya	1986	only	-	Oct	 3	0:00	0	-
 Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	S
 Rule	Libya	1987	1989	-	Oct	 1	0:00	0	-
+Rule	Libya	1997	only	-	Apr	 4	0:00	1:00	S
+Rule	Libya	1997	only	-	Oct	 4	0:00	0	-
+Rule	Libya	2013	max	-	Mar	lastFri	1:00	1:00	S
+Rule	Libya	2013	max	-	Oct	lastFri	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	CE%sT	1959
 			2:00	-	EET	1982
 			1:00	Libya	CE%sT	1990 May  4
-# The following entries are from Shanks & Pottenger;
+# The 1996 and 1997 entries are from Shanks & Pottenger;
 # the IATA SSIM data contain some obvious errors.
 			2:00	-	EET	1996 Sep 30
-			1:00	-	CET	1997 Apr  4
-			1:00	1:00	CEST	1997 Oct  4
-			2:00	-	EET
+			1:00	Libya	CE%sT	1997 Oct  4
+			2:00	-	EET	2012 Nov 10 2:00
+			1:00	Libya	CE%sT
 
 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/elsie.nci.nih.gov/src/asia b/elsie.nci.nih.gov/src/asia
index 7d12e8b..d5562c8 100644
--- a/elsie.nci.nih.gov/src/asia
+++ b/elsie.nci.nih.gov/src/asia
@@ -4,7 +4,7 @@
 
 # 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).
+# tz@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 #
@@ -1199,12 +1199,11 @@ Rule	Zion	2012	only	-	Mar	Fri>=26	2:00	1:00	D
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
 
 # From Ephraim Silverberg (2012-10-18):
-
 # Yesterday, the Interior Ministry Committee, after more than a year
 # past, approved sending the proposed June 2011 changes to the Time
 # Decree Law back to the Knesset for second and third (final) votes
 # before the upcoming elections on Jan. 22, 2013.  Hence, although the
-# changes are not yet law, they are expected to be so before Februray 2013.
+# changes are not yet law, they are expected to be so before February 2013.
 #
 # As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March.
 # DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the
@@ -1212,6 +1211,10 @@ Rule	Zion	2012	only	-	Sep	23	2:00	0	S
 # later (i.e. at 02:00 the first Monday after October 2).
 # [Rosh Hashana holidays are factored in until 2100.]
 
+# From Ephraim Silverberg (2012-11-05):
+# The Knesset passed today (in second and final readings) the amendment to the
+# Time Decree Law making the changes ... law.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	2013	max	-	Mar	Fri>=23	2:00	1:00	D
 Rule	Zion	2013	2026	-	Oct	Sun>=2	2:00	0	S
@@ -2049,8 +2052,7 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # occurred before our cutoff date of 1970.
 # However, as we get more information, we may need to add entries
 # for parts of the West Bank as they transitioned from Israel's rules
-# to Palestine's rules.  If you have more info about this, please
-# send it to tz@elsie.nci.nih.gov for incorporation into future editions.
+# to Palestine's rules.
 
 # From IINS News Service - Israel - 1998-03-23 10:38:07 Israel time,
 # forwarded by Ephraim Silverberg:
diff --git a/elsie.nci.nih.gov/src/australasia b/elsie.nci.nih.gov/src/australasia
index 74d476e..bef6f20 100644
--- a/elsie.nci.nih.gov/src/australasia
+++ b/elsie.nci.nih.gov/src/australasia
@@ -780,7 +780,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # 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).
+# tz@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
diff --git a/elsie.nci.nih.gov/src/europe b/elsie.nci.nih.gov/src/europe
index 5d2acc5..ad9816c 100644
--- a/elsie.nci.nih.gov/src/europe
+++ b/elsie.nci.nih.gov/src/europe
@@ -4,7 +4,7 @@
 
 # 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).
+# tz@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
diff --git a/elsie.nci.nih.gov/src/northamerica b/elsie.nci.nih.gov/src/northamerica
index 1f784e0..772d7a4 100644
--- a/elsie.nci.nih.gov/src/northamerica
+++ b/elsie.nci.nih.gov/src/northamerica
@@ -6,7 +6,7 @@
 
 # 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).
+# tz@iana.org for general use in the future).
 
 # From Paul Eggert (1999-03-22):
 # A reliable and entertaining source about time zones is
@@ -2797,6 +2797,13 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 # http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
 # </a>
 
+# From Steffen Thorsen (2012-11-03):
+# Radio Reloj and many other sources report that Cuba is changing back
+# to standard time on 2012-11-04:
+# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre
+# From Paul Eggert (2012-11-03):
+# For now, assume the future rule is first Sunday in November.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
 Rule	Cuba	1928	only	-	Oct	10	0:00	0	S
@@ -2834,7 +2841,7 @@ Rule	Cuba	2009	2010	-	Mar	Sun>=8	0:00s	1:00	D
 Rule	Cuba	2011	only	-	Mar	Sun>=15	0:00s	1:00	D
 Rule	Cuba	2011	only	-	Nov	13	0:00s	0	S
 Rule	Cuba	2012	only	-	Apr	1	0:00s	1:00	D
-Rule	Cuba	2012	max	-	Oct	lastSun	0:00s	0	S
+Rule	Cuba	2012	max	-	Nov	Sun>=1	0:00s	0	S
 Rule	Cuba	2013	max	-	Mar	Sun>=8	0:00s	1:00	D
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/elsie.nci.nih.gov/src/southamerica b/elsie.nci.nih.gov/src/southamerica
index 3195846..3301a43 100644
--- a/elsie.nci.nih.gov/src/southamerica
+++ b/elsie.nci.nih.gov/src/southamerica
@@ -4,7 +4,7 @@
 
 # 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).
+# tz@iana.org for general use in the future).
 
 # From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
diff --git a/elsie.nci.nih.gov/src/tz-link.htm b/elsie.nci.nih.gov/src/tz-link.htm
index d1a8bf1..70e6521 100644
--- a/elsie.nci.nih.gov/src/tz-link.htm
+++ b/elsie.nci.nih.gov/src/tz-link.htm
@@ -8,10 +8,11 @@
 <meta http-equiv="Content-type" content='text/html; charset="US-ASCII"'>
 <meta name="DC.Creator" content="Eggert, Paul">
 <meta name="DC.Contributor" content="Olson, Arthur David">
-<meta name="DC.Date" content="2012-10-26">
+<meta name="DC.Date" content="2012-11-13">
 <meta name="DC.Description"
  content="Sources of information about time zones and daylight saving time">
-<meta name="DC.Identifier" content="http://cs.ucla.edu/~eggert/tz/tz-link.htm">
+<meta name="DC.Identifier"
+ content="http://www.iana.org/time-zones/repository/tz-link.htm">
 <meta name="Keywords"
  content="database,daylight saving,DST,time zone,timezone,tz,zoneinfo">
 </head>
@@ -100,8 +101,14 @@ gzip -dc tzdata-latest.tar.gz | tar -xf -
 </code></pre>
 <p>
 The code and data files can also be obtained from the
-<a href="http://www.iana.org">IANA</a>
-<a href="http://www.iana.org/time-zones">timezone web page</a>.
+<a href="http://www.iana.org/time-zones">timezone web page</a>
+of the <a href="http://www.iana.org">Internet Assigned Numbers
+Authority (IANA)</a>.
+An <a href="https://github.com/eggert/tz">unofficial development
+repository</a> of the code and data is available
+in <a href="http://git-scm.com/">Git</a> form
+from <a href="https://github.com/">GitHub</a>; be careful, as this
+repository is less well tested and probably contains more errors.
 <p>
 The code lets you compile the <code>tz</code> source files into
 machine-readable binary files, one for each location. It also lets
@@ -113,30 +120,19 @@ send changes to the <a href="mailto:tz@iana.org">time zone
 mailing list</a>. You can also <a
 href="http://news.gmane.org/gmane.comp.time.tz">browse recent
 messages</a> sent to the mailing list, <a
-href="https://mm.icann.org/mailman/listinfo/tz">subscribe</a> to it.
-browse the <a
+href="https://mm.icann.org/mailman/listinfo/tz">subscribe</a> to it,
+and browse the <a
 href="http://mm.icann.org/pipermail/tz/">archive of old
-messages</a> (message by message or in gzip compressed format),
-or retrieve <a
-href="ftp://ftp.iana.org/tz/releases/">archived older versions of code
-and data</a>.</p>
+messages</a>.</p>
 <p>
 The Web has several other sources for time zone and daylight saving time data.
-Here are some recent links that may be of interest.
+Here are some links that may be of interest.
 </p>
 <h2>Web pages using recent versions of the <code>tz</code> database</h2>
 <p>
 These are listed roughly in ascending order of complexity and fanciness.
 </p>
 <ul>
-<li>
-<a href="http://permatime.com">
-Permatime</a>
-is a service for generating and viewing links that refer to a
-particular point in time and can be displayed in multiple timezones.
-It uses the ruby tzinfo gem.
-(From Tim Diggins, 2009-11-03.)
-</li>
 <li><a href="http://twiki.org/cgi-bin/xtra/tzdatepick.html">Date and Time Gateway</a>
 lets you see the <code>TZ</code> values directly.</li>
 <li><a
@@ -146,10 +142,13 @@ Time in 1000 Places</a> uses descriptions of the values.</li>
 uses a pulldown menu.</li>
 <li><a href="http://home.tiscali.nl/~t876506/TZworld.html">Complete
 timezone information for all countries</a> displays tables of DST rules.
-<li><a href="http://timeanddate.com/worldclock/">The World Clock -
+<li><a href="http://timeanddate.com/worldclock/">The World Clock &ndash;
 Time Zones</a> lets you sort zone names and convert times.</li>
-<li><a href="http://daylight-savings-time.info/">Graphical Display of
-Time Zones and Daylight Saving Times</a> shows a graph of time
+<li><a href="http://permatime.com/">Permatime</a> generates and views
+links that refer to a particular point in time and can be displayed in
+multiple timezones.</li>
+<li><a href="http://daylight-savings-time.info/">Daylight Saving Time info</a>
+shows a graph of time
 difference versus time for any pair of locations.</li>
 <li>The <a href="http://worldtimeengine.com/">World Time Engine</a>
 also contains data about time zone boundaries; it supports queries via place
@@ -170,7 +169,7 @@ Calendaring and Scheduling Working Group (<abbr
 title="Calendaring and Scheduling Working Group">calsch</abbr>)</a>
 covers time zone
 data; see its VTIMEZONE calendar component.
-The <a href="http://calconnect.org/">Calendaring and Scheduling
+<a href="http://calconnect.org/">CalConnect, The Calendaring and Scheduling
 Consortium</a> is promoting further work in this area. <a
 href="http://calconnect.org/publications/icalendartimezoneproblemsandrecommendationsv1.0.pdf">iCalendar
 TIMEZONE Problems and Recommendations</a> offers guidelines and
@@ -198,7 +197,7 @@ href="http://www.w3.org/2000/01/foo">schema</a> was sketched out.</li>
 </ul>
 <h2>Other <code>tz</code> compilers</h2>
 <ul>
-<li><a href="http://www.dachaplin.dsl.pipex.com/vzic/">Vzic iCalendar
+<li><a href="http://sourceforge.net/projects/vzic/">Vzic iCalendar
 Timezone Converter</a> describes a <a
 href="http://en.wikipedia.org/wiki/C_%28programming_language%29">C</a>
 program that compiles
@@ -245,9 +244,9 @@ compiles <code>tz</code> source into
 It is freely available under the <abbr
 title="Massachusetts Institute of Technology">MIT</abbr> license.</li>
 <li>The <a href="http://chronos-st.org/">Chronos Date/Time
-Library</a> is a <a href="http://smalltalk.org">Smalltalk</a> class
-library that compiles <code>tz</code> source into a <a
-href="http://date-time-zone.com/">time zone repository</a> whose format
+Library</a> is
+a <a href="http://en.wikipedia.org/wiki/Smalltalk">Smalltalk</a> class
+library that compiles <code>tz</code> source into a time zone repository whose format
 is either proprietary or an <a href="http://www.w3.org/XML/"><abbr
 title="Extensible Markup Language">XML</abbr></a>-encoded
 representation.</li>
@@ -282,14 +281,13 @@ It is freely available under the same terms as Perl
 </ul>
 <h2>Other <code>tz</code>-based time zone software</h2>
 <ul>
-<li><a href="http://stemhaus.com/firefox/foxclocks/">FoxClocks</a>
-is an extension for <a
+<li><a href="http://foxclocks.org/">FoxClocks</a>
+is an extension for <a href="http://google.com/chrome">Google
+Chrome</a> and for <a
 href="http://developer.mozilla.org/en/docs/Toolkit_API">Mozilla
 Toolkit</a> applications like <a
-href="http://mozilla.com/firefox">Firefox</a>, <a
-href="http://mozilla.com/thunderbird">Thunderbird</a>, and
-<a
-href="http://www.mozilla.org/projects/calendar/sunbird/">Sunbird</a>.
+href="http://mozilla.com/firefox">Firefox</a> and <a
+href="http://mozilla.com/thunderbird">Thunderbird</a>.
 It displays multiple clocks in the application window, and has a mapping
 interface to <a href="http://earth.google.com/">Google Earth</a>.
 It is freely available under the <abbr>GPL</abbr>.</li>
@@ -298,18 +296,17 @@ href="http://users.skynet.be/Peter.Verthez/projects/intclock/">International
 clock (intclock)</a> is a multi-timezone clock for
 <abbr>GNU</abbr>/Linux and similar systems. It is freely available
 under the <abbr>GPL</abbr>.</li>
-<li><a href="http://codeplex.com/publicdomain">PublicDomain</a>
-has a copy of a recent <code>tz</code> database, accessed via a <a
-href="http://en.wikipedia.org/wiki/C_Sharp">C#</a> library. As its
-name suggests, it is in the public domain. Only current time stamps
-are well supported; historical data are compiled into the runtime but
-are not easily accessible.</li>
-<li><a href="http://java.sun.com/">Sun Java</a> releases since 1.4
+<li><a href="http://www.oracle.com/us/technologies/java/overview/index.html">Oracle
+Java</a> releases since 1.4
 contain a copy of a subset of a recent <code>tz</code> database in a
 Java-specific format.</li>
 <li><a href="http://kimmo.suominen.com/sw/timezone/">Time Zone</a> is
 a <a href="http://wordpress.org/">WordPress</a> plugin. It is freely
 available under a <abbr>BSD</abbr>-style license.</li>
+<li><a href="http://www.relativedata.com/time-zone-master">Time Zone
+Master</a> is a Microsoft Windows clock program that can automatically
+download, compile and use the <code>tzdata<var>D</var>.tar.gz</code>
+files as they are released. The Basic version is free.</li>
 <li><a
 href="http://veladg.com/velaterra.html">VelaTerra</a> is
 a Mac OS X program. Its developers
@@ -318,36 +315,19 @@ licenses</a> to <code>tz</code> contributors.</li>
 <li><a
 href="http://worldtimeexplorer.com/">World Time Explorer</a> is a
 Microsoft Windows program.</li>
-<li>
-<a href="http://www.toriasoft.com">
-WorldClock for Windows and Windows Mobile</a>
-lets users "see the time in up to 25 locations in the world at once."
-(From Hans Nieuwenhuis, 2009-11-02.)
-</li>
-<li>
-<a href="http://www.relativedata.com/time-zone-master">
-Time Zone Master Basic
-</a> "allows people to display multiple desktop clocks, and to
-research current and historical time information, as well as times of
-astronomical events (sunrise/transit/set, moonrise/transit/set, phases,
-season starts) for user-selected dates in the past and future. It can
-automatically download, compile and use the tzdata**.gz database files
-as they are released to keep the data up to date. The software is
-free." (Davie Patte)
-</li>
 </ul>
 <h2>Other time zone databases</h2>
 <ul>
 <li><a href="http://www.astro.com/cgi/aq.cgi">Atlas Query</a>
-is Astrodienst's Web version of Shanks's
-excellent time zone history atlases published in both <a
-href="http://astrocom.com/products/software.php?software_id=ibmwboth">computer</a>
+is Astrodienst's Web version of Shanks and Pottenger's
+time zone history atlases published in both <a
+href="http://astrocom.com/astrology-products/software/acs-atlas-software">computer</a>
 and book form (<a
-href="http://astrocom.com/products/book.php?book_id=b110x">one volume
+href="http://www.astrocom.com/astrology/books/american-atlas">one volume
 for the USA</a>, and <a
-href="http://astrocom.com/products/book.php?book_id=b112x">one for
+href="http://www.astrocom.com/astrology/books/international-atlas">one for
 other locations</a>) by <a
-href="http://astrocom.com/">Astro Communications Services</a>.</li>
+href="http://astrocom.com/">Astro Computing Services</a>.</li>
 <li><a href="http://worldtime.com/">WORLDTIME: interactive atlas,
 time info, public holidays</a>
 contains information on local time, sunrise and sunset,
@@ -366,28 +346,17 @@ gives current time zone rules for airports served by commercial aviation.</li>
 <li>Some Microsoft Windows versions contain time zone information in
 an undocumented format, with IDs that can be mapped to <code>TZ</code>
 values using the <a
-href="http://unicode.org/cldr/data/diff/supplemental/windows_tzid.html">Windows
+href="http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html">Zone
 &rarr; Tzid table</a> maintained by the <abbr
 title="Common Locale Data Repository">CLDR</abbr> data mentioned
 below.</li>
-<li>
-<a href="http://code.google.com/p/tzdata/">
-http://code.google.com/p/tzdata/
-</a>
-provides programming-language-specific representations of timezone
-data. Currently this includes XML, PHP, Ruby, Javascript, JSON and CSV
-formatted data. The repository is updated as soon as the FTP
-distribution is updated. All data can be downloaded as a zip and/or it
-can be obtained/synced via anonymous SVN. Data is made available under
-the MIT license. (From Rich Tibbett.)
-</li>
 </ul>
 <h2>Maps</h2>
 <ul>
 <li>The <a href="https://www.cia.gov/">United States Central
 Intelligence Agency (<abbr
 title="Central Intelligence Agency">CIA</abbr>)</a> publishes a <a
-href="https://www.cia.gov/library/publications/the-world-factbook/reference_maps/pdf/time_zones.pdf">time
+href="https://www.cia.gov/library/publications/the-world-factbook/graphics/ref_maps/physical/pdf/standard_time_zones_of_the_world.pdf">time
 zone map</a>; the
 <a
 href="http://www.lib.utexas.edu/maps/world.html">Perry-Casta&ntilde;eda
@@ -416,9 +385,8 @@ of Countries ("Statoids")</a> contains detailed lists of
 zone boundaries for multizone countries</a> summarizes legal
 boundaries between time zones within countries.</li>
 <li>Manifold.net's <a
-href="http://www.manifold.net/download/freemaps.html">Free Maps and
-<abbr title="Geographic Information Systems">GIS</abbr>
-Data</a> includes a Manifold-format map of
+href="http://manifold.net/info/freestuff.shtml">Free Stuff for
+Manifold System Users</a> includes a Manifold-format map of
 world time zone boundaries distributed under the
 <abbr>GPL</abbr>.</li>
 <li>The <abbr>US</abbr> Geological Survey's National Atlas of
@@ -448,15 +416,15 @@ Saving Time - History, rationale, laws &amp; dates</a>
 is an overall history of <abbr>DST</abbr>.</li>
 <li><a href="http://energy.ca.gov/daylightsaving.html">Saving Time,
 Saving Energy</a> discusses a primary justification for <abbr>DST</abbr>.</li>
-<li><a href="http://seizethedaylight.com/dst/">Who Knew? A Brief
+<li><a href="http://seizethedaylight.com/dst/">A Brief
 History of Daylight Saving Time</a> summarizes some of the contentious
 history of <abbr>DST</abbr>.</li>
-<li><a href="http://toi.iriti.cnr.it/">The
+<li><a href="http://toi.inrim.it/uk/toi.html">The
 Time of Internet</a>
 describes time zones and daylight saving time,
 with diagrams.
 The time zone map is out of date, however.</li>
-<li><a href="http://www.phys.uu.nl/~vgent/idl/idl.htm">A History of
+<li><a href="http://www.staff.science.uu.nl/~gent0113/idl/idl.htm">A History of
 the International Date Line</a> tells the story of the most important
 time zone boundary.</li>
 <li><a href="http://statoids.com/tconcept.html">Basic Time
@@ -466,7 +434,7 @@ Zone Concepts</a> discusses terminological issues behind time zones.</li>
 <dl>
 <dt>Australia</dt>
 <dd>The Parliamentary Library has commissioned <a
-href="http://www.aph.gov.au/LIBRARY/Pubs/rn/2006-07/07rn13.pdf">research
+href="http://www.aph.gov.au/binaries/library/pubs/rn/2006-07/07rn13.pdf">research
 note on daylight saving time in Australia</a>.
 The Bureau of Meteorology publishes a list of
 <a href="http://www.bom.gov.au/climate/averages/tables/dst_times.shtml">Implementation Dates of Daylight Savings Time within Australia</a>.</dd>
@@ -480,17 +448,17 @@ records <a href="http://pcdsh01.on.br/DecHV.html"
 hreflang="pt-BR">Brazil's daylight saving time decrees (in
 Portuguese)</a>.</dd>
 <dt>Canada</dt>
-<dd>The Institute for National Measurement Standards publishes current
+<dd>National Research Council Canada publishes current
 and some older information about <a
-href="http://inms-ienm.nrc-cnrc.gc.ca/time_services/daylight_saving_e.html">Time
-Zones &amp; Daylight Saving Time</a>.</dd>
+href="http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html">time
+zones &amp; daylight saving time</a>.</dd>
 <dt>Chile</dt>
 <dd>The Chilean Hydrographic and Oceanographic Service publishes a <a
 href="http://www.horaoficial.cl/horaof.htm" hreflang="es"> history of
 official time (in Spanish)</a>.</dd>
 <dt>Germany</dt>
 <dd>The National Institute for Science and Technology maintains the <a
-href="http://www.ptb.de/en/org/4/44/441/dars_e.htm">Realisation of
+href="http://www.ptb.de/cms/en/fachabteilungen/abt4/fb-44/ag-441/realisation-of-legal-time-in-germany.html">Realisation of
 Legal Time in Germany</a>.</dd>
 <dt>Israel</dt>
 <dd>The Interior Ministry periodically issues <a
@@ -504,20 +472,15 @@ hreflang="es">history of Mexican local time (in Spanish)</a>.</dd>
 <dt>Malaysia</dt>
 <dd>See Singapore below.</dd>
 <dt>Netherlands</dt>
-<dd><a href="http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm"
+<dd><a href="http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm"
 hreflang="nl">Legal time in the Netherlands (in Dutch)</a>
 covers the history of local time in the Netherlands from ancient times.</dd>
 <dt>New Zealand</dt>
-<dd>The Department of Internal Affairs maintains a brief history <a
-href="http://dia.govt.nz/diawebsite.nsf/wpg_URL/Resource-material-Information-We-Provide-About-Daylight-Saving">About
+<dd>The Department of Internal Affairs maintains a brief <a
+href="http://www.dia.govt.nz/Daylight-Saving-History">History of
 Daylight Saving</a>. The privately-maintained <a
 href="http://astrologyschool.com/nztime.html">History of New Zealand
 time</a> has more details.</dd>
-<dt>Norway</dt>
-<dd>The Norwegian Meteorological Institute lists
-<a href="http://met.no/met/met_lex/q_u/sommertid.html" hreflang="no">Summer
-time in Norway (in Norwegian)</a>, citing the
-Institute of Theoretical Astrophysics, Oslo.</dd>
 <dt>Singapore</dt>
 <dd><a
 href="http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html">Why
@@ -525,11 +488,11 @@ is Singapore in the "Wrong" Time Zone?</a> details the
 history of legal time in Singapore and Malaysia.</dd>
 <dt>United Kingdom</dt>
 <dd><a
-href="http://www.srcf.ucam.org/~jsm28/british-time/">History of
+href="http://www.polyomino.org.uk/british-time/">History of
 legal time in Britain</a> discusses in detail the country
 with perhaps the best-documented history of clock adjustments.
 The National Physical Laboratory also maintains an <a
-href="http://www.npl.co.uk/server.php?show=ConWebDoc.2714">Archive
+href="http://www.npl.co.uk/educate-explore/what-is-the-time/archive-of-summer-time-dates-1916-2006">Archive
 of Summer time dates</a>.</dd>
 </dl>
 <h2>Precision timekeeping</h2>
@@ -548,7 +511,8 @@ href="ftp://ftp.rfc-editor.org/in-notes/rfc4833.txt">Timezone
 Options for <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr></a>
 (Internet <abbr>RFC</abbr> 4833)
 specifies a <a
-href="http://www.dhcp.org/">DHCP</a> option for a server to configure
+href="http://en.wikipedia.org/wiki/Dynamic_Host_Configuration_Protocol">DHCP</a>
+option for a server to configure
 a client's time zone and daylight saving settings automatically.</li>
 <li><a href="http://gauss.gge.unb.ca/GMT.UT.and.the.RGO.html">A Few
 Facts Concerning <abbr title="Greenwich Mean Time">GMT</abbr>, <abbr
@@ -573,7 +537,7 @@ code for converting among time scales like
 <abbr title="International Atomic Time">TAI</abbr>,
 <abbr>TDB</abbr>, <abbr>TDT</abbr> and
 <abbr>UTC</abbr>.</li>
-<li><a href="http://jpl.nasa.gov/basics/bsf2-3.htm">Basics of
+<li><a href="http://www2.jpl.nasa.gov/basics/bsf2-3.php">Basics of
 Space Flight - Reference Systems - Time Conventions</a>
 briefly explains interplanetary space flight timekeeping.</li>
 <li><a
@@ -588,13 +552,9 @@ dedicated not only to leap seconds but to precise time and frequency
 in general. It covers the state of the art in amateur timekeeping, and
 how the art has progressed over the past few decades.</li>
 <li><a
-href="http://hpiers.obspm.fr/eop-pc/products/bulletins/bulletins.html">Bulletins
-maintained by the
-<abbr title="International Earth Rotation Service">IERS</abbr>
-<abbr title="Earth Orientation Parameters">EOP</abbr>
-(<abbr title="Product Center">PC</abbr>)</a> contains official publications of
-the Earth Orientation Parameters Product Center of the
-International Earth Rotation Service, the committee that decides
+href="http://www.iers.org/IERS/EN/Publications/Bulletins/bulletins.html">IERS
+Bulletins</a> contains official publications of the International
+Earth Rotation and Reference Systems Service, which decides
 when leap seconds occur.</li>
 <li>The <a
 href="http://six.pairlist.net/mailman/listinfo/leapsecs">Leap
@@ -604,11 +564,8 @@ and Klepczynski's proposal to discontinue leap seconds</a>,
 discussed further in
 <a href="http://www.cl.cam.ac.uk/~mgk25/time/metrologia-leapsecond.pdf">The
 leap second: its history and possible future</a>.
-The (now disbanded) <a href="http://members.aas.org/comms/leap.cfm"><abbr
-title="American Astronomical Society">AAS</abbr> Leap Second
-Committee</a> has solicited input on this proposal.
-<a href="http://www.ucolick.org/~sla/leapsecs/">The
-Future of Leap Seconds</a> covers this
+<a href="http://www.ucolick.org/~sla/leapsecs/">UTC might be redefined
+without Leap Seconds</a> gives pointers on this
 contentious issue.</li>
 </ul>
 <h2>Time notation</h2>
@@ -618,7 +575,7 @@ contentious issue.</li>
 the International Standard Date and Time Notation</a> is a good
 summary of
 <a
-href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=40874"><abbr
+href="http://www.iso.org/iso/catalogue_detail?csnumber=40874"><abbr
 title="International Organization for Standardization">ISO</abbr>
 8601:2004 -- Data elements and interchange formats -- Information
 interchange -- Representation of dates and times</a>.</li>
@@ -653,8 +610,8 @@ abbreviations, identifiers, and formats. For example, it contains
 French translations for "Eastern European Summer Time", "<abbr
 title="Eastern European Summer Time">EEST</abbr>", and
 "Bucharest". <a
-href="http://unicode.org/cldr/data/charts/by_type/names.metazone.html">By-Type
-Chart: names.metazone</a> shows these values for many locales.
+href="http://unicode.org/cldr/charts/by_type/index.html">By-Type
+Chart</a> shows these values for many locales.
 <abbr>ICU</abbr> contains a mechanism for using this data.</li>
 <li>Alphabetic time zone abbreviations should not be used as unique
 identifiers for <abbr>UTC</abbr> offsets as they are ambiguous in
@@ -688,8 +645,6 @@ is called "<abbr>GMT</abbr>".</li>
 <li><a href="tz-art.htm">Time and the Arts</a></li>
 <li><a href="http://www.dmoz.org/Reference/Time/">Open Directory -
 Reference: Time</a></li>
-<li><a href="http://directory.google.com/Top/Reference/Time/">Google Directory
-- Reference &gt; Time</a></li>
 <li><a href="http://dir.yahoo.com/Science/Measurements_and_Units/Time">Yahoo!
 Directory &gt; Science &gt; Measurements and Units &gt; Time</a></li>
 </ul>
diff --git a/elsie.nci.nih.gov/src/tzfile.5 b/elsie.nci.nih.gov/src/tzfile.5
index aa7317b..10698a2 100644
--- a/elsie.nci.nih.gov/src/tzfile.5
+++ b/elsie.nci.nih.gov/src/tzfile.5
@@ -137,7 +137,7 @@ is zero or the time argument is less than the first transition time recorded
 in the file.
 .PP
 For version-2-format time zone files,
-the above header and data is followed by a second header and data,
+the above header and data are followed by a second header and data,
 identical in format except that
 eight bytes are used for each transition time or leap second time.
 After the second header and data comes a newline-enclosed,
diff --git a/elsie.nci.nih.gov/src/tzfile.5.txt b/elsie.nci.nih.gov/src/tzfile.5.txt
index 188a16f..8217897 100644
--- a/elsie.nci.nih.gov/src/tzfile.5.txt
+++ b/elsie.nci.nih.gov/src/tzfile.5.txt
@@ -84,7 +84,7 @@ DESCRIPTION
        structure) if either tzh_timecnt is zero or the time argument is less
        than the first transition time recorded in the file.
 
-       For version-2-format time zone files, the above header and data is
+       For version-2-format time zone files, the above header and data are
        followed by a second header and data, identical in format except that
        eight bytes are used for each transition time or leap second time.
        After the second header and data comes a newline-enclosed, POSIX-TZ-
diff --git a/elsie.nci.nih.gov/src/tzselect.ksh b/elsie.nci.nih.gov/src/tzselect.ksh
index 9e8ceea..51bafc1 100644
--- a/elsie.nci.nih.gov/src/tzselect.ksh
+++ b/elsie.nci.nih.gov/src/tzselect.ksh
@@ -1,5 +1,6 @@
-#! /bin/ksh
+#!/bin/bash
 
+PKGVERSION='(tzcode) '
 TZVERSION=see_Makefile
 
 # Ask the user about the time zone, and output the resulting TZ value to stdout.
@@ -9,29 +10,22 @@ TZVERSION=see_Makefile
 
 # Porting notes:
 #
-# This script requires several features of the Korn shell.
-# If your host lacks the Korn shell,
-# you can use either of the following free programs instead:
-#
-#	<a href=ftp://ftp.gnu.org/pub/gnu/>
-#	Bourne-Again shell (bash)
-#	</a>
+# This script requires a Posix-like shell with the extension of a
+# 'select' statement.  The 'select' statement was introduced in the
+# Korn shell and is available in Bash and other shell implementations.
+# If your host lacks both Bash and the Korn shell, you can get their
+# source from one of these locations:
 #
-#	<a href=ftp://ftp.cs.mun.ca/pub/pdksh/pdksh.tar.gz>
-#	Public domain ksh
-#	</a>
+#	Bash <http://www.gnu.org/software/bash/bash.html>
+#	Korn Shell <http://www.kornshell.com/>
+#	Public Domain Korn Shell <http://www.cs.mun.ca/~michael/pdksh/>
 #
 # This script also uses several features of modern awk programs.
-# If your host lacks awk, or has an old awk that does not conform to Posix.2,
+# If your host lacks awk, or has an old awk that does not conform to Posix,
 # you can use either of the following free programs instead:
 #
-#	<a href=ftp://ftp.gnu.org/pub/gnu/>
-#	GNU awk (gawk)
-#	</a>
-#
-#	<a href=ftp://ftp.whidbey.net/pub/brennan/>
-#	mawk
-#	</a>
+#	Gawk (GNU awk) <http://www.gnu.org/software/gawk/>
+#	mawk <http://invisible-island.net/mawk/>
 
 
 # Specify default values for environment variables if they are unset.
@@ -50,14 +44,14 @@ if [ "$1" = "--help" ]; then
 Usage: tzselect
 Select a time zone interactively.
 
-Report bugs to tz@elsie.nci.nih.gov.
+Report bugs to tz@iana.org.
 EOF
-    exit 0
+    exit
 elif [ "$1" = "--version" ]; then
     cat <<EOF
-tzselect $TZVERSION
+tzselect $PKGVERSION$TZVERSION
 EOF
-    exit 0
+    exit
 fi
 
 # Make sure the tables are readable.
diff --git a/elsie.nci.nih.gov/src/zdump.c b/elsie.nci.nih.gov/src/zdump.c
index 805267d..626b09d 100644
--- a/elsie.nci.nih.gov/src/zdump.c
+++ b/elsie.nci.nih.gov/src/zdump.c
@@ -272,7 +272,7 @@ usage(FILE * const stream, const int status)
 	(void) fprintf(stream,
 _("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\
 \n\
-Report bugs to tz@elsie.nci.nih.gov.\n"),
+Report bugs to tz@iana.org.\n"),
 		       progname, progname);
 	exit(status);
 }
@@ -309,7 +309,7 @@ main(int argc, char *argv[])
 	progname = argv[0];
 	for (i = 1; i < argc; ++i)
 		if (strcmp(argv[i], "--version") == 0) {
-			(void) printf("%s\n", TZVERSION);
+			(void) printf("zdump %s%s\n", PKGVERSION, TZVERSION);
 			exit(EXIT_SUCCESS);
 		} else if (strcmp(argv[i], "--help") == 0) {
 			usage(stdout, EXIT_SUCCESS);
diff --git a/elsie.nci.nih.gov/src/zic.c b/elsie.nci.nih.gov/src/zic.c
index 64af1b2..1964a89 100644
--- a/elsie.nci.nih.gov/src/zic.c
+++ b/elsie.nci.nih.gov/src/zic.c
@@ -426,7 +426,7 @@ usage(FILE *stream, int status)
 [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\
 \t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\
 \n\
-Report bugs to tz@elsie.nci.nih.gov.\n"),
+Report bugs to tz@iana.org.\n"),
 		       progname, progname);
 	exit(status);
 }
@@ -462,7 +462,7 @@ main(int argc, char **argv)
 	}
 	for (i = 1; i < argc; ++i)
 		if (strcmp(argv[i], "--version") == 0) {
-			(void) printf("%s\n", TZVERSION);
+			(void) printf("zic %s%s\n", PKGVERSION, TZVERSION);
 			exit(EXIT_SUCCESS);
 		} else if (strcmp(argv[i], "--help") == 0) {
 			usage(stdout, EXIT_SUCCESS);
@@ -2534,8 +2534,8 @@ newabbr(const char *const string)
 				++cp;
 		if (cp - string == 0)
 mp = _("time zone abbreviation lacks alphabetic at start");
-		if (noise && cp - string > 3)
-mp = _("time zone abbreviation has more than 3 alphabetics");
+		if (noise && cp - string < 3)
+mp = _("time zone abbreviation has fewer than 3 alphabetics");
 		if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
 mp = _("time zone abbreviation has too many alphabetics");
 		if (mp == NULL && (*cp == '+' || *cp == '-')) {