patch-docs__conf__mime.types [plain text]
--- docs/conf/mime.types.orig 2011-05-12 02:54:46.000000000 -0700
+++ docs/conf/mime.types 2011-05-12 03:04:20.000000000 -0700
@@ -142,7 +142,7 @@
# application/nss
# application/ocsp-request
# application/ocsp-response
-application/octet-stream bin dms lha lrf lzh so iso dmg dist distz pkg bpk dump elc deploy
+application/octet-stream bin dms lha lrf lzh so iso dmg dist distz pkg bpk dump elc deploy mobipocket-ebook
application/oda oda
application/oebps-package+xml opf
application/ogg ogx
@@ -1010,6 +1010,7 @@
application/x-java-jnlp-file jnlp
application/x-latex latex
application/x-mobipocket-ebook prc mobi
+application/x-mpegurl m3u8
application/x-ms-application application
application/x-ms-wmd wmd
application/x-ms-wmz wmz
@@ -1134,7 +1135,7 @@
audio/midi mid midi kar rmi
# audio/mobile-xmf
audio/mp4 mp4a
-# audio/mp4a-latm
+audio/mp4a-latm m4a m4p
# audio/mpa
# audio/mpa-robust
audio/mpeg mpga mp2 mp2a mp3 m2a m3a
@@ -1226,12 +1227,13 @@
image/g3fax g3
image/gif gif
image/ief ief
-# image/jp2
+image/jp2 jp2
image/jpeg jpeg jpg jpe
# image/jpm
# image/jpx
image/ktx ktx
# image/naplps
+image/pict pict pic pct
image/png png
image/prs.btif btif
# image/prs.pti
@@ -1268,12 +1270,14 @@
image/x-cmx cmx
image/x-freehand fh fhc fh4 fh5 fh7
image/x-icon ico
+image/x-macpaint pntg pnt mac
image/x-pcx pcx
image/x-pict pic pct
image/x-portable-anymap pnm
image/x-portable-bitmap pbm
image/x-portable-graymap pgm
image/x-portable-pixmap ppm
+image/x-quicktime qtif qti
image/x-rgb rgb
image/x-xbitmap xbm
image/x-xpixmap xpm
@@ -1328,6 +1332,7 @@
# multipart/report
# multipart/signed
# multipart/voice-message
+text/cache-manifest manifest
# text/1d-interleaved-parityfec
text/calendar ics ifb
text/css css
@@ -1416,9 +1421,9 @@
video/mj2 mj2 mjp2
# video/mp1s
# video/mp2p
-# video/mp2t
-video/mp4 mp4 mp4v mpg4
# video/mp4v-es
+video/mp2t ts
+video/mp4 mp4 mp4v mpg4 m4v
video/mpeg mpeg mpg mpe m1v m2v
# video/mpeg4-generic
# video/mpv
@@ -1464,6 +1469,7 @@
# video/vnd.sealedmedia.softseal.mov
video/vnd.uvvu.mp4 uvu uvvu
video/vnd.vivo viv
+video/x-dv dv dif
video/webm webm
video/x-f4v f4v
video/x-fli fli