Index: freedesktop.org.xml.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
retrieving revision 1.16
diff -u -p -r1.16 freedesktop.org.xml.in
--- freedesktop.org.xml.in	23 Apr 2004 15:47:45 -0000	1.16
+++ freedesktop.org.xml.in	14 May 2004 13:37:15 -0000
@@ -68,18 +68,6 @@ command to generate the output files.
       <match type="string" value="must be converted with BinHex" offset="11"/>
     </magic>
   </mime-type>
-  <mime-type type="application/msword">
-    <_comment>Microsoft Word document</_comment>
-    <magic priority="50">
-      <match type="string" value="\x31\xbe\x00\x00" offset="0"/>
-      <match type="string" value="PO^Q`" offset="0"/>
-      <match type="string" value="\376\067\0\043" offset="0"/>
-      <match type="string" value="\333\245-\0\0\0" offset="0"/>
-      <match type="string" value="Microsoft Word 6.0 Document" offset="2080"/>
-      <match type="string" value="Microsoft Word document data" offset="2112"/>
-    </magic>
-    <glob pattern="*.doc"/>
-  </mime-type>
   <mime-type type="application/octet-stream">
     <_comment>unknown</_comment>
     <magic priority="50">
@@ -182,6 +170,7 @@ command to generate the output files.
     <glob pattern="*.xla"/>
     <glob pattern="*.xlt"/>
     <glob pattern="*.xld"/>
+    <alias type="application/msexcel"/>
   </mime-type>
   <mime-type type="application/vnd.ms-powerpoint">
     <_comment>Microsoft PowerPoint presentation</_comment>
@@ -195,6 +184,16 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.ms-word">
     <_comment>Microsoft Word document</_comment>
+    <magic priority="50">
+      <match type="string" value="\x31\xbe\x00\x00" offset="0"/>
+      <match type="string" value="PO^Q`" offset="0"/>
+      <match type="string" value="\376\067\0\043" offset="0"/>
+      <match type="string" value="\333\245-\0\0\0" offset="0"/>
+      <match type="string" value="Microsoft Word 6.0 Document" offset="2080"/>
+      <match type="string" value="Microsoft Word document data" offset="2112"/>
+    </magic>
+    <glob pattern="*.doc"/>
+    <alias type="application/msword"/>
   </mime-type>
   <mime-type type="application/vnd.palm">
     <_comment>Palmpilot database/document</_comment>
@@ -1380,6 +1379,7 @@ command to generate the output files.
     <glob pattern="*.zoo"/>
   </mime-type>
   <mime-type type="application/xhtml+xml">
+    <sub-class-of type="text/xml"/>
     <_comment>XHTML page</_comment>
     <glob pattern="*.xhtml"/>
     <root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
@@ -1411,9 +1411,6 @@ command to generate the output files.
     <glob pattern="*.sid"/>
     <glob pattern="*.psid"/>
   </mime-type>
-  <mime-type type="audio/vnd.rn-realaudio">
-    <_comment>RealAudio broadcast</_comment>
-  </mime-type>
   <mime-type type="audio/x-adpcm">
     <_comment>PCM audio</_comment>
     <magic priority="50">
@@ -1517,6 +1514,7 @@ command to generate the output files.
     <glob pattern="*.ra"/>
     <glob pattern="*.ram"/>
     <glob pattern="*.rm"/>
+    <alias type="audio/vnd.rn-realaudio"/>
   </mime-type>
   <mime-type type="audio/x-riff">
     <_comment>RIFF audio</_comment>
@@ -1623,6 +1621,7 @@ command to generate the output files.
     <glob pattern="*.rle"/>
   </mime-type>
   <mime-type type="image/svg+xml">
+    <sub-class-of type="text/xml"/>
     <_comment>scalable SVG image</_comment>
     <magic priority="80">
       <match type="string" value="&lt;!DOCTYPE svg" offset="0:256"/>
@@ -1884,8 +1883,8 @@ command to generate the output files.
   <mime-type type="inode/fifo">
     <_comment>pipe</_comment>
   </mime-type>
-  <mime-type type='inode/mount-point'>
-    <sub-class-of type='inode/directory'/>
+  <mime-type type="inode/mount-point">
+    <sub-class-of type="inode/directory"/>
     <_comment>mount point</_comment>
   </mime-type>
   <mime-type type="inode/socket">
@@ -1981,10 +1980,12 @@ command to generate the output files.
     <_comment>enriched text document</_comment>
   </mime-type>
   <mime-type type="text/x-gettext-translation">
+    <sub-class-of type="text/plain"/>
     <_comment>translated messages</_comment>
     <glob pattern="*.po"/>
   </mime-type>
   <mime-type type="text/x-gettext-translation-template">
+    <sub-class-of type="text/plain"/>
     <_comment>message translation template</_comment>
     <glob pattern="*.pot"/>
   </mime-type>
@@ -2029,6 +2030,7 @@ command to generate the output files.
     <glob pattern="*.asc"/>
   </mime-type>
   <mime-type type="text/rdf">
+    <sub-class-of type="text/plain"/>
     <_comment>Resource Description Framework (RDF) file</_comment>
     <glob pattern="*.rdf"/>
   </mime-type>
@@ -2036,10 +2038,12 @@ command to generate the output files.
     <_comment>email headers</_comment>
   </mime-type>
   <mime-type type="text/richtext">
+    <sub-class-of type="text/plain"/>
     <_comment>rich text document</_comment>
     <glob pattern="*.rtx"/>
   </mime-type>
   <mime-type type="text/rss">
+    <sub-class-of type="text/plain"/>
     <_comment>RDF Site Summary</_comment>
     <glob pattern="*.rss"/>
   </mime-type>
@@ -2057,6 +2061,7 @@ command to generate the output files.
     <glob pattern="*.slk"/>
   </mime-type>
   <mime-type type="text/tab-separated-values">
+    <sub-class-of type="text/plain"/>
     <_comment>text document (with tab-separated values)</_comment>
     <glob pattern="*.tsv"/>
   </mime-type>
@@ -2065,23 +2070,28 @@ command to generate the output files.
     <glob pattern="*.wml"/>
   </mime-type>
   <mime-type type="text/x-adasrc">
+    <sub-class-of type="text/plain"/>
     <_comment>Ada source code</_comment>
     <glob pattern="*.adb"/>
     <glob pattern="*.ads"/>
   </mime-type>
   <mime-type type="text/x-authors">
+    <sub-class-of type="text/plain"/>
     <_comment>author list</_comment>
     <glob pattern="AUTHORS"/>
   </mime-type>
   <mime-type type="text/x-bibtex">
+    <sub-class-of type="text/plain"/>
     <_comment>Bibtex bibliographic data</_comment>
     <glob pattern="*.bib"/>
   </mime-type>
   <mime-type type="text/x-c++hdr">
+    <sub-class-of type="text/plain"/>
     <_comment>C++ source code header</_comment>
     <glob pattern="*.hh"/>
   </mime-type>
   <mime-type type="text/x-c++src">
+    <sub-class-of type="text/plain"/>
     <_comment>C++ source code</_comment>
     <glob pattern="*.cpp"/>
     <glob pattern="*.cxx"/>
@@ -2090,32 +2100,39 @@ command to generate the output files.
     <glob pattern="*.c++"/>
   </mime-type>
   <mime-type type="text/x-chdr">
+    <sub-class-of type="text/plain"/>
     <_comment>C source code header</_comment>
     <glob pattern="*.h"/>
     <glob pattern="*.h++"/>
     <glob pattern="*.hp"/>
   </mime-type>
   <mime-type type="text/x-comma-separated-values">
+    <sub-class-of type="text/plain"/>
     <_comment>text document (with comma-separated values)</_comment>
     <glob pattern="*.csv"/>
   </mime-type>
   <mime-type type="text/x-copying">
+    <sub-class-of type="text/plain"/>
     <_comment>software license terms</_comment>
     <glob pattern="COPYING"/>
   </mime-type>
   <mime-type type="text/x-credits">
+    <sub-class-of type="text/plain"/>
     <_comment>software author credits</_comment>
     <glob pattern="CREDITS"/>
   </mime-type>
   <mime-type type="text/x-csrc">
+    <sub-class-of type="text/plain"/>
     <_comment>C source code</_comment>
     <glob pattern="*.c"/>
   </mime-type>
   <mime-type type="text/x-csharp">
+    <sub-class-of type="text/plain"/>
     <_comment>C# source code</_comment>
     <glob pattern="*.cs"/>
   </mime-type>
   <mime-type type="text/x-dcl">
+    <sub-class-of type="text/plain"/>
     <_comment>DCL script</_comment>
     <glob pattern="*.dcl"/>
   </mime-type>
@@ -2124,10 +2141,12 @@ command to generate the output files.
     <glob pattern="*.dsl"/>
   </mime-type>
   <mime-type type="text/x-dtd">
+    <sub-class-of type="text/plain"/>
     <_comment>document type definition</_comment>
     <glob pattern="*.dtd"/>
   </mime-type>
   <mime-type type="text/x-emacs-lisp">
+    <sub-class-of type="text/plain"/>
     <_comment>Emacs Lisp source code</_comment>
     <magic priority="50">
       <match type="string" value="\012(" offset="0"/>
@@ -2136,27 +2155,33 @@ command to generate the output files.
     <glob pattern="*.el"/>
   </mime-type>
   <mime-type type="text/x-fortran">
+    <sub-class-of type="text/plain"/>
     <_comment>Fortran source code</_comment>
     <glob pattern="*.f"/>
   </mime-type>
   <mime-type type="text/x-gtkrc">
+    <sub-class-of type="text/plain"/>
     <_comment>GTK configuration</_comment>
     <glob pattern="gtkrc"/>
     <glob pattern=".gtkrc"/>
   </mime-type>
   <mime-type type="text/x-haskell">
+    <sub-class-of type="text/plain"/>
     <_comment>Haskell source code</_comment>
     <glob pattern="*.hs"/>
   </mime-type>
   <mime-type type="text/x-idl">
+    <sub-class-of type="text/plain"/>
     <_comment>IDL document</_comment>
     <glob pattern="*.idl"/>
   </mime-type>
   <mime-type type="text/x-install">
+    <sub-class-of type="text/plain"/>
     <_comment>software installation instructions</_comment>
     <glob pattern="INSTALL"/>
   </mime-type>
   <mime-type type="text/x-java">
+    <sub-class-of type="text/plain"/>
     <_comment>Java source code</_comment>
     <glob pattern="*.java"/>
   </mime-type>
@@ -2167,37 +2192,45 @@ command to generate the output files.
     </magic>
   </mime-type>
   <mime-type type="text/x-ksysv-log">
+    <sub-class-of type="text/plain"/>
     <magic priority="50">
       <match type="string" value="KDE System V Init Editor" offset="0"/>
     </magic>
   </mime-type>
   <mime-type type="text/x-literate-haskell">
+    <sub-class-of type="text/plain"/>
     <_comment>Literate haskell source code</_comment>
     <glob pattern="*.lhs"/>
   </mime-type>
   <mime-type type="text/x-log">
+    <sub-class-of type="text/plain"/>
     <_comment>application log</_comment>
     <glob pattern="*.log"/>
   </mime-type>
   <mime-type type="text/x-makefile">
+    <sub-class-of type="text/plain"/>
     <_comment>Makefile</_comment>
     <glob pattern="makefile*"/>
     <glob pattern="[Mm]akefile"/>
   </mime-type>
   <mime-type type="text/x-moc">
+    <sub-class-of type="text/plain"/>
     <_comment>Qt Meta Object file</_comment>
     <glob pattern="*.moc"/>
   </mime-type>
   <mime-type type="text/x-objcsrc">
+    <sub-class-of type="text/plain"/>
     <_comment>Objective-C source code</_comment>
     <glob pattern="*.m"/>
   </mime-type>
   <mime-type type="text/x-pascal">
+    <sub-class-of type="text/plain"/>
     <_comment>Pascal source code</_comment>
     <glob pattern="*.p"/>
     <glob pattern="*.pas"/>
   </mime-type>
   <mime-type type="text/x-patch">
+    <sub-class-of type="text/plain"/>
     <_comment>differences between files</_comment>
     <magic priority="50">
       <match type="string" value="diff\t" offset="0"/>
@@ -2213,14 +2246,17 @@ command to generate the output files.
     <glob pattern="*.patch"/>
   </mime-type>
   <mime-type type="text/x-readme">
+    <sub-class-of type="text/plain"/>
     <_comment>README document</_comment>
     <glob pattern="README*"/>
   </mime-type>
   <mime-type type="text/x-scheme">
+    <sub-class-of type="text/plain"/>
     <_comment>Scheme source code</_comment>
     <glob pattern="*.scm"/>
   </mime-type>
   <mime-type type="text/x-setext">
+    <sub-class-of type="text/plain"/>
     <_comment>Setext document</_comment>
     <glob pattern="*.etx"/>
   </mime-type>
@@ -2228,15 +2264,18 @@ command to generate the output files.
     <_comment>Speech document</_comment>
   </mime-type>
   <mime-type type="text/x-sql">
+    <sub-class-of type="text/plain"/>
     <_comment>SQL code</_comment>
     <glob pattern="*.sql"/>
   </mime-type>
   <mime-type type="text/x-tcl">
+    <sub-class-of type="text/plain"/>
     <_comment>Tcl script</_comment>
     <glob pattern="*.tcl"/>
     <glob pattern="*.tk"/>
   </mime-type>
   <mime-type type="text/x-tex">
+    <sub-class-of type="text/plain"/>
     <_comment>TeX document</_comment>
     <glob pattern="*.tex"/>
     <glob pattern="*.ltx"/>
@@ -2244,6 +2283,7 @@ command to generate the output files.
     <glob pattern="*.cls"/>
   </mime-type>
   <mime-type type="text/x-texinfo">
+    <sub-class-of type="text/plain"/>
     <_comment>TeXInfo document</_comment>
     <glob pattern="*.texi"/>
     <glob pattern="*.texinfo"/>
@@ -2298,6 +2338,7 @@ command to generate the output files.
     <glob pattern="*.xslfo"/>
   </mime-type>
   <mime-type type="text/x-xslt">
+    <sub-class-of type="text/plain"/>
     <_comment>XSLT stylesheet</_comment>
     <glob pattern="*.xslt"/>
     <glob pattern="*.xsl"/>
@@ -2308,6 +2349,7 @@ command to generate the output files.
     </magic>
   </mime-type>
   <mime-type type="text/xml">
+    <sub-class-of type="text/plain"/>
     <_comment>eXtensible Markup Language document</_comment>
     <magic priority="50">
       <match type="string" value="&lt;?xml" offset="0"/>