Index: freedesktop.org.xml.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
retrieving revision 1.17
diff -u -r1.17 freedesktop.org.xml.in
--- freedesktop.org.xml.in	9 Jul 2004 11:29:22 -0000	1.17
+++ freedesktop.org.xml.in	9 Jul 2004 11:30:34 -0000
@@ -1379,6 +1379,7 @@
     <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'/>
@@ -1620,6 +1621,7 @@
     <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"/>
@@ -1978,10 +1980,12 @@
     <_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>
@@ -2026,6 +2030,7 @@
     <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>
@@ -2033,10 +2038,12 @@
     <_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>
@@ -2054,6 +2061,7 @@
     <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>
@@ -2062,23 +2070,28 @@
     <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"/>
@@ -2087,32 +2100,39 @@
     <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>
@@ -2121,10 +2141,12 @@
     <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"/>
@@ -2133,27 +2155,33 @@
     <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>
@@ -2164,37 +2192,45 @@
     </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"/>
@@ -2210,14 +2246,17 @@
     <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>
@@ -2225,15 +2264,18 @@
     <_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"/>
@@ -2241,6 +2283,7 @@
     <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"/>
@@ -2295,6 +2338,7 @@
     <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"/>
@@ -2305,6 +2349,7 @@
     </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"/>