Merge r1915514, r1918129 from trunk: [CTR for docs]

Add MPEG-TS file extensions

Submitted by: Mohamed Akram <mohd.akram outlook.com>
Github: closes #372

Add avif mime type

Submitted by: Adam Silverstein <adamsilverstein earthboundhosting.com>
Github: closes #451

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918431 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index 1b92ee1c83eaf79dc267656056b13e6b3555f9db..98a8e8451af4e2666298809801309d5edb4c9e80 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -1538,6 +1538,7 @@ font/otf                                  otf
 font/ttf                                       ttf
 font/woff                                      woff
 font/woff2                                     woff2
+image/avif                                     avif
 image/bmp                                      bmp
 image/cgm                                      cgm
 # image/dicom-rle
@@ -1645,7 +1646,7 @@ model/vnd.gdl                                     gdl
 # model/vnd.gs.gdl
 model/vnd.gtw                                  gtw
 # model/vnd.moml+xml
-model/vnd.mts                                  mts
+# model/vnd.mts
 # model/vnd.opengex
 # model/vnd.parasolid.transmit.binary
 # model/vnd.parasolid.transmit.text
@@ -1784,7 +1785,7 @@ video/jpm                                 jpm jpgm
 video/mj2                                      mj2 mjp2
 # video/mp1s
 # video/mp2p
-# video/mp2t
+video/mp2t                                     ts m2t m2ts mts
 video/mp4                                      mp4 mp4v mpg4
 # video/mp4v-es
 video/mpeg                                     mpeg mpg mpe m1v m2v