Updated MIME types from IANA.

8 files changed, 648 insertions, 43 deletions

diff --git a/History-Types.rdoc b/History-Types.rdoc
index 8a31803..79ccd51 100644
--- a/History-Types.rdoc
+++ b/History-Types.rdoc
@@ -1,6 +1,32 @@
 = MIME Types Changes by Version
 
+== 2.5 / 2015-04-24
+
+* Updated the IANA media registry entries as of release date:
+  * Added MIME types: application/A2L, application/AML, application/ATFX,
+    application/ATXML, application/CDFX+XML, application/CEA, application/DII, 
+    application/DIT, application/jose, application/jose+json,
+    application/json-seq, application/jwk+json, application/jwk-set+json,
+    application/jwt, application/LXF, application/MF4, application/rdap+json,
+    application/vnd.apache.thrift.compact, vnd.apache.thrift.json,
+    application/vnd.citationstyles.style+xml, application/vnd.coffeescript,
+    application/vnd.enphase.envoy, application/vnd.fastcopy-disk-image,
+    application/vnd.gerber, application/vnd.gov.sk.e-form+xml,
+    application/vnd.gov.sk.e-form+zip,
+    application/vnd.gov.sk.xmldatacontainer+xml, application/vnd.ims.imsccv1p1,
+    application/vnd.ims.imsccv1p2, application/vnd.ims.imsccv1p3,
+    application/vnd.micro+json, application/vnd.microsoft.portable-executable,
+    application/vnd.msa-disk-image, application/vnd.oracle.resource+json,
+    application/vnd.tmd.mediaflex.api+xml, audio/opus, image/vnd.zbrush.pcx,
+    text/csv-schema, text/markdown (marked as TEMPORARY).
+  * Updated metadata for application/coap-group+json (RFC7390),
+    application/epub+zip (now registered), application/merge-patch+json
+    (RFC7396), application/smil, application/vnd.arastra.swi,
+    application/vnd.geocube+xml, application/vnd.gmx, application/xhtml+xml,
+    text/directory.
+
 == 2.4.2 / 2014-10-15
+
 * Added application/vnd.ms-outlook as an unregistered MIME type with the
   extension +msg+. Provided by @keerthisiv in
   {#72}[https://github.com/halostatue/mime-types/pull/72].
diff --git a/type-lists/application.yaml b/type-lists/application.yaml
index a3e1d57..1b92b00 100644
--- a/type-lists/application.yaml
+++ b/type-lists/application.yaml
@@ -41,6 +41,21 @@
     - application/3gpp-ims+xml
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/A2L
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/A2L=http://www.iana.org/assignments/media-types/application/A2L}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/A2L
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/acad
   encoding: base64
   registered: false
@@ -200,6 +215,21 @@
     - application/alto-networkmapfilter+json
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/AML
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/AML=http://www.iana.org/assignments/media-types/application/AML}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/AML
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/andrew-inset
   friendly:
     en: Andrew Toolkit
@@ -257,6 +287,21 @@
     - application/ATF
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/ATFX
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/ATFX=http://www.iana.org/assignments/media-types/application/ATFX}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/ATFX
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/atom+xml
   friendly:
     en: Atom Syndication Format
@@ -336,6 +381,21 @@
     - application/atomsvc+xml
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/ATXML
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/ATXML=http://www.iana.org/assignments/media-types/application/ATXML}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/ATXML
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/auth-policy+xml
   encoding: 8bit
   references:
@@ -501,6 +561,21 @@
     - application/ccxml+xml
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/CDFX+XML
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/CDFX+XML=http://www.iana.org/assignments/media-types/application/CDFX+XML}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/CDFX+XML
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/cdmi-capability
   friendly:
     en: Cloud Data Management Interface (CDMI) - Capability
@@ -586,6 +661,21 @@
     - application/cdmi-queue
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/CEA
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/CEA=http://www.iana.org/assignments/media-types/application/CEA}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/CEA
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/cea-2018+xml
   encoding: base64
   references:
@@ -659,11 +749,11 @@
   encoding: base64
   references:
   - IANA
-  - DRAFT:draft-ietf-core-groupcomm-25
+  - RFC7390
   - "{application/coap-group+json=http://www.iana.org/assignments/media-types/application/coap-group+json}"
   xrefs: !ruby/hash:MIME::Types::Container
-    draft:
-    - RFC-ietf-core-groupcomm-25
+    rfc:
+    - rfc7390
     template:
     - application/coap-group+json
   registered: true
@@ -881,6 +971,36 @@
     - application/dicom
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/DII
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/DII=http://www.iana.org/assignments/media-types/application/DII}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/DII
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/DIT
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/DIT=http://www.iana.org/assignments/media-types/application/DIT}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/DIT
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/dns
   encoding: base64
   references:
@@ -992,9 +1112,9 @@
   - RFC1767
   - "{application/EDI-consent=http://www.iana.org/assignments/media-types/application/EDI-consent}"
   xrefs: !ruby/hash:MIME::Types::Container
-    rfc:
+    rfc: &1
     - rfc1767
-    template:
+    template: &2
     - application/EDI-consent
   registered: true
 - !ruby/object:MIME::Type
@@ -1005,10 +1125,8 @@
   - RFC1767
   - "{application/EDI-consent=http://www.iana.org/assignments/media-types/application/EDI-consent}"
   xrefs: !ruby/hash:MIME::Types::Container
-    rfc:
-    - rfc1767
-    template:
-    - application/EDI-consent
+    rfc: *1
+    template: *2
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/EDI-X12
@@ -1103,7 +1221,18 @@
   encoding: base64
   extensions:
   - epub
-  registered: false
+  references:
+  - IANA
+  - "[International_Digital_Publishing_Forum]"
+  - "[William_McCoy]"
+  - "{application/epub+zip=http://www.iana.org/assignments/media-types/application/epub+zip}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - International_Digital_Publishing_Forum
+    - William_McCoy
+    template:
+    - application/epub+zip
+  registered: true
 - !ruby/object:MIME::Type
   content-type: application/eshop
   encoding: base64
@@ -1666,6 +1795,32 @@
     - application/javascript
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/jose
+  encoding: base64
+  references:
+  - IANA
+  - DRAFT:draft-ietf-jose-json-web-signature-41
+  - "{application/jose=http://www.iana.org/assignments/media-types/application/jose}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    draft:
+    - RFC-ietf-jose-json-web-signature-41
+    template:
+    - application/jose
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/jose+json
+  encoding: base64
+  references:
+  - IANA
+  - DRAFT:draft-ietf-jose-json-web-signature-41
+  - "{application/jose+json=http://www.iana.org/assignments/media-types/application/jose+json}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    draft:
+    - RFC-ietf-jose-json-web-signature-41
+    template:
+    - application/jose+json
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/jrd+json
   encoding: base64
   references:
@@ -1709,12 +1864,64 @@
     - application/json-patch+json
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/json-seq
+  encoding: base64
+  references:
+  - IANA
+  - RFC7464
+  - "{application/json-seq=http://www.iana.org/assignments/media-types/application/json-seq}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    rfc:
+    - rfc7464
+    template:
+    - application/json-seq
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/jsonml+json
   encoding: base64
   extensions:
   - jsonml
   registered: false
 - !ruby/object:MIME::Type
+  content-type: application/jwk+json
+  encoding: base64
+  references:
+  - IANA
+  - DRAFT:draft-ietf-jose-json-web-key-41
+  - "{application/jwk+json=http://www.iana.org/assignments/media-types/application/jwk+json}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    draft:
+    - RFC-ietf-jose-json-web-key-41
+    template:
+    - application/jwk+json
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/jwk-set+json
+  encoding: base64
+  references:
+  - IANA
+  - DRAFT:draft-ietf-jose-json-web-key-41
+  - "{application/jwk-set+json=http://www.iana.org/assignments/media-types/application/jwk-set+json}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    draft:
+    - RFC-ietf-jose-json-web-key-41
+    template:
+    - application/jwk-set+json
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/jwt
+  encoding: base64
+  references:
+  - IANA
+  - DRAFT:draft-ietf-oauth-json-web-token-32
+  - "{application/jwt=http://www.iana.org/assignments/media-types/application/jwt}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    draft:
+    - RFC-ietf-oauth-json-web-token-32
+    template:
+    - application/jwt
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/kpml-request+xml
   encoding: base64
   references:
@@ -1819,6 +2026,21 @@
   - application/vnd.lotus-1-2-3
   registered: false
 - !ruby/object:MIME::Type
+  content-type: application/LXF
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/LXF=http://www.iana.org/assignments/media-types/application/LXF}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/LXF
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/mac-binhex40
   friendly:
     en: Macintosh BinHex 4.0
@@ -2202,11 +2424,11 @@
   encoding: base64
   references:
   - IANA
-  - DRAFT:draft-ietf-appsawg-json-merge-patch-07
+  - RFC7396
   - "{application/merge-patch+json=http://www.iana.org/assignments/media-types/application/merge-patch+json}"
   xrefs: !ruby/hash:MIME::Types::Container
-    draft:
-    - RFC-ietf-appsawg-json-merge-patch-07
+    rfc:
+    - rfc7396
     template:
     - application/merge-patch+json
   registered: true
@@ -2251,6 +2473,21 @@
     - application/mets+xml
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/MF4
+  encoding: base64
+  references:
+  - IANA
+  - "[ASAM]"
+  - "[Thomas_Thomsen]"
+  - "{application/MF4=http://www.iana.org/assignments/media-types/application/MF4}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - ASAM
+    - Thomas_Thomsen
+    template:
+    - application/MF4
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/mikey
   encoding: base64
   references:
@@ -3301,6 +3538,19 @@
     - application/raptorfec
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/rdap+json
+  encoding: base64
+  references:
+  - IANA
+  - RFC7483
+  - "{application/rdap+json=http://www.iana.org/assignments/media-types/application/rdap+json}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    rfc:
+    - rfc7483
+    template:
+    - application/rdap+json
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/rdf+xml
   friendly:
     en: Resource Description Framework
@@ -3969,6 +4219,8 @@
     - rfc4536
     template:
     - application/smil
+    notes:
+    - "- OBSOLETED in favor of application/smil+xml"
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/smil+xml
@@ -5062,6 +5314,32 @@
     - application/vnd.apache.thrift.binary
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.apache.thrift.compact
+  encoding: base64
+  references:
+  - IANA
+  - "[Roger_Meier]"
+  - "{application/vnd.apache.thrift.compact=http://www.iana.org/assignments/media-types/application/vnd.apache.thrift.compact}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Roger_Meier
+    template:
+    - application/vnd.apache.thrift.compact
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/vnd.apache.thrift.json
+  encoding: base64
+  references:
+  - IANA
+  - "[Roger_Meier]"
+  - "{application/vnd.apache.thrift.json=http://www.iana.org/assignments/media-types/application/vnd.apache.thrift.json}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Roger_Meier
+    template:
+    - application/vnd.apache.thrift.json
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.api+json
   encoding: base64
   references:
@@ -5133,6 +5411,8 @@
     - Bill_Fenner
     template:
     - application/vnd.arastra.swi
+    notes:
+    - "- OBSOLETED in favor of application/vnd.aristanetworks.swi"
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/vnd.aristanetworks.swi
@@ -5455,6 +5735,19 @@
     - application/vnd.cirpack.isdn-ext
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.citationstyles.style+xml
+  encoding: base64
+  references:
+  - IANA
+  - "[Rintze_M._Zelle]"
+  - "{application/vnd.citationstyles.style+xml=http://www.iana.org/assignments/media-types/application/vnd.citationstyles.style+xml}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Rintze_M._Zelle
+    template:
+    - application/vnd.citationstyles.style+xml
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.claymore
   friendly:
     en: Claymore Data Files
@@ -5544,6 +5837,19 @@
     - application/vnd.cluetrust.cartomobile-config-pkg
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.coffeescript
+  encoding: base64
+  references:
+  - IANA
+  - "[Devyn_Collier_Johnson]"
+  - "{application/vnd.coffeescript=http://www.iana.org/assignments/media-types/application/vnd.coffeescript}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Devyn_Collier_Johnson
+    template:
+    - application/vnd.coffeescript
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.collection+json
   encoding: base64
   references:
@@ -6672,6 +6978,19 @@
     - application/vnd.enliven
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.enphase.envoy
+  encoding: base64
+  references:
+  - IANA
+  - "[Chris_Eich]"
+  - "{application/vnd.enphase.envoy=http://www.iana.org/assignments/media-types/application/vnd.enphase.envoy}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Chris_Eich
+    template:
+    - application/vnd.enphase.envoy
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.eprints.data+xml
   encoding: base64
   references:
@@ -7151,6 +7470,19 @@
     - application/vnd.f-secure.mobile
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.fastcopy-disk-image
+  encoding: base64
+  references:
+  - IANA
+  - "[Thomas_Huth]"
+  - "{application/vnd.fastcopy-disk-image=http://www.iana.org/assignments/media-types/application/vnd.fastcopy-disk-image}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Thomas_Huth
+    template:
+    - application/vnd.fastcopy-disk-image
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.fdf
   friendly:
     en: Forms Data Format
@@ -7608,6 +7940,8 @@
     - Francois_Pirsch
     template:
     - application/vnd.geocube+xml
+    notes:
+    - "- OBSOLETED by request"
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/vnd.geogebra.file
@@ -7717,6 +8051,19 @@
     - application/vnd.geospace
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.gerber
+  encoding: base64
+  references:
+  - IANA
+  - "[Thomas_Weyn]"
+  - "{application/vnd.gerber=http://www.iana.org/assignments/media-types/application/vnd.gerber}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Thomas_Weyn
+    template:
+    - application/vnd.gerber
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.globalplatform.card-content-mgt
   encoding: base64
   references:
@@ -7759,6 +8106,8 @@
     - Christian_V._Sciberras
     template:
     - application/vnd.gmx
+    notes:
+    - "- DEPRECATED"
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/vnd.google-earth.kml+xml
@@ -7795,6 +8144,51 @@
     - application/vnd.google-earth.kmz
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.gov.sk.e-form+xml
+  encoding: base64
+  references:
+  - IANA
+  - "[Peter_Biro]"
+  - "[Stefan_Szilva]"
+  - "{application/vnd.gov.sk.e-form+xml=http://www.iana.org/assignments/media-types/application/vnd.gov.sk.e-form+xml}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Peter_Biro
+    - Stefan_Szilva
+    template:
+    - application/vnd.gov.sk.e-form+xml
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/vnd.gov.sk.e-form+zip
+  encoding: base64
+  references:
+  - IANA
+  - "[Peter_Biro]"
+  - "[Stefan_Szilva]"
+  - "{application/vnd.gov.sk.e-form+zip=http://www.iana.org/assignments/media-types/application/vnd.gov.sk.e-form+zip}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Peter_Biro
+    - Stefan_Szilva
+    template:
+    - application/vnd.gov.sk.e-form+zip
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/vnd.gov.sk.xmldatacontainer+xml
+  encoding: base64
+  references:
+  - IANA
+  - "[Peter_Biro]"
+  - "[Stefan_Szilva]"
+  - "{application/vnd.gov.sk.xmldatacontainer+xml=http://www.iana.org/assignments/media-types/application/vnd.gov.sk.xmldatacontainer+xml}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Peter_Biro
+    - Stefan_Szilva
+    template:
+    - application/vnd.gov.sk.xmldatacontainer+xml
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.grafeq
   friendly:
     en: GrafEq
@@ -8385,6 +8779,45 @@
     - application/vnd.immervision-ivu
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.ims.imsccv1p1
+  encoding: base64
+  references:
+  - IANA
+  - "[Lisa_Mattson]"
+  - "{application/vnd.ims.imsccv1p1=http://www.iana.org/assignments/media-types/application/vnd.ims.imsccv1p1}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Lisa_Mattson
+    template:
+    - application/vnd.ims.imsccv1p1
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/vnd.ims.imsccv1p2
+  encoding: base64
+  references:
+  - IANA
+  - "[Lisa_Mattson]"
+  - "{application/vnd.ims.imsccv1p2=http://www.iana.org/assignments/media-types/application/vnd.ims.imsccv1p2}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Lisa_Mattson
+    template:
+    - application/vnd.ims.imsccv1p2
+  registered: true
+- !ruby/object:MIME::Type
+  content-type: application/vnd.ims.imsccv1p3
+  encoding: base64
+  references:
+  - IANA
+  - "[Lisa_Mattson]"
+  - "{application/vnd.ims.imsccv1p3=http://www.iana.org/assignments/media-types/application/vnd.ims.imsccv1p3}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Lisa_Mattson
+    template:
+    - application/vnd.ims.imsccv1p3
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.ims.lis.v2.result+json
   encoding: base64
   references:
@@ -8479,7 +8912,8 @@
   content-type: application/vnd.informix-visionary
   encoding: base64
   obsolete: true
-  use-instead: application/vnd.visionary
+  use-instead:
+  - application/vnd.visionary
   references:
   - IANA
   - "[Christopher_Gales]"
@@ -8489,6 +8923,8 @@
     - Christopher_Gales
     template:
     - application/vnd.informix-visionary
+    notes:
+    - "- OBSOLETED in favor of application/vnd.visionary"
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/vnd.infotech.project
@@ -9609,6 +10045,19 @@
     - application/vnd.mfmp
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.micro+json
+  encoding: base64
+  references:
+  - IANA
+  - "[Dali_Zheng]"
+  - "{application/vnd.micro+json=http://www.iana.org/assignments/media-types/application/vnd.micro+json}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Dali_Zheng
+    template:
+    - application/vnd.micro+json
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.micrografx.flo
   friendly:
     en: Micrografx
@@ -9643,6 +10092,19 @@
     - application/vnd.micrografx-igx
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.microsoft.portable-executable
+  encoding: base64
+  references:
+  - IANA
+  - "[Henrik_Andersson]"
+  - "{application/vnd.microsoft.portable-executable=http://www.iana.org/assignments/media-types/application/vnd.microsoft.portable-executable}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Henrik_Andersson
+    template:
+    - application/vnd.microsoft.portable-executable
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.miele+json
   encoding: base64
   references:
@@ -10546,6 +11008,19 @@
     - application/vnd.ms-xpsdocument
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.msa-disk-image
+  encoding: base64
+  references:
+  - IANA
+  - "[Thomas_Huth]"
+  - "{application/vnd.msa-disk-image=http://www.iana.org/assignments/media-types/application/vnd.msa-disk-image}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Thomas_Huth
+    template:
+    - application/vnd.msa-disk-image
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.mseq
   friendly:
     en: 3GPP MSEQ File
@@ -10983,6 +11458,8 @@
     - Nokia
     template:
     - application/vnd.nokia.n-gage.symbian.install
+    notes:
+    - "- OBSOLETE; no replacement given"
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/vnd.nokia.ncd
@@ -13281,6 +13758,19 @@
     - application/vnd.openxmlformats-package.relationships+xml
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.oracle.resource+json
+  encoding: base64
+  references:
+  - IANA
+  - "[Ning_Dong]"
+  - "{application/vnd.oracle.resource+json=http://www.iana.org/assignments/media-types/application/vnd.oracle.resource+json}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Ning_Dong
+    template:
+    - application/vnd.oracle.resource+json
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.orange.indata
   encoding: base64
   references:
@@ -15171,6 +15661,19 @@
     - application/vnd.tcpdump.pcap
   registered: true
 - !ruby/object:MIME::Type
+  content-type: application/vnd.tmd.mediaflex.api+xml
+  encoding: base64
+  references:
+  - IANA
+  - "[Alex_Sibilev]"
+  - "{application/vnd.tmd.mediaflex.api+xml=http://www.iana.org/assignments/media-types/application/vnd.tmd.mediaflex.api+xml}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Alex_Sibilev
+    template:
+    - application/vnd.tmd.mediaflex.api+xml
+  registered: true
+- !ruby/object:MIME::Type
   content-type: application/vnd.tmobile-livetv
   friendly:
     en: MobileTV
@@ -18040,11 +18543,13 @@
   - xhtml
   references:
   - IANA
-  - RFC3236
+  - "[W3C]"
+  - "[Robin_Berjon]"
   - "{application/xhtml+xml=http://www.iana.org/assignments/media-types/application/xhtml+xml}"
   xrefs: !ruby/hash:MIME::Types::Container
-    rfc:
-    - rfc3236
+    person:
+    - Robin_Berjon
+    - W3C
     template:
     - application/xhtml+xml
   registered: true
@@ -18061,6 +18566,8 @@
     - draft-mccobb-xplusv-media-type
     template:
     - application/xhtml-voice+xml
+    notes:
+    - "- OBSOLETE; no replacement given"
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/xml
diff --git a/type-lists/audio.yaml b/type-lists/audio.yaml
index 292b647..c3bda95 100644
--- a/type-lists/audio.yaml
+++ b/type-lists/audio.yaml
@@ -103,9 +103,9 @@
   - RFC4867
   - "{audio/AMR-WB=http://www.iana.org/assignments/media-types/audio/AMR-WB}"
   xrefs: !ruby/hash:MIME::Types::Container
-    rfc:
+    rfc: &1
     - rfc4867
-    template:
+    template: &2
     - audio/AMR-WB
   registered: true
 - !ruby/object:MIME::Type
@@ -116,10 +116,8 @@
   - RFC4867
   - "{audio/AMR-WB=http://www.iana.org/assignments/media-types/audio/AMR-WB}"
   xrefs: !ruby/hash:MIME::Types::Container
-    rfc:
-    - rfc4867
-    template:
-    - audio/AMR-WB
+    rfc: *1
+    template: *2
   registered: true
 - !ruby/object:MIME::Type
   content-type: audio/amr-wb+
@@ -1048,6 +1046,19 @@
     - audio/ogg
   registered: true
 - !ruby/object:MIME::Type
+  content-type: audio/opus
+  encoding: base64
+  references:
+  - IANA
+  - DRAFT:draft-ietf-payload-rtp-opus-11
+  - "{audio/opus=http://www.iana.org/assignments/media-types/audio/opus}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    draft:
+    - RFC-ietf-payload-rtp-opus-11
+    template:
+    - audio/opus
+  registered: true
+- !ruby/object:MIME::Type
   content-type: audio/parityfec
   encoding: base64
   references:
@@ -1881,7 +1892,8 @@
   extensions:
   - qcp
   obsolete: true
-  use-instead: audio/qcelp
+  use-instead:
+  - audio/qcelp
   references:
   - IANA
   - RFC3625
@@ -1891,6 +1903,8 @@
     - rfc3625
     template:
     - audio/vnd.qcelp
+    notes:
+    - "- DEPRECATED in favor of audio/qcelp"
   registered: true
 - !ruby/object:MIME::Type
   content-type: audio/vnd.rhetorex.32kadpcm
diff --git a/type-lists/image.yaml b/type-lists/image.yaml
index bd410f6..4d22813 100644
--- a/type-lists/image.yaml
+++ b/type-lists/image.yaml
@@ -793,6 +793,19 @@
     - image/vnd.xiff
   registered: true
 - !ruby/object:MIME::Type
+  content-type: image/vnd.zbrush.pcx
+  encoding: base64
+  references:
+  - IANA
+  - "[Chris_Charabaruk]"
+  - "{image/vnd.zbrush.pcx=http://www.iana.org/assignments/media-types/image/vnd.zbrush.pcx}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - Chris_Charabaruk
+    template:
+    - image/vnd.zbrush.pcx
+  registered: true
+- !ruby/object:MIME::Type
   content-type: image/webp
   friendly:
     en: WebP Image
diff --git a/type-lists/message.yaml b/type-lists/message.yaml
index 7cde3cf..c425429 100644
--- a/type-lists/message.yaml
+++ b/type-lists/message.yaml
@@ -170,6 +170,8 @@
     - Henry_Spencer
     template:
     - message/news
+    notes:
+    - "- OBSOLETED by RFC5537"
   registered: true
 - !ruby/object:MIME::Type
   content-type: message/partial
@@ -265,6 +267,8 @@
     - Nicholas_Parks_Young
     template:
     - message/vnd.si.simp
+    notes:
+    - "- OBSOLETED by request"
   registered: true
 - !ruby/object:MIME::Type
   content-type: message/vnd.wfa.wsc
diff --git a/type-lists/multipart.yaml b/type-lists/multipart.yaml
index 492179e..261d90d 100644
--- a/type-lists/multipart.yaml
+++ b/type-lists/multipart.yaml
@@ -80,11 +80,11 @@
   encoding: base64
   references:
   - IANA
-  - RFC2388
+  - DRAFT:draft-ietf-appsawg-multipart-form-data-11
   - "{multipart/form-data=http://www.iana.org/assignments/media-types/multipart/form-data}"
   xrefs: !ruby/hash:MIME::Types::Container
-    rfc:
-    - rfc2388
+    draft:
+    - RFC-ietf-appsawg-multipart-form-data-11
     template:
     - multipart/form-data
   registered: true
diff --git a/type-lists/text.yaml b/type-lists/text.yaml
index 9ea8add..0b7fb47 100644
--- a/type-lists/text.yaml
+++ b/type-lists/text.yaml
@@ -94,6 +94,21 @@
     - text/csv
   registered: true
 - !ruby/object:MIME::Type
+  content-type: text/csv-schema
+  encoding: quoted-printable
+  references:
+  - IANA
+  - "[National_Archives_UK]"
+  - "[David_Underdown]"
+  - "{text/csv-schema=http://www.iana.org/assignments/media-types/text/csv-schema}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    person:
+    - David_Underdown
+    - National_Archives_UK
+    template:
+    - text/csv-schema
+  registered: true
+- !ruby/object:MIME::Type
   content-type: text/directory
   encoding: quoted-printable
   obsolete: true
@@ -101,10 +116,15 @@
   - IANA
   - RFC2425
   - RFC6350
+  - "{text/directory=http://www.iana.org/assignments/media-types/text/directory}"
   xrefs: !ruby/hash:MIME::Types::Container
     rfc:
     - rfc2425
     - rfc6350
+    template:
+    - text/directory
+    notes:
+    - "- DEPRECATED by RFC6350"
   registered: true
 - !ruby/object:MIME::Type
   content-type: text/directory - DEPRECATED by RFC6350
@@ -149,6 +169,8 @@
     - rfc4329
     template:
     - text/ecmascript
+    notes:
+    - "- OBSOLETED in favor of application/ecmascript"
   registered: true
 - !ruby/object:MIME::Type
   content-type: text/encaprtp
@@ -252,6 +274,8 @@
     - rfc4329
     template:
     - text/javascript
+    notes:
+    - "- OBSOLETED in favor of application/javascript"
   registered: true
 - !ruby/object:MIME::Type
   content-type: text/jcr-cnd
@@ -267,6 +291,21 @@
     - text/jcr-cnd
   registered: true
 - !ruby/object:MIME::Type
+  content-type: text/markdown
+  encoding: quoted-printable
+  references:
+  - IANA
+  - DRAFT:draft-ietf-appsawg-text-markdown
+  - "{text/markdown=http://www.iana.org/assignments/media-types/text/markdown}"
+  xrefs: !ruby/hash:MIME::Types::Container
+    draft:
+    - draft-ietf-appsawg-text-markdown
+    template:
+    - text/markdown
+    notes:
+    - "(TEMPORARY - registered 2014-11-11, expires 2015-11-11)"
+  registered: true
+- !ruby/object:MIME::Type
   content-type: text/mizar
   encoding: quoted-printable
   references:
@@ -974,6 +1013,8 @@
     - Nicholas_Parks_Young
     template:
     - text/vnd.si.uricatalogue
+    notes:
+    - "- OBSOLETED by request"
   registered: true
 - !ruby/object:MIME::Type
   content-type: text/vnd.sun.j2me.app-descriptor
diff --git a/type-lists/video.yaml b/type-lists/video.yaml
index 4774d52..7bc54ae 100644
--- a/type-lists/video.yaml
+++ b/type-lists/video.yaml
@@ -646,11 +646,11 @@
   encoding: base64
   references:
   - IANA
-  - "[Frank_Rottman]"
+  - "[Frank_Rottmann]"
   - "{video/vnd.CCTV=http://www.iana.org/assignments/media-types/video/vnd.CCTV}"
   xrefs: !ruby/hash:MIME::Types::Container
     person:
-    - Frank_Rottman
+    - Frank_Rottmann
     template:
     - video/vnd.CCTV
   registered: true
@@ -664,11 +664,11 @@
   - uvvh
   references:
   - IANA
-  - "[Dolan]"
+  - "[Michael_A_Dolan]"
   - "{video/vnd.dece.hd=http://www.iana.org/assignments/media-types/video/vnd.dece.hd}"
   xrefs: !ruby/hash:MIME::Types::Container
     person:
-    - Dolan
+    - Michael_A_Dolan
     template:
     - video/vnd.dece.hd
   registered: true
@@ -682,11 +682,11 @@
   - uvvm
   references:
   - IANA
-  - "[Dolan]"
+  - "[Michael_A_Dolan]"
   - "{video/vnd.dece.mobile=http://www.iana.org/assignments/media-types/video/vnd.dece.mobile}"
   xrefs: !ruby/hash:MIME::Types::Container
     person:
-    - Dolan
+    - Michael_A_Dolan
     template:
     - video/vnd.dece.mobile
   registered: true
@@ -695,11 +695,11 @@
   encoding: base64
   references:
   - IANA
-  - "[Dolan]"
+  - "[Michael_A_Dolan]"
   - "{video/vnd.dece-mp4=http://www.iana.org/assignments/media-types/video/vnd.dece-mp4}"
   xrefs: !ruby/hash:MIME::Types::Container
     person:
-    - Dolan
+    - Michael_A_Dolan
     template:
     - video/vnd.dece-mp4
   registered: true
@@ -713,11 +713,11 @@
   - uvvp
   references:
   - IANA
-  - "[Dolan]"
+  - "[Michael_A_Dolan]"
   - "{video/vnd.dece.pd=http://www.iana.org/assignments/media-types/video/vnd.dece.pd}"
   xrefs: !ruby/hash:MIME::Types::Container
     person:
-    - Dolan
+    - Michael_A_Dolan
     template:
     - video/vnd.dece.pd
   registered: true
@@ -731,11 +731,11 @@
   - uvvs
   references:
   - IANA
-  - "[Dolan]"
+  - "[Michael_A_Dolan]"
   - "{video/vnd.dece.sd=http://www.iana.org/assignments/media-types/video/vnd.dece.sd}"
   xrefs: !ruby/hash:MIME::Types::Container
     person:
-    - Dolan
+    - Michael_A_Dolan
     template:
     - video/vnd.dece.sd
   registered: true
@@ -749,11 +749,11 @@
   - uvvv
   references:
   - IANA
-  - "[Dolan]"
+  - "[Michael_A_Dolan]"
   - "{video/vnd.dece.video=http://www.iana.org/assignments/media-types/video/vnd.dece.video}"
   xrefs: !ruby/hash:MIME::Types::Container
     person:
-    - Dolan
+    - Michael_A_Dolan
     template:
     - video/vnd.dece.video
   registered: true
@@ -1126,11 +1126,11 @@
   - uvvu
   references:
   - IANA
-  - "[Dolan]"
+  - "[Michael_A_Dolan]"
   - "{video/vnd.uvvu-mp4=http://www.iana.org/assignments/media-types/video/vnd.uvvu-mp4}"
   xrefs: !ruby/hash:MIME::Types::Container
     person:
-    - Dolan
+    - Michael_A_Dolan
     template:
     - video/vnd.uvvu-mp4
   registered: true