From 15c2d94ff8c50382e0fee9eca19ac1ad45729a95 Mon Sep 17 00:00:00 2001
From: Jon Sneyers <jon@cloudinary.com>
Date: Fri, 21 May 2021 16:23:50 +0200
Subject: [PATCH 1/2] Add JPEG XL (image/jxl)

---
 types/image.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/types/image.yaml b/types/image.yaml
index 292addc..28b474a 100644
--- a/types/image.yaml
+++ b/types/image.yaml
@@ -256,6 +256,17 @@
     - rfc2045
     - rfc2046
   registered: true
+- !ruby/object:MIME::Type
+  content-type: image/jxl
+  friendly:
+    en: JPEG XL Image
+  encoding: base64
+  extensions:
+  - jxl
+  xrefs:
+    person:
+    - ISO-IEC_JTC1
+  registered: true
 - !ruby/object:MIME::Type
   content-type: image/jph
   encoding: base64

From 8b761676faf3bd77ba595dc109a713ac9c16f64c Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Mon, 15 Nov 2021 14:13:16 -0500
Subject: [PATCH 2/2] Clarify support for provisional types like jxl

---
 Contributing.md                       | 16 +++++++++++-----
 History.md                            |  4 +++-
 types/image.yaml                      | 11 -----------
 types/provisional-standard-types.yaml |  2 ++
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Contributing.md b/Contributing.md
index dcc3d52..7a39e8f 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -73,12 +73,17 @@ $ rake mime:apache
 ##### A Note on Provisional Types
 
 The file `types/provisional-standard-types.yaml` contains the provisionally
-registered types from IANA. Whenever IANA types are updated, the existing
-provisional types should be reviewed in the event that they have been promoted
-to standard types.
+registered types from IANA. Per IANA,
 
-It is recommended that customization _not_ be made to provisional types; the
-provisional types file is rewritten on update.
+> This registry, unlike some other provisional IANA registries, is only for
+> temporary use. Entries in this registry are either finalized and moved to the
+> main media types registry or are abandoned and deleted. Entries in this
+> registry are suitable for use for development and test purposes only.
+
+The provisional types file is rewritten when updated, so pull requests to
+manually promote or customize provisional types (such as with extensions). It is
+recommended that any updates required to the data be performed in your
+application if you require provisional types.
 
 ### Development Dependencies
 
@@ -208,6 +213,7 @@ Thanks to everyone else who has contributed to mime-types:
 - Henrik Hodne
 - Jeremy Evans
 - John Gardner
+- Jon Sneyers
 - Jonas Petersen
 - Juanito Fatas
 - Keerthi Siva
diff --git a/History.md b/History.md
index f64ea48..8038540 100644
--- a/History.md
+++ b/History.md
@@ -10,7 +10,8 @@
   have been ported from the [mini_mime] repository. [#47]
 
 - Added IANA provisional media registries. Added some notes to Contributing.md
-  about the transient nature of the provisional registration data. [#45]
+  about the transient nature of the provisional registration data. This was
+  triggered in part by a pull request by Jon Sneyers. Thanks! [#45], [#43]
 
 ## 3.2021.0901 / 2021-09-01
 
@@ -484,6 +485,7 @@
 [#35]: https://github.com/mime-types/mime-types-data/pull/35
 [#36]: https://github.com/mime-types/mime-types-data/pull/36
 [#40]: https://github.com/mime-types/mime-types-data/pull/40
+[#43]: https://github.com/mime-types/mime-types-data/pull/43
 [#45]: https://github.com/mime-types/mime-types-data/pull/45
 [#46]: https://github.com/mime-types/mime-types-data/pull/46
 [#47]: https://github.com/mime-types/mime-types-data/pull/47
diff --git a/types/image.yaml b/types/image.yaml
index 28b474a..292addc 100644
--- a/types/image.yaml
+++ b/types/image.yaml
@@ -256,17 +256,6 @@
     - rfc2045
     - rfc2046
   registered: true
-- !ruby/object:MIME::Type
-  content-type: image/jxl
-  friendly:
-    en: JPEG XL Image
-  encoding: base64
-  extensions:
-  - jxl
-  xrefs:
-    person:
-    - ISO-IEC_JTC1
-  registered: true
 - !ruby/object:MIME::Type
   content-type: image/jph
   encoding: base64
diff --git a/types/provisional-standard-types.yaml b/types/provisional-standard-types.yaml
index c4e2b86..64f125b 100644
--- a/types/provisional-standard-types.yaml
+++ b/types/provisional-standard-types.yaml
@@ -114,6 +114,8 @@
 - !ruby/object:MIME::Type
   content-type: image/jxl
   encoding: base64
+  extensions:
+  - jxl
   xrefs:
     person:
     - Touradj_Ebrahimi