]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
properly sort the types (no functional change)
authorRoy T. Fielding <fielding@apache.org>
Wed, 17 Feb 2016 00:09:34 +0000 (00:09 +0000)
committerRoy T. Fielding <fielding@apache.org>
Wed, 17 Feb 2016 00:09:34 +0000 (00:09 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730773 13f79535-47bb-0310-9956-ffa450edef68

docs/conf/mime.types

index 69021c9ca5db49095d06a29900339b8ebed988a1..4b33b5c9e166085af90c8b33e9eccd3d9cef73a4 100644 (file)
@@ -71,6 +71,7 @@ application/exi                                       exi
 # application/fastsoap
 # application/fits
 application/font-tdpfr                         pfr
+application/font-woff                          woff
 # application/framework-attributes+xml
 application/gml+xml                            gml
 application/gpx+xml                            gpx
@@ -110,9 +111,9 @@ application/mads+xml                                mads
 application/marc                               mrc
 application/marcxml+xml                                mrcx
 application/mathematica                                ma nb mb
+application/mathml+xml                         mathml
 # application/mathml-content+xml
 # application/mathml-presentation+xml
-application/mathml+xml                         mathml
 # application/mbms-associated-procedure-description+xml
 # application/mbms-deregister+xml
 # application/mbms-envelope+xml
@@ -430,10 +431,10 @@ application/vnd.fujitsu.oasysgp                   fg5
 application/vnd.fujitsu.oasysprs               bh2
 # application/vnd.fujixerox.art-ex
 # application/vnd.fujixerox.art4
-# application/vnd.fujixerox.hbpl
 application/vnd.fujixerox.ddd                  ddd
 application/vnd.fujixerox.docuworks            xdw
 application/vnd.fujixerox.docuworks.binder     xbd
+# application/vnd.fujixerox.hbpl
 # application/vnd.fut-misnet
 application/vnd.fuzzysheet                     fzs
 application/vnd.genomatix.tuxedo               txd
@@ -634,8 +635,8 @@ application/vnd.noblenet-web                        nnw
 # application/vnd.nokia.catalogs
 # application/vnd.nokia.conml+wbxml
 # application/vnd.nokia.conml+xml
-# application/vnd.nokia.isds-radio-presets
 # application/vnd.nokia.iptv.config+xml
+# application/vnd.nokia.isds-radio-presets
 # application/vnd.nokia.landmark+wbxml
 # application/vnd.nokia.landmark+xml
 # application/vnd.nokia.landmarkcollection+xml
@@ -797,7 +798,6 @@ application/vnd.openxmlformats-officedocument.wordprocessingml.template     dotx
 # application/vnd.openxmlformats-package.core-properties+xml
 # application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml
 # application/vnd.openxmlformats-package.relationships+xml
-# application/vnd.quobject-quoxdocument
 # application/vnd.osa.netdeploy
 application/vnd.osgeo.mapguide.package         mgp
 # application/vnd.osgi.bundle
@@ -829,6 +829,7 @@ application/vnd.pvi.ptid1                   ptid
 # application/vnd.pwg-xhtml-print+xml
 # application/vnd.qualcomm.brew-app-res
 application/vnd.quark.quarkxpress              qxd qxt qwd qwt qxl qxb
+# application/vnd.quobject-quoxdocument
 # application/vnd.radisys.moml+xml
 # application/vnd.radisys.msml+xml
 # application/vnd.radisys.msml-audit+xml
@@ -902,6 +903,7 @@ application/vnd.stardivision.writer-global  sgl
 application/vnd.stepmania.package              smzip
 application/vnd.stepmania.stepchart            sm
 # application/vnd.street-stream
+# application/vnd.sun.wadl+xml
 application/vnd.sun.xml.calc                   sxc
 application/vnd.sun.xml.calc.template          stc
 application/vnd.sun.xml.draw                   sxd
@@ -912,7 +914,6 @@ application/vnd.sun.xml.math                        sxm
 application/vnd.sun.xml.writer                 sxw
 application/vnd.sun.xml.writer.global          sxg
 application/vnd.sun.xml.writer.template                stw
-# application/vnd.sun.wadl+xml
 application/vnd.sus-calendar                   sus susp
 application/vnd.svd                            svd
 # application/vnd.swiftview-ics
@@ -1027,8 +1028,8 @@ application/x-cdlink                              vcd
 application/x-cfs-compressed                   cfs
 application/x-chat                             chat
 application/x-chess-pgn                                pgn
-application/x-conference                       nsc
 # application/x-compress
+application/x-conference                       nsc
 application/x-cpio                             cpio
 application/x-csh                              csh
 application/x-debian-package                   deb udeb
@@ -1054,7 +1055,6 @@ application/x-font-snf                            snf
 # application/x-font-sunos-news
 application/x-font-ttf                         ttf ttc
 application/x-font-type1                       pfa pfb pfm afm
-application/font-woff                          woff
 # application/x-font-vfont
 application/x-freearc                          arc
 application/x-futuresplash                     spl
@@ -1130,8 +1130,8 @@ application/xcap-diff+xml                 xdf
 # application/xcap-el+xml
 # application/xcap-error+xml
 # application/xcap-ns+xml
-# application/xcon-conference-info-diff+xml
 # application/xcon-conference-info+xml
+# application/xcon-conference-info-diff+xml
 application/xenc+xml                           xenc
 application/xhtml+xml                          xhtml xht
 # application/xhtml-voice+xml
@@ -1224,8 +1224,8 @@ audio/ogg                                 oga ogg spx
 # audio/parityfec
 # audio/pcma
 # audio/pcma-wb
-# audio/pcmu-wb
 # audio/pcmu
+# audio/pcmu-wb
 # audio/prs.sid
 # audio/qcelp
 # audio/red
@@ -1235,8 +1235,8 @@ audio/ogg                                 oga ogg spx
 audio/s3m                                      s3m
 audio/silk                                     sil
 # audio/smv
-# audio/smv0
 # audio/smv-qcp
+# audio/smv0
 # audio/sp-midi
 # audio/speex
 # audio/t140c
@@ -1332,8 +1332,8 @@ image/tiff                                        tiff tif
 image/vnd.adobe.photoshop                      psd
 # image/vnd.cns.inf2
 image/vnd.dece.graphic                         uvi uvvi uvg uvvg
-image/vnd.dvb.subtitle                         sub
 image/vnd.djvu                                 djvu djv
+image/vnd.dvb.subtitle                         sub
 image/vnd.dwg                                  dwg
 image/vnd.dxf                                  dxf
 image/vnd.fastbidsheet                         fbs
@@ -1443,7 +1443,6 @@ text/n3                                           n3
 text/plain                                     txt text conf def list log in
 # text/prs.fallenstein.rst
 text/prs.lines.tag                             dsc
-# text/vnd.radisys.msml-basic-layout
 # text/red
 # text/rfc822-headers
 text/richtext                                  rtx
@@ -1461,8 +1460,8 @@ text/vcard                                        vcard
 # text/vnd.abc
 text/vnd.curl                                  curl
 text/vnd.curl.dcurl                            dcurl
-text/vnd.curl.scurl                            scurl
 text/vnd.curl.mcurl                            mcurl
+text/vnd.curl.scurl                            scurl
 # text/vnd.dmclientscript
 text/vnd.dvb.subtitle                          sub
 # text/vnd.esmertec.theme-descriptor
@@ -1477,6 +1476,7 @@ text/vnd.in3d.spot                                spot
 # text/vnd.motorola.reflex
 # text/vnd.ms-mediapackage
 # text/vnd.net2phone.commcenter.command
+# text/vnd.radisys.msml-basic-layout
 # text/vnd.si.uricatalogue
 text/vnd.sun.j2me.app-descriptor               jad
 # text/vnd.trolltech.linguist
@@ -1488,9 +1488,9 @@ text/x-asm                                        s asm
 text/x-c                                       c cc cxx cpp h hh dic
 text/x-fortran                                 f for f77 f90
 text/x-java-source                             java
+text/x-nfo                                     nfo
 text/x-opml                                    opml
 text/x-pascal                                  p pas
-text/x-nfo                                     nfo
 text/x-setext                                  etx
 text/x-sfv                                     sfv
 text/x-uuencode                                        uu