>From 8a1b1c176d75f9fd3d494dc52684cb12dc564728 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 19 Dec 2017 09:55:13 -0800
Subject: [PROPOSED] Rename tz-link.htm to tz-link.html

Similarly for tz-art.htm.  It was too confusing to use .htm in
some places and .html in others.  See, for example:
https://mm.icann.org/pipermail/tz/2017-December/025786.html
* Makefile (WEB_PAGES, VERSION_DEPS): Adjust to file renaming.
* NEWS: Document this.
---
 Makefile                    | 4 ++--
 NEWS                        | 4 ++++
 README                      | 2 +-
 australasia                 | 2 +-
 europe                      | 2 +-
 theory.html                 | 2 +-
 tz-art.htm => tz-art.html   | 2 +-
 tz-how-to.html              | 2 +-
 tz-link.htm => tz-link.html | 2 +-
 9 files changed, 13 insertions(+), 9 deletions(-)
 rename tz-art.htm => tz-art.html (99%)
 rename tz-link.htm => tz-link.html (99%)

diff --git a/Makefile b/Makefile
index ee9f01f..8b115b8 100644
--- a/Makefile
+++ b/Makefile
@@ -451,7 +451,7 @@ MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
 			date.1.txt
 COMMON=		calendars CONTRIBUTING LICENSE Makefile \
 			NEWS README theory.html version
-WEB_PAGES=	tz-art.htm tz-how-to.html tz-link.htm
+WEB_PAGES=	tz-art.html tz-how-to.html tz-link.html
 DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
 PRIMARY_YDATA=	africa antarctica asia australasia \
 		europe northamerica southamerica
@@ -487,7 +487,7 @@ VERSION_DEPS= \
 		newctime.3 newstrftime.3 newtzset.3 northamerica \
 		pacificnew private.h \
 		southamerica strftime.c systemv theory.html \
-		time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
+		time2posix.3 tz-art.html tz-how-to.html tz-link.html \
 		tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
 		workman.sh yearistype.sh \
 		zdump.8 zdump.c zic.8 zic.c \
diff --git a/NEWS b/NEWS
index 15d09e2..28ed534 100644
--- a/NEWS
+++ b/NEWS
@@ -73,6 +73,10 @@ Unreleased, experimental changes
     The theory.html file now mentions the POSIX limit of six chars
     per abbreviation, and lists alphabetic abbreviations used.
 
+    The files tz-art.htm and tz-link.htm have been renamed to
+    tz-art.html and tz-link.html, respectively, for consistency with
+    other file names and to simplify web server configuration.
+
 
 Release 2017c - 2017-10-20 14:49:34 -0700
 
diff --git a/README b/README
index 471fdf9..16d46d7 100644
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ changes made by political bodies to time zone boundaries, UTC offsets,
 and daylight-saving rules.
 
 See <https://www.iana.org/time-zones/repository/tz-link.html> or the
-file tz-link.htm for how to acquire the code and data.  Once acquired,
+file tz-link.html for how to acquire the code and data.  Once acquired,
 read the comments in the file 'Makefile' and make any changes needed
 to make things right for your system, especially if you are using some
 platform other than GNU/Linux.  Then run the following commands,
diff --git a/australasia b/australasia
index 9a968e4..b4ef168 100644
--- a/australasia
+++ b/australasia
@@ -1450,7 +1450,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #
 # From Paul Eggert (2006-03-22):
 # The Department of Internal Affairs (DIA) maintains a brief history,
-# as does Carol Squires; see tz-link.htm for the full references.
+# as does Carol Squires; see tz-link.html for the full references.
 # Use these sources in preference to Shanks & Pottenger.
 #
 # For Chatham, IATA SSIM (1991/1999) gives the NZ rules but with
diff --git a/europe b/europe
index 6a77ef9..85079c0 100644
--- a/europe
+++ b/europe
@@ -1344,7 +1344,7 @@ Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 15  0:01
 # From Markus Kuhn (1998-09-29):
 # The German time zone web site by the Physikalisch-Technische
 # Bundesanstalt contains DST information back to 1916.
-# [See tz-link.htm for the URL.]
+# [See tz-link.html for the URL.]
 
 # From J��rg Schilling (2002-10-23):
 # In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
diff --git a/theory.html b/theory.html
index 5a3cfc7..e70a75d 100644
--- a/theory.html
+++ b/theory.html
@@ -964,7 +964,7 @@ Interface changes in a release attempt to preserve compatibility with
 recent releases.  For example, tz data files typically do not rely on
 recently-added <code>zic</code> features, so that users can run
 older <code>zic</code> versions to process newer data
-files.  <a href="tz-link.htm">Sources for time zone and daylight
+files.  <a href="tz-link.html">Sources for time zone and daylight
 saving time data</a> describes how
 releases are tagged and distributed.
 </p>
diff --git a/tz-art.htm b/tz-art.html
similarity index 99%
rename from tz-art.htm
rename to tz-art.html
index 05707f3..480b9e1 100644
--- a/tz-art.htm
+++ b/tz-art.html
@@ -590,7 +590,7 @@ but maybe in your time zone I haven't finished yet. So stay tuned!"
 </ul>
 <h2>See also</h2>
 <ul>
-<li><a href="tz-link.htm">Sources for Time Zone and Daylight Saving
+<li><a href="tz-link.html">Sources for Time Zone and Daylight Saving
 Time Data</a></li>
 </ul>
 <hr>
diff --git a/tz-how-to.html b/tz-how-to.html
index 6007c5e..a54f54a 100644
--- a/tz-how-to.html
+++ b/tz-how-to.html
@@ -12,7 +12,7 @@ Database</a> Source Files</h2>
 <h3>by Bill Seymour</h3>
 <p>This page uses the <code>America/Chicago</code> and
 <code>Pacific/Honolulu</code> zones as examples of how to infer
-times of day from the <a href="tz-link.htm">tz database</a>
+times of day from the <a href="tz-link.html">tz database</a>
 source files. It might be helpful, but not absolutely necessary,
 for the reader to have already downloaded the
 latest release of the database and become familiar with the basic layout
diff --git a/tz-link.htm b/tz-link.html
similarity index 99%
rename from tz-link.htm
rename to tz-link.html
index 598200b..225d8e5 100644
--- a/tz-link.htm
+++ b/tz-link.html
@@ -920,7 +920,7 @@ is called "<abbr>GMT</abbr>".</li>
 <h2 id="see-also">See also</h2>
 <ul>
 <li><a href="theory.html">Theory and pragmatics of the tz code and data</a></li>
-<li><a href="tz-art.htm">Time and the Arts</a></li>
+<li><a href="tz-art.html">Time and the Arts</a></li>
 </ul>
 <hr>
 <address>
-- 
2.14.3

