patch-docs__conf__mime.types   [plain text]

--- docs/conf/mime.types.orig	2013-01-17 05:45:11.000000000 -0800
+++ docs/conf/mime.types	2013-01-17 06:05:03.000000000 -0800
@@ -151,7 +151,7 @@
 # application/nss
 # application/ocsp-request
 # application/ocsp-response
-application/octet-stream	bin dms lrf mar so dist distz pkg bpk dump elc deploy
+application/octet-stream	bin dms lrf mar so dist distz pkg bpk dump elc deploy mobipocket-ebook
 application/oda					oda
 application/oebps-package+xml			opf
 application/ogg					ogx
@@ -1072,6 +1072,7 @@
 application/x-lzh-compressed			lzh lha
 application/x-mie				mie
 application/x-mobipocket-ebook			prc mobi
+application/x-mpegurl				m3u8
 application/x-ms-application			application
 application/x-ms-shortcut			lnk
 application/x-ms-wmd				wmd
@@ -1214,6 +1215,7 @@
 # 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
@@ -1316,11 +1318,13 @@
 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
@@ -1360,6 +1364,7 @@
 image/x-cmx					cmx
 image/x-freehand				fh fhc fh4 fh5 fh7
 image/x-icon					ico
+image/x-macpaint				pntg pnt mac
 image/x-mrsid-image				sid
 image/x-pcx					pcx
 image/x-pict					pic pct
@@ -1367,6 +1372,7 @@
 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-tga					tga
 image/x-xbitmap					xbm
@@ -1425,6 +1431,7 @@
 # multipart/signed
 # multipart/voice-message
 # multipart/x-mixed-replace
+text/cache-manifest                            manifest
 # text/1d-interleaved-parityfec
 text/cache-manifest                             appcache
 text/calendar                                   ics ifb
@@ -1520,9 +1527,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
@@ -1569,6 +1576,7 @@
 video/vnd.uvvu.mp4				uvu uvvu
 video/vnd.vivo					viv
 # video/vp8
+video/x-dv					dv dif
 video/webm					webm
 video/x-f4v					f4v
 video/x-fli					fli