cosmetic changes from tzcode2001a

4 files changed, 329 insertions, 238 deletions

diff --git a/lib/libc/time/Theory b/lib/libc/time/Theory
index 7d38e130cb4..438845f2538 100644
--- a/lib/libc/time/Theory
+++ b/lib/libc/time/Theory
@@ -1,4 +1,4 @@
-@(#)Theory	7.10
+@(#)Theory	7.12
 
 
 ----- Outline -----
@@ -194,9 +194,13 @@ and `Pacific/Honolulu'.
 Here are the general rules used for choosing location names,
 in decreasing order of importance:
 
-	Use only valid Posix file names.  Use only Ascii letters, digits, `.',
-		`-' and `_'.  Do not exceed 14 characters or start with `-'.
-		E.g. prefer `Brunei' to `Bandar_Seri_Begawan'.
+	Use only valid POSIX file name components (i.e., the parts of
+		names other than `/').  Within a file name component,
+		use only ASCII letters, `.', `-' and `_'.  Do not use
+		digits, as that might create an ambiguity with POSIX
+		TZ strings.  A file name component must not exceed 14
+		characters or start with `-'.  E.g., prefer `Brunei'
+		to `Bandar_Seri_Begawan'.
 	Include at least one location per time zone rule set per country.
 		One such location is enough.  Use ISO 3166 (see the file
 		iso3166.tab) to help decide whether something is a country.
@@ -211,9 +215,9 @@ in decreasing order of importance:
 		or regions, so that any future time zone changes do not split
 		locations into different time zones.  E.g. prefer `Paris'
 		to `France', since France has had multiple time zones.
-	Use traditional English spelling, e.g. prefer `Rome' to `Roma', and
+	Use mainstream English spelling, e.g. prefer `Rome' to `Roma', and
 		prefer `Athens' to the true name (which uses Greek letters).
-		The Posix file name restrictions encourage this rule.
+		The POSIX file name restrictions encourage this rule.
 	Use the most populous among locations in a country's time zone,
 		e.g. prefer `Shanghai' to `Beijing'.  Among locations with
 		similar populations, pick the best-known location,
@@ -227,13 +231,19 @@ in decreasing order of importance:
 	Use `_' to represent a space.
 	Omit `.' from abbreviations in names, e.g. prefer `St_Helena'
 		to `St._Helena'.
+	Do not change established names if they only marginally
+		violate the above rules.  For example, don't change
+		the existing name `Rome' to `Milan' merely because
+		Milan's population has grown to be somewhat greater
+		than Rome's.
+	If a name is changed, put its old spelling in the `backward' file.
 
 The file `zone.tab' lists the geographical locations used to name
 time zone rule files.
 
 Older versions of this package used a different naming scheme,
 and these older names are still supported.
-See the file `backwards' for most of these older names
+See the file `backward' for most of these older names
 (e.g. `US/Eastern' instead of `America/New_York').
 The other old-fashioned names still supported are
 `WET', `CET', `MET', `EET' (see the file `europe'),
@@ -247,25 +257,39 @@ like `EST' to be compatible with human tradition and POSIX.1.
 Here are the general rules used for choosing time zone abbreviations,
 in decreasing order of importance:
 
-	Use abbreviations that consist of 3 or more upper-case Ascii letters,
-		except use "___" for locations while uninhabited.
-		Posix.1 requires at least 3 characters, and the restriction to
-		upper-case Ascii letters follows most traditions.
+	Use abbreviations that consist of three or more ASCII letters.
 		Previous editions of this database also used characters like
 		' ' and '?', but these characters have a special meaning to
 		the shell and cause commands like
 			set `date`
-		to have unexpected effects.  In theory, the character set could
-		be !%./@A-Z^_a-z{}, but these tables use only upper-case
-		Ascii letters (and "___").
+		to have unexpected effects.
+		Previous editions of this rule required upper-case letters,
+		but the Congressman who introduced Chamorro Standard Time
+		preferred "ChST", so the rule has been relaxed.
+
+		This rule guarantees that all abbreviations could have
+		been specified by a POSIX.1 TZ string.  POSIX.1
+		requires at least three characters for an
+		abbreviation.  POSIX.1-1996 says that an abbreviation
+		cannot start with ':', and cannot contain ',', '-',
+		'+', NUL, or a digit.  Draft 5 of POSIX 1003.1-200x
+		changes this rule to say that an abbreviation can
+		contain only '-', '+', and alphanumeric characters in
+		the current locale.  To be portable to both sets of
+		rules, an abbreviation must therefore use only ASCII
+		letters, as these are the only letters that are
+		alphabetic in all locales.
+
 	Use abbreviations that are in common use among English-speakers,
 		e.g. `EST' for Eastern Standard Time in North America.
 		We assume that applications translate them to other languages
 		as part of the normal localization process; for example,
 		a French application might translate `EST' to `HNE'.
+
 	For zones whose times are taken from a city's longitude, use the
 		traditional xMT notation, e.g. `PMT' for Paris Mean Time.
 		The only name like this in current use is `GMT'.
+
 	If there is no common English abbreviation, abbreviate the English
 		translation of the usual phrase used by native speakers.
 		If this is not available or is a phrase mentioning the country
@@ -280,6 +304,9 @@ in decreasing order of importance:
 			and then append `T', `ST', etc. as before;
 			e.g. `VLAST' for VLAdivostok Summer Time.
 
+	Use "zzz" for locations while uninhabited.  The mnemonic is that
+		these locations are, in some sense, asleep.
+
 Application writers should note that these abbreviations are ambiguous
 in practice: e.g. `EST' has a different meaning in Australia than
 it does in the United States.  In new applications, it's often better
diff --git a/lib/libc/time/tz-art.htm b/lib/libc/time/tz-art.htm
index aba7d2f989c..8a591323cf7 100644
--- a/lib/libc/time/tz-art.htm
+++ b/lib/libc/time/tz-art.htm
@@ -1,20 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!-- $OpenBSD: tz-art.htm,v 1.2 2000/09/06 23:05:11 millert Exp $ -->
-<HTML>
-<HEAD>
-<TITLE>Time and the Arts</TITLE>
-</HEAD>
-<BODY>
-<H1>Time and the Arts</H1>
-<ADDRESS>
-@(#)tz-art.htm	7.37
-</ADDRESS>
-<P>
+<?xml version="1.0" encoding="US-ASCII"?>
+<!DOCTYPE html 
+	PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"DTD/xhtml1-strict.dtd">
+<!-- $OpenBSD: tz-art.htm,v 1.3 2001/03/26 15:25:51 millert Exp $ -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-type" content='text/html; charset="US-ASCII"' />
+<title>Time and the Arts</title>
+</head>
+<body>
+<h1>Time and the Arts</h1>
+<address>
+@(#)tz-art.htm	7.40
+</address>
+<p>
 Please send corrections to this web page to the
-<A HREF="mailto:tz@elsie.nci.nih.gov">time zone mailing list</A>.
-<P>
-See also <A HREF="tz-link.htm">Sources for Time Zone and Daylight Saving Time Data</A>.
-<PRE>
+<a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>.</p>
+<p>
+See also <a href="tz-link.htm">Sources for Time Zone and Daylight Saving Time Data</a>.</p>
+<pre>
 "Is that a pertinent fact, or are you trying to dazzle me with your command
 of time zones?"
 	"Frasier Crane"
@@ -34,7 +38,7 @@ Personnel:	Karrin Allyson, vocal
 Notes:		CD notes "additional lyric by Karrin Allyson;
 		arranged by Russ Long and Karrin Allyson"
 ADO Rating:	1 star
-<A HREF="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A175928">AMG Rating:	4 stars</A>
+<a href="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A175928">AMG Rating:	4 stars</a>
 Penguin Rating:	3.5 stars
 --------------------------------------------------------------------------
 Artist:		Kevin Mahogany
@@ -49,7 +53,7 @@ Personnel:	Kevin Mahogany, vocal
 		Ralph Moore, tenor saxophone
 		Lewis Nash, drums
 ADO Rating:	1.5 stars
-<A HREF="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A262654">AMG Rating:	3 stars</A>
+<a href="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A262654">AMG Rating:	3 stars</a>
 Penguin Rating:	3 stars
 --------------------------------------------------------------------------
 Artist:		Joe Williams
@@ -63,7 +67,7 @@ Personnel:	Joe Williams, vocal
 Notes:		This CD is also available as part of a 3-CD package from
 		Telarc, "Triple Play" (CD-83461)
 ADO Rating:	black dot
-<A HREF="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A194434">AMG Rating:	2 stars</A>
+<a href="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A194434">AMG Rating:	2 stars</a>
 Penguin Rating:	3 stars
 --------------------------------------------------------------------------
 Artist:		Charles Fambrough
@@ -78,9 +82,9 @@ Personnel:	Charles Fambrough, bass
 		Lenny White, drums
 		Marion Simon, percussion
 Notes:		On-line information and samples available at
-		<A HREF="http://wwmusic.com/~music/audioq/rel/1033.html">http://wwmusic.com/~music/audioq/rel/1033.html</A>
+		<a href="http://wwmusic.com/~music/audioq/rel/1033.html">http://wwmusic.com/~music/audioq/rel/1033.html</a>
 ADO Rating:	2 stars
-<A HREF="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A224430">AMG Rating:	unrated</A>
+<a href="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A224430">AMG Rating:	unrated</a>
 Penguin Rating:	3 stars
 ==========================================================================
 Also of note:
@@ -97,7 +101,7 @@ Personnel:	Holly Cole, voice
 Notes:		Lyrical reference to "Eastern Standard Time" in
 			Tom Waits' "Purple Avenue"
 ADO Rating:	2.5 stars
-<A HREF="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A157959">AMG Rating:	3 stars</A>
+<a href="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A157959">AMG Rating:	3 stars</a>
 Penguin Rating:	unrated
 --------------------------------------------------------------------------
 Artist:		Milt Hinton
@@ -126,9 +130,9 @@ Notes:		tunes include Old Man Time, Time After Time,
 			Time on My Hands, This Time It's Us,
 			and Good Time Charlie
 		On-line samples available at
-		<A HREF="http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html">http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html</A>
+		<a href="http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html">http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html</a>
 ADO Rating:	3 stars
-<A HREF="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A162344">AMG Rating:	4.5 stars</A>
+<a href="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A162344">AMG Rating:	4.5 stars</a>
 Penguin Rating:	3 stars
 --------------------------------------------------------------------------
 Artist:		Paul Broadbent
@@ -142,7 +146,7 @@ Personnel:	Paul Broadbent, piano
 		Frank Gibson, Jr., drums
 Notes:		The CD cover features an analemma for equation-of-time fans
 ADO Rating:	1 star
-<A HREF="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A223722">AMG Rating:	4 stars</A>
+<a href="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A223722">AMG Rating:	4 stars</a>
 Penguin Rating:	3.5 stars
 --------------------------------------------------------------------------
 Artist:		Anthony Braxton/Richard Teitelbaum
@@ -151,13 +155,13 @@ Copyright Date:	1996
 Label:		Black Lion
 ID:		BLCD 760221
 Total Time:	72:58
-Personnel:	Anthony Braxton, sporanino and alto saxophones,
+Personnel:	Anthony Braxton, sopranino and alto saxophones,
 			contrebasse clarinet, miscellaneous instruments
 		Leo Smith, trumpet and miscellaneous instruments
 		Leroy Jenkins, violin and miscellaneous instruments
 		Richard Teitelbaum, modular moog and micromoog synthesizer
 ADO Rating:	black dot
-<A HREF="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A310757">AMG Rating:	unrated</A>
+<a href="http://www.allmusic.com/cg/x.dll?p=amg&amp;sql=A310757">AMG Rating:	unrated</a>
 --------------------------------------------------------------------------
 Artist:		Jules Verne
 Book:		Le Tour du Monde en Quatre-Vingts Jours
@@ -169,14 +173,14 @@ Notes:		Wall-clock time plays a central role in the plot.
 		An on-line French-language version of the book
 		"with illustrations from the original 1873 French-language edition"
 		is available at
-		<A HREF="http://fourmilab.ch/etexts/www/tdm80j">http://fourmilab.ch/etexts/www/tdm80j</A>
+		<a href="http://fourmilab.ch/etexts/www/tdm80j">http://fourmilab.ch/etexts/www/tdm80j</a>
 		An on-line English-language translation of the book is available at
-		<A HREF="http://www.literature.org/Works/Jules-Verne/eighty">http://www.literature.org/Works/Jules-Verne/eighty</A>
+		<a href="http://www.literature.org/Works/Jules-Verne/eighty">http://www.literature.org/Works/Jules-Verne/eighty</a>
 --------------------------------------------------------------------------
 Film:		Bell Science - About Time
 Notes:		The Frank Baxter/Richard Deacon extravaganza
 		Information on ordering is available at
-		<A HREF="http://www.videoflicks.com/VF2/1035/1035893.ihtml">http://www.videoflicks.com/VF2/1035/1035893.ihtml</A>
+		<a href="http://www.videoflicks.com/VF2/1035/1035893.ihtml">http://www.videoflicks.com/VF2/1035/1035893.ihtml</a>
 --------------------------------------------------------------------------
 An episode of "The Adventures of Superman" entitled "The Mysterious
 Cube," first aired 1958-02-24, had Superman convincing the controllers
@@ -202,16 +206,20 @@ of the November, 1999 Atlantic Monthly.
 "In what time zone would you find New York City?" was a $200 question on
 the 1999-11-13 United States airing of "Who Wants to be a Millionaire?"
 ==========================================================================
+"Good news."
+"What did they do? Extend Daylight Saving Time year round?"
+	Professional tanner George Hamilton, in dialog from a
+	May, 1999 episode of the syndicated television series "Baywatch"
+--------------------------------------------------------------------------
 "A fundamental belief held by Americans is that if you are on land, you
 cannot be killed by a fish...So most Americans remain on land, believing
 they're safe. Unfortunately, this belief--like so many myths, such as that
 there's a reason for 'Daylight Saving Time'--is false."
 	Dave Barry column, 2000-07-02
 --------------------------------------------------------------------------
-"Good news."
-"What did they do? Extend Daylight Saving Time year round?"
-	Professional tanner George Hamilton, in dialog from a
-	May, 1999 episode of the syndicated television series "Baywatch"
-</PRE>
-</BODY>
-</HTML>
+"I once had sex for an hour and five minutes, but that was on the day
+when you turn the clocks ahead."
+	Garry Shandling, 52nd Annual Emmys, 2000-09-10
+</pre>
+</body>
+</html>
diff --git a/lib/libc/time/tz-link.htm b/lib/libc/time/tz-link.htm
index 549efa92886..d7bee9bfefc 100644
--- a/lib/libc/time/tz-link.htm
+++ b/lib/libc/time/tz-link.htm
@@ -1,28 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!-- $OpenBSD: tz-link.htm,v 1.2 2000/09/06 23:05:12 millert Exp $ -->
-<HTML>
-<HEAD>
-<TITLE>Sources for Time Zone and Daylight Saving Time Data</TITLE>
-<LINK REL="schema.DC" HREF="http://purl.org/DC/elements/1.1/">
-<META NAME="DC.Creator" CONTENT="Paul Eggert">
-<META NAME="DC.Contributor" CONTENT="Arthur David Olson">
-<META NAME="DC.Date" CONTENT="2000/08/10">
-<META NAME="DC.Description"
- CONTENT="Sources of information about time zones and daylight saving time">
-<META NAME="DC.Identifier" CONTENT="http://www.twinsun.com/tz/tz-link.htm">
-<META NAME="Keywords"
- CONTENT="database,daylight saving,DST,time zone,timezone,tz,zoneinfo">
-</HEAD>
-<BODY>
-<H1>Sources for Time Zone and Daylight Saving Time Data</H1>
-<ADDRESS>
-@(#)tz-link.htm	7.27
-</ADDRESS>
-<P>
+<?xml version="1.0" encoding="US-ASCII"?>
+<!DOCTYPE html 
+	PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"DTD/xhtml1-strict.dtd">
+<!-- $OpenBSD: tz-link.htm,v 1.3 2001/03/26 15:25:51 millert Exp $ -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>Sources for Time Zone and Daylight Saving Time Data</title>
+<link rel="schema.DC" href="http://purl.org/DC/elements/1.1/" />
+<meta http-equiv="Content-type" content='text/html; charset="US-ASCII"' />
+<meta name="DC.Creator" content="Paul Eggert" />
+<meta name="DC.Contributor" content="Arthur David Olson" />
+<meta name="DC.Date" content="2000/10/03" />
+<meta name="DC.Description"
+ content="Sources of information about time zones and daylight saving time" />
+<meta name="DC.Identifier" content="http://www.twinsun.com/tz/tz-link.htm" />
+<meta name="Keywords"
+ content="database,daylight saving,DST,time zone,timezone,tz,zoneinfo" />
+</head>
+<body>
+<h1>Sources for Time Zone and Daylight Saving Time Data</h1>
+<address>
+@(#)tz-link.htm	7.30
+</address>
+<p>
 Please send corrections to this web page to the
-<A HREF="mailto:tz@elsie.nci.nih.gov">time zone mailing list</A>.
-<P>
-<H2>The <samp>tz</samp> database</H2><P>
+<a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>.
+</p>
+<h2>The <samp>tz</samp> database</h2>
+<p>
 The public-domain time zone database contains code and data
 that represent the history of local time
 for many representative locations around the globe.
@@ -30,187 +35,239 @@ It is updated periodically to reflect changes made by political bodies
 to UTC offsets and daylight-saving rules.
 This database (often called <samp>tz</samp> or <samp>zoneinfo</samp>)
 is used by several implementations,
-including BSD, DJGPP, GNU/Linux, HP-UX, IRIX, Solaris, and UnixWare.
+including
+<a href="http://www.linux.org/">GNU/Linux</a>,
+<a href="http://www.freebsd.org/">FreeBSD</a>,
+<a href="http://www.netbsd.org/">NetBSD</a>,
+<a href="http://www.openbsd.org/">OpenBSD</a>,
+<a href="http://www.delorie.com/djgpp/">DJGPP</a>,
+<a href="http://unix.hp.com/operating/">HP-UX</a>,
+<a href="http://www.sgi.com/developers/technology/irix.html">IRIX</a>,
+<a href="http://www.sco.com/products/openserver/">SCO OpenServer</a>,
+<a href="http://www.sun.com/solaris/">Solaris</a>, and
+<a href="http://www.sco.com/unixware/">UnixWare</a>.
 In the <samp>tz</samp> database's
-<A HREF="ftp://elsie.nci.nih.gov/pub/">FTP distribution</A>,
+<a href="ftp://elsie.nci.nih.gov/pub/">FTP distribution</a>,
 the code is in the file <samp>tzcode<var>C</var>.tar.gz</samp>,
 where <samp><var>C</var></samp> is the code's version;
 similarly, the data are in <samp>tzdata<var>D</var>.tar.gz</samp>,
 where <samp><var>D</var></samp> is the data's version.
 The code lets you compile the text data into time zone files, one for
 each location.  It also lets you read a compiled time zone file and
-interpret time stamps for that location.
-<P>
+interpret time stamps for that location.</p>
+<p>
 The data are by no means authoritative. If you find errors, please
-send changes to the <A HREF="mailto:tz@elsie.nci.nih.gov">time zone
-mailing list</A>. You can also <A
-HREF="mailto:tz-request@elsie.nci.nih.gov">subscribe</A> to the
-mailing list, or retrieve the <A
-HREF="ftp://elsie.nci.nih.gov/pub/tzarchive.gz">archive of old
-messages</A> (in <A HREF="http://www.gzip.org/">gzip</A> compressed
-format).
-<P>
+send changes to the <a href="mailto:tz@elsie.nci.nih.gov">time zone
+mailing list</a>. You can also <a
+href="mailto:tz-request@elsie.nci.nih.gov">subscribe</a> to the
+mailing list, or retrieve the <a
+href="ftp://elsie.nci.nih.gov/pub/tzarchive.gz">archive of old
+messages</a> (in <a href="http://www.gzip.org/">gzip</a> compressed
+format).</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.
-<H2>Web pages using recent versions of the <samp>tz</samp> database</H2>
-<UL>
-<LI><A HREF="http://www.bsdi.com/date/">Date and Time Gateway</A> is a
+</p>
+<h2>Web pages using recent versions of the <samp>tz</samp> database</h2>
+<ul>
+<li><a href="http://www.bsdi.com/date/">Date and Time Gateway</a> is a
 text-based point-and-click interface to tables of current time
-throughout the world.
-<LI><A HREF="http://sandbox.xerox.com/stewart/tzconvert.cgi">CGI/1.0
-URL Timezone Converter</A> is a similar interface, with source code
-written in <A HREF="http://www.perl.org/">Perl</A>, using what Paul
-Stewart calls the "20-line hack no one will let me forget".
-<LI><A HREF="http://www.hilink.com.au/times/">Local Times Around the World</A>
-is a fancier web interface.
-<LI><A HREF="http://timezoneconverter.com/">Time Zone Converter</A>
-is an even fancier interface.
-<LI><A HREF="http://www.burbs.com/fcgi-bin/tzconvert.fcgi">Burbs time
-zone converter</A> is a multilingual interface.
-<LI><A HREF="http://www.holidayfestival.com/">The Worldwide Holiday
-&amp; Festival Site</A> lists DST-related clock changes along with holidays.
-<LI><A HREF="http://www.timeanddate.com/worldclock/">The World Clock</A>
+throughout the world.</li>
+<li><a href="http://sandbox.xerox.com/stewart/tzconvert.cgi">CGI/1.0
+URL Timezone Converter</a> is a similar interface, with source code
+written in <a href="http://www.perl.org/">Perl</a>, using what Paul
+Stewart calls the "20-line hack no one will let me forget".</li>
+<li>Fancier web interfaces, roughly in ascending order of complexity, include:
+<ul>
+<li><a href="http://www.hilink.com.au/times/">Local Times Around the
+World</a></li>
+<li><a href="http://www.convertit.com/Go/ConvertIt/World_Time/Current_Time.ASP">Current Time in 1000 Places</a></li>
+<li><a href="http://timezoneconverter.com/">Time Zone Converter</a></li>
+</ul></li>
+<li><a href="http://www.tick2tock.com/cgi-bin/TZConverter">Tick2Tock
+time zone converter</a> is a multilingual interface.</li>
+<li><a href="http://www.holidayfestival.com/">The Worldwide Holiday
+&amp; Festival Site</a> lists DST-related clock changes along with
+holidays.</li>
+<li><a href="http://www.timeanddate.com/worldclock/">The World Clock</a>
 is a web interface to a time zone database derived from
-<samp>tz</samp>'s.
-</UL>
-<H2>Other time zone file readers</H2>
-<UL>
-<LI>The <A HREF="http://www.gnu.org/software/libc/">GNU C Library</A>
+<samp>tz</samp>'s.</li>
+</ul>
+<h2>Other time zone file readers</h2>
+<ul>
+<li>The <a href="http://www.gnu.org/software/libc/">GNU C Library</a>
 has an independent, thread-safe implementation of
 a time zone file reader that is compatible with <samp>tz</samp>.
 This library is freely available under the
-<A HREF="http://www.gnu.org/copyleft/lesser.html">
-GNU Lesser General Public License (LGPL)</A>,
-and is widely used in GNU/Linux systems.
-<LI><A HREF="http://www.bmsi.com/java/#TZ">ZoneInfo.java</A>
+<a href="http://www.gnu.org/copyleft/lesser.html">
+GNU Lesser General Public License (LGPL)</a>,
+and is widely used in GNU/Linux systems.</li>
+<li><a href="http://www.bmsi.com/java/#TZ">ZoneInfo.java</a>
 is a time zone file reader written in Java.
-It is freely available under the GNU LGPL.
-</UL>
-<H2>Other <SAMP>tz</SAMP>-based time zone conversion software</H2>
-<UL>
-<LI><A
-HREF="http://www1.tip.nl/~t876506/AboutTimeZonesHC.html">HyperCard
-time zones calculator</A> is a HyperCard stack.
-<LI><A
-HREF="http://timezone50.homepage.com/">Time Zone Converter</A> is a
-Microsoft Windows 95/98/NT4 program.
-</UL>
-<H2>Other time zone databases</H2>
-<UL>
-<LI><A HREF="http://www.astro.ch/atlas/">Astrology / Astrologie -&gt;
-Astrodienst Atlas Database</A> is Astrodienst's Web version of Shanks's
-excellent time zone history atlases published in both <A
-HREF="http://astrocom.com/software/ACS_PC_Atlas.htm">computer</A> and <A
-HREF="http://astrocom.com/books/xrefa.htm#SHANKS">book</A> form by <A
-HREF="http://astrocom.com/">Astro Communications Services</A>.
-<LI><A HREF="http://worldtime.com/">WORLDTIME: interactive atlas,
-time info, public holidays</A>
+It is freely available under the GNU LGPL.</li>
+</ul>
+<h2>Other <samp>tz</samp>-based time zone conversion software</h2>
+<ul>
+<li><a
+href="http://www1.tip.nl/~t876506/AboutTimeZonesHC.html">HyperCard
+time zones calculator</a> is a HyperCard stack.</li>
+<li><a
+href="http://timezone50.homepage.com/">Time Zone Converter</a> is a
+Microsoft Windows 95/98/NT4 program.</li>
+</ul>
+<h2>Other time zone databases</h2>
+<ul>
+<li><a href="http://www.astro.ch/cgi-bin/atlw3/aq.cgi?lang=e">Astrodienst
+- Atlas Query</a> is Astrodienst's Web version of Shanks's
+excellent time zone history atlases published in both <a
+href="http://astrocom.com/software/pcatlas.html">computer</a> and <a
+href="http://astrocom.com/books/xrefa.htm#SHANKS">book</a> form by <a
+href="http://astrocom.com/">Astro Communications 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,
-and public holidays in several hundred cities around the world.
-<LI><A HREF="http://tycho.usno.navy.mil/tzones.html">World Time Zones</A>
-contains US Naval Observatory data, used as the source
-for the <samp>usno*</samp> files in the <samp>tz</samp> distribution.
-<LI>The <A HREF="http://iata.org/">International Air Transport Association</A>
-publishes the IATA Standard Schedules Information Manual (SSIM),
+and public holidays in several hundred cities around the world.</li>
+<li><a href="http://tycho.usno.navy.mil/tzones.html">World Time Zones</a>
+contains data from the Time Service Department of the US Naval Observatory
+(USNO), used as the source
+for the <samp>usno*</samp> files in the <samp>tz</samp> distribution.</li>
+<li>The <a href="http://www.iata.org/">International
+Air Transport Association</a>
+publishes the <a href="http://www.iata.org/sked/ssim.htm">Standard
+Schedules Information Manual</a>,
 which gives current time zone rules for
-all the airports served by commercial aviation.
-</UL>
-<H2>Maps</H2>
-<UL>
-<LI>The United States Central Intelligence Agency publishes a <A
-HREF="http://www.odci.gov/cia/publications/factbook/figures/802649.pdf">time
-zone map</A>; the
-<A HREF="http://www.lib.utexas.edu/Libs/PCL/Map_collection/world_maps.html">
-Perry-Casta&ntilde;eda Library Map Collection</A>
-of the University of Texas at Austin has on-line copies of
+all the airports served by commercial aviation.</li>
+</ul>
+<h2>Maps</h2>
+<ul>
+<li>The <a href="http://www.odci.gov/">United States Central
+Intelligence Agency (CIA)</a> publishes a <a
+href="http://www.odci.gov/cia/publications/factbook/reference/Low%20res%20PDF/low802700.pdf">time
+zone map</a>; the
+<a href="http://www.lib.utexas.edu/Libs/PCL/Map_collection/world_maps.html">
+Perry-Casta&ntilde;eda Library Map Collection</a>
+of the University of Texas at Austin has copies of
 recent editions. 
 The pictorial quality is good,
 but the maps do not indicate summer time,
-and parts of the data are a few years out of date.
-<LI><A HREF="http://worldtimezone.com/">World time zones map with
-current time</A>
+and parts of the data are a few years out of date.</li>
+<li><a href="http://worldtimezone.com/">World timezones map with
+current time</a>
 has several fancy time zone maps; it covers Russia particularly well.
 The maps' pictorial quality is not quite as good as the CIA's
-and (as usual with maps) the maps are not quite up to date.
-</UL>
-<H2>Daylight saving time concepts and history</H2>
-<UL>
-<LI><A HREF="http://webexhibits.com/daylightsaving/">Daylight
-Saving Time -- History, rationale, laws and dates</A>
-is a good overall history of DST.
-<LI><A HREF="http://www.cstv.to.cnr.it/toi/uk/toi.html">The
-Time of Internet</A>
+but the maps are more up to date.</li>
+<li><a href="http://www.worldtimeserver.com/">World Time Server</a>
+has a separate little outline map for each region of each country that
+currently observes a different time.</li>
+</ul>
+<h2>Time zone boundaries</h2>
+<ul>
+<li>Manifold.net's <a
+href="http://www.manifold.net/download/freemaps.html">Free Maps and
+GIS Data</a> includes a Manifold-format map of world time zone
+boundaries distributed under the <a
+href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License
+(GPL)</a>. The GeoCommunity's <a
+href="http://software.geocomm.com/data/intl_timezones.html">International
+Time Zones</a> publishes the same data in other formats.</li>
+<li>The US Geological Survey's National Atlas of the United States
+publishes the <a href="http://www.nationalatlas.gov/timeznm.html">Time
+Zones of the United States</a> in the public domain.</li>
+<li>The GeoCommunity lists several commercial sources for <a
+href="http://spatialnews.geocomm.com/features/timezones/">International
+Time Zones and Time Zone Data</a>.</li>
+</ul>
+<h2>Daylight saving time concepts and history</h2>
+<ul>
+<li><a href="http://webexhibits.com/daylightsaving/">About Daylight
+Saving Time - History, rationale, laws and dates</a>
+is a good overall history of DST.</li>
+<li><a href="http://toi.iriti.cnr.it/">The
+Time of Internet</a>
 contains good descriptions of Time Zones and daylight saving time,
 with diagrams.
-The time zone map is out of date, however.
-<LI>A few countries have well-documented histories of legal time.
-<DL>
-<DT>Australia
-<DD>The Community Relations Division of the NSW Attorney General's
-Department maintains a history of <A
-HREF="http://www.lawlink.nsw.gov.au/crd.nsf/pages/time2">daylight
-saving in New South Wales</A>.
-<DT>Brazil
-<DD>The Time Service Department of the National Observatory
-records <A HREF="http://pcdsh01.on.br/DecHV.html"
-HREFLANG="pt-BR">Brazil's daylight saving time decrees (in
-Portuguese)</A>.
-<DT>Germany
-<DD>The National Institute for Science and Technology maintains <A
-HREF="http://www.ptb.de/english/org/4/43/432/lega.htm">a history of
-German legal time</A>.
-<DT>Israel
-<DD>The Ministry of Interior periodically issues <A
-HREF="ftp://ftp.huji.ac.il/pub/tz/announcements"
-HREFLANG="he">announcements (in Hebrew)</A>.
-<DT>United Kingdom
-<DD><A
-HREF="http://student.cusu.cam.ac.uk/~jsm28/british-time/">History of
-legal time in Britain</A> is an excellent discussion for the country
-with perhaps the best-documented history of clock adjustments.
-</DL>
-</UL>
-<H2>Precision timekeeping</H2>
-<UL>
-<LI><A HREF="http://www.eecis.udel.edu/~ntp/">Time Server</A> discusses
-the Network Time Protocol (NTP), used to synchronize clocks of Internet hosts.
-<LI><A HREF="http://ecco.bsee.swin.edu.au/chronos/GMT-explained.html">A
-Few Facts Concerning GMT, UT, and the RGO</A>
-answers questions like "What is the difference between GMT and UTC?"
-<LI><A
-HREF="http://sadira.gb.nrao.edu/~rfisher/Ephemerides/times.html">Astronomical
-Times</A> explains more abstruse astronomical time scales like TT, TCG,
-and TDB.
-<LI><A HREF="http://www.jpl.nasa.gov/basics/bsf2-3.htm">Earth
-and Its Reference Systems</A>
-briefly explains interplanetary space flight timekeeping.
-<LI><A HREF="http://hpiers.obspm.fr/webiers/results/bul/README.html">Bulletins
-of IERS</A> contains official publications of the
+The time zone map is out of date, however.</li>
+<li>A few countries have well-documented histories of legal time.
+<dl>
+<dt>Australia</dt>
+<dd>The Community Relations Division of the NSW Attorney General's
+Department maintains a history of <a
+href="http://www.lawlink.nsw.gov.au/crd.nsf/pages/time2">daylight
+saving in New South Wales</a>.</dd>
+<dt>Brazil</dt>
+<dd>The Time Service Department of the National Observatory
+records <a href="http://pcdsh01.on.br/DecHV.html"
+hreflang="pt-BR">Brazil's daylight saving time decrees (in
+Portuguese)</a>.</dd>
+<dt>Germany</dt>
+<dd>The National Institute for Science and Technology maintains the <a
+href="http://www.ptb.de/english/org/4/43/432/lega.htm">Realisation of
+Legal Time in Germany</a>.</dd>
+<dt>Israel</dt>
+<dd>The Ministry of Interior periodically issues <a
+href="ftp://ftp.huji.ac.il/pub/tz/announcements"
+hreflang="he">announcements (in Hebrew)</a>.</dd>
+<dt>Mexico</dt>
+<dd>The Investigation and Analysis Service of the Mexican Library of
+Congress has published a <a
+href="http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/"
+hreflang="es">history of Mexican local time (in Spanish)</a>.</dd>
+<dt>United Kingdom</dt>
+<dd><a
+href="http://student.cusu.cam.ac.uk/~jsm28/british-time/">History of
+legal time in Britain</a> is an excellent discussion for the country
+with perhaps the best-documented history of clock adjustments.</dd>
+</dl></li>
+</ul>
+<h2>Precision timekeeping</h2>
+<ul>
+<li><a
+href="http://literature.agilent.com/litwebbin/purl.cgi?org_id=tmo&amp;pub_id=5965-7984E">The
+Science of Timekeeping</a> is an excellent and thorough introduction
+to the theory and practice of precision timekeeping.</li>
+<li><a href="http://www.eecis.udel.edu/~ntp/">Time Server</a> discusses
+the Network Time Protocol (NTP), used to synchronize clocks of
+Internet hosts.</li>
+<li><a href="http://ecco.bsee.swin.edu.au/chronos/GMT-explained.html">A
+Few Facts Concerning GMT, UT, and the RGO</a>
+answers questions like "What is the difference between GMT and UTC?"</li>
+<li><a
+href="http://sadira.gb.nrao.edu/~rfisher/Ephemerides/times.html">Astronomical
+Times</a> explains more abstruse astronomical time scales like TT, TCG,
+and TDB.</li>
+<li><a href="http://www.jpl.nasa.gov/basics/bsf2-3.htm">Basics of
+Space Flight - Reference Systems - Time Conventions</a>
+briefly explains interplanetary space flight timekeeping.</li>
+<li><a href="http://hpiers.obspm.fr/webiers/results/bul/README.html">Bulletins
+of IERS</a> contains official publications of the
 International Earth Rotation Service, the committee that decides
-when leap seconds occur.
-<LI>The <A
-HREF="http://clockdev.usno.navy.mil/archives/leapsecs.html">Leap
-Second Discussion List</A> covers <A
-HREF="http://www.gisdevelopment.net/reference/scie/s_t_41_50.htm#47">McCarthy
-and Klepczynski's proposal to remove leap seconds</A>, currently
-being studied by a <A
-HREF="http://www.intec.rug.ac.be/Research/Projects/ursi/Commissions.html">URSI
-Commission J</A> working group.
-</UL>
-<H2>Time notation</H2>
-<UL>
-<LI>
-<A HREF="http://www.cl.cam.ac.uk/~mgk25/iso-time.html">A Summary of
-the International Standard Date and Time Notation</A> is a good
-summary of <A HREF="http://www.iso.ch/markete/moreend.htm">ISO
-8601</A>.
-</UL>
-<H2>Related indexes</H2>
-<UL>
-<LI><A HREF="http://dmoz.org/Reference/Time/">Open Directory -
-Reference: Time</A>
-<LI><A HREF="tz-art.htm">Time and the Arts</A>
-<LI><A HREF="http://dir.yahoo.com/Science/Measurements_and_Units/Time/Time_Zones/">Yahoo! - Science:Measurements and Units:Time:Time Zones</A>
-</UL>
-</BODY>
-</HTML>
+when leap seconds occur.</li>
+<li>The <a
+href="http://clockdev.usno.navy.mil/archives/leapsecs.html">Leap
+Second Discussion List</a> covers <a
+href="http://clockdev.usno.navy.mil/cgi-bin/wa.exe?A3=ind00&amp;L=leapsecs&amp;P=28537&amp;E=2&amp;B=------_=_NextPart_000_01C0781C.F015C5B0&amp;N=GPS-Nov99_Innov.pdf&amp;T=application/octet-stream">McCarthy
+and Klepczynski's proposal to remove leap seconds</a>
+(which requires discussion list membership to read).
+This proposal is being studied by the URSI Commission J <a
+href="http://space.mit.edu/URSI/leapsecond.html">Working Group on the
+Leap Second</a>, and the <a href="http://www.iau.org/">IAU</a>
+has plans to report on this proposal by 2003.</li>
+</ul>
+<h2>Time notation</h2>
+<ul>
+<li>
+<a href="http://www.cl.cam.ac.uk/~mgk25/iso-time.html">A Summary of
+the International Standard Date and Time Notation</a> is a good
+summary of <a href="http://www.iso.ch/markete/8601.pdf">ISO
+8601:1988 - Data elements and interchange formats - Information interchange
+- Representation of dates and times</a>.</li>
+</ul>
+<h2>Related indexes</h2>
+<ul>
+<li><a href="http://dmoz.org/Reference/Time/">Open Directory -
+Reference: Time</a></li>
+<li><a href="tz-art.htm">Time and the Arts</a></li>
+<li><a href="http://dir.yahoo.com/Science/Measurements_and_Units/Time/Time_Zones/">Yahoo! - Science:Measurements and Units:Time:Time Zones</a></li>
+</ul>
+</body>
+</html>
diff --git a/lib/libc/time/zdump.c b/lib/libc/time/zdump.c
index ed1e0e2f2cd..de3bb6464ac 100644
--- a/lib/libc/time/zdump.c
+++ b/lib/libc/time/zdump.c
@@ -1,6 +1,6 @@
 #if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)zdump.c	7.28";
-static char rcsid[] = "$OpenBSD: zdump.c,v 1.7 1999/01/29 07:04:05 d Exp $";
+static char elsieid[] = "@(#)zdump.c	7.29";
+static char rcsid[] = "$OpenBSD: zdump.c,v 1.8 2001/03/26 15:25:51 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -262,9 +262,8 @@ _("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"),
 		show(argv[i], t, TRUE);
 	}
 	if (fflush(stdout) || ferror(stdout)) {
-		(void) fprintf(stderr, _("%s: Error writing "),
-			argv[0]);
-		(void) perror(_("standard output"));
+		(void) fprintf(stderr, "%s: ", argv[0]);
+		(void) perror(_("Error writing standard output"));
 		(void) exit(EXIT_FAILURE);
 	}
 	exit(EXIT_SUCCESS);