From b0c24fad4488a75433416d24682530596bf3a13a Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 14 Dec 2021 08:53:34 -0800
Subject: [PROPOSED 1/3] Rename CONTRIBUTING.md back to CONTRIBUTING

---
 CONTRIBUTING.md => CONTRIBUTING | 0
 Makefile                        | 7 +++----
 NEWS                            | 4 ----
 README                          | 2 +-
 africa                          | 2 +-
 asia                            | 2 +-
 australasia                     | 2 +-
 backzone                        | 2 +-
 europe                          | 2 +-
 northamerica                    | 2 +-
 southamerica                    | 2 +-
 theory.html                     | 3 +--
 12 files changed, 12 insertions(+), 18 deletions(-)
 rename CONTRIBUTING.md => CONTRIBUTING (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING
similarity index 100%
rename from CONTRIBUTING.md
rename to CONTRIBUTING
diff --git a/Makefile b/Makefile
index 23dcc14..d5202c2 100644
--- a/Makefile
+++ b/Makefile
@@ -505,7 +505,7 @@ MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
 			time2posix.3.txt \
 			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
 			date.1.txt
-COMMON=		calendars CONTRIBUTING.md LICENSE Makefile \
+COMMON=		calendars CONTRIBUTING LICENSE Makefile \
 			NEWS README SECURITY theory.html version
 WEB_PAGES=	tz-art.html tz-how-to.html tz-link.html
 CHECK_WEB_PAGES=check_theory.html check_tz-art.html \
@@ -541,8 +541,7 @@ ENCHILADA = $(EIGHT_YARDS) $(TZS)
 # This list is not the same as the output of 'git ls-files', since
 # .gitignore is not distributed.
 VERSION_DEPS= \
-		calendars CONTRIBUTING.md LICENSE Makefile \
-		NEWS README SECURITY \
+		calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \
 		africa antarctica asctime.c asia australasia \
 		backward backzone \
 		checklinks.awk checktab.awk \
@@ -766,7 +765,7 @@ check_character_set: $(ENCHILADA)
 		sharp='#' && \
 		! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \
 			$(MISC) $(SOURCES) $(WEB_PAGES) \
-			CONTRIBUTING.md LICENSE README SECURITY \
+			CONTRIBUTING LICENSE README SECURITY \
 			version tzdata.zi && \
 		! grep -Env $(SAFE_LINE)'|^UNUSUAL_OK_'$(OK_CHAR)'*$$' \
 			Makefile && \
diff --git a/NEWS b/NEWS
index 1106ef6..9568a86 100644
--- a/NEWS
+++ b/NEWS
@@ -33,10 +33,6 @@ Unreleased, experimental changes
     "pax - portable archive interchange", IEEE Std 1003.1-2017,
     <https://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html#tag_20_92_13>.
 
-  Changes affecting documentation and commentary
-
-    Rename CONTRIBUTING to CONTRIBUTING.md and use Markdown format.
-
 
 Release 2021e - 2021-10-21 18:41:00 -0700
 
diff --git a/README b/README
index c5196ab..145aacd 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@ This database of historical local time information has several goals:
  * Test the generality of the local time rule description system.
 
 The information in the time zone data files is by no means authoritative;
-fixes and enhancements are welcome.  Please see the file CONTRIBUTING.md
+fixes and enhancements are welcome.  Please see the file CONTRIBUTING
 for details.
 
 Thanks to these Time Zone Caballeros who've made major contributions to the
diff --git a/africa b/africa
index 107a8ea..48e9d79 100644
--- a/africa
+++ b/africa
@@ -6,7 +6,7 @@
 # This file is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING.md in the tz distribution.
+# the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2018-05-27):
 #
diff --git a/asia b/asia
index 458032e..05aa318 100644
--- a/asia
+++ b/asia
@@ -6,7 +6,7 @@
 # This file is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING.md in the tz distribution.
+# the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2019-07-11):
 #
diff --git a/australasia b/australasia
index 806a945..77c2c69 100644
--- a/australasia
+++ b/australasia
@@ -974,7 +974,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # This file is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING.md in the tz distribution.
+# the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2018-11-18):
 #
diff --git a/backzone b/backzone
index 1623c7b..8708467 100644
--- a/backzone
+++ b/backzone
@@ -5,7 +5,7 @@
 # This file is by no means authoritative; if you think you know
 # better, go ahead and edit it (and please send any changes to
 # tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING.md in the tz distribution.
+# the file CONTRIBUTING in the tz distribution.
 
 
 # From Paul Eggert (2014-10-31):
diff --git a/europe b/europe
index cc384ec..9fcfeb1 100644
--- a/europe
+++ b/europe
@@ -6,7 +6,7 @@
 # This file is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING.md in the tz distribution.
+# the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2017-02-10):
 #
diff --git a/northamerica b/northamerica
index 7c9c421..fb5c94b 100644
--- a/northamerica
+++ b/northamerica
@@ -8,7 +8,7 @@
 # This file is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING.md in the tz distribution.
+# the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (1999-03-22):
 # A reliable and entertaining source about time zones is
diff --git a/southamerica b/southamerica
index 66d132f..7900af9 100644
--- a/southamerica
+++ b/southamerica
@@ -6,7 +6,7 @@
 # This file is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING.md in the tz distribution.
+# the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2016-12-05):
 #
diff --git a/theory.html b/theory.html
index 05ababf..5a05f4b 100644
--- a/theory.html
+++ b/theory.html
@@ -573,8 +573,7 @@ To avoid ambiguity, use numeric <abbr>UT</abbr> offsets like
 <p>
 The <code><abbr>tz</abbr></code> database is not authoritative, and it
 surely has errors.
-Corrections are welcome and encouraged;
-see the file <code>CONTRIBUTING.md</code>.
+Corrections are welcome and encouraged; see the file <code>CONTRIBUTING</code>.
 Users requiring authoritative data should consult national standards
 bodies and the references cited in the database's comments.
 </p>
-- 
2.33.1

