Minor mime.types fixes:

  - Change application/vnd.oasis.opendocument.text-master from otm to odm
  - Comment application/vnd.ms-office.activex+xml and video/vnd.dece.mp4
    because no suffixes were defined for those types.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1099022 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index 550e74c4feb1ca93863421a644b8086c0c29f098..6a90929c0d2664fa66437c55712e18fd444fab24 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -559,7 +559,7 @@ application/vnd.ms-fontobject                       eot
 application/vnd.ms-htmlhelp                    chm
 application/vnd.ms-ims                         ims
 application/vnd.ms-lrm                         lrm
-application/vnd.ms-office.activex+xml                  
+# application/vnd.ms-office.activex+xml
 application/vnd.ms-officetheme                 thmx
 application/vnd.ms-pki.seccat                  cat
 application/vnd.ms-pki.stl                     stl
@@ -632,7 +632,7 @@ application/vnd.oasis.opendocument.presentation-template    otp
 application/vnd.oasis.opendocument.spreadsheet         ods
 application/vnd.oasis.opendocument.spreadsheet-template        ots
 application/vnd.oasis.opendocument.text                        odt
-application/vnd.oasis.opendocument.text-master         otm
+application/vnd.oasis.opendocument.text-master         odm
 application/vnd.oasis.opendocument.text-template       ott
 application/vnd.oasis.opendocument.text-web            oth
 # application/vnd.obn
@@ -1436,7 +1436,7 @@ video/quicktime                                   qt mov
 # video/vnd.cctv
 video/vnd.dece.hd                              uvh uvvh
 video/vnd.dece.mobile                          uvm uvvm
-video/vnd.dece.mp4                                     
+# video/vnd.dece.mp4
 video/vnd.dece.pd                              uvp uvvp
 video/vnd.dece.sd                              uvs uvvs
 video/vnd.dece.video                           uvv uvvv