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:05:21 -0000
@@ -461,7 +461,15 @@ command to generate the output files.
     <glob pattern="*.cpio.gz"/>
   </mime-type>
   <mime-type type="application/x-csh">
+    <sub-class-of type="application/x-shellscript"/>
     <_comment>C shell script</_comment>
+    <magic>
+      <match type="string" value="/bin/tcsh" offset="1:16"/>
+      <match type="string" value="/bin/csh" offset="1:16"/>
+      <match type="string" value="#!/usr/bin/env csh" offset="0"/>
+      <match type="string" value="#!/usr/bin/env tcsh" offset="0"/>
+    </magic>
+    <glob pattern="*.csh"/>
   </mime-type>
   <mime-type type="application/x-dbase">
     <_comment>dBASE document</_comment>
@@ -755,6 +763,8 @@ command to generate the output files.
     <glob pattern="*.class"/>
   </mime-type>
   <mime-type type="application/x-javascript">
+    <sub-class-of type='application/x-executable'/>
+    <sub-class-of type='text/plain'/>
     <_comment>Javascript program</_comment>
     <glob pattern="*.js"/>
   </mime-type>
@@ -1102,6 +1112,8 @@ command to generate the output files.
     </magic>
   </mime-type>
   <mime-type type="application/x-perl">
+    <sub-class-of type='application/x-executable'/>
+    <sub-class-of type='text/plain'/>
     <_comment>Perl script</_comment>
     <magic priority="50">
       <match type="string" value='eval \"exec /usr/local/bin/perl' offset="0"/>
@@ -1136,6 +1148,8 @@ command to generate the output files.
     <glob pattern="*.pw"/>
   </mime-type>
   <mime-type type="application/x-python">
+    <sub-class-of type='application/x-executable'/>
+    <sub-class-of type='text/plain'/>
     <_comment>Python script</_comment>
     <magic priority="50">
       <match type="string" value="#!/bin/python" offset="0"/>
@@ -1188,6 +1202,8 @@ command to generate the output files.
     <glob pattern="*.rpm"/>
   </mime-type>
   <mime-type type="application/x-ruby">
+    <sub-class-of type='application/x-executable'/>
+    <sub-class-of type='text/plain'/>
     <_comment>Ruby script</_comment>
     <magic>
       <match type="string" value="/bin/env ruby" offset="1:16"/>
@@ -1227,27 +1243,22 @@ command to generate the output files.
     <glob pattern="*.so"/>
   </mime-type>
   <mime-type type="application/x-shellscript">
+    <sub-class-of type='application/x-executable'/>
+    <sub-class-of type='text/plain'/>
     <_comment>shell script</_comment>
     <magic priority="50">
-      <match type="string" value="#!/bin/ksh" offset="0"/>
-      <match type="string" value="#!/usr/local/bin/ash" offset="0"/>
-      <match type="string" value="#!/usr/local/tcsh" offset="0"/>
       <match type="string" value="# This is a shell archive" offset="10"/>
       <match type="string" value="/bin/bash" offset="1:16"/>
       <match type="string" value="/bin/nawk" offset="1:16"/>
-      <match type="string" value="/bin/tcsh" offset="1:16"/>
-      <match type="string" value="/bin/csh" offset="1:16"/>
       <match type="string" value="/bin/zsh" offset="1:16"/>
       <match type="string" value="/bin/sh" offset="1:16"/>
+      <match type="string" value="/bin/ksh" offset="1:16"/>
       <match type="string" value="#!/usr/bin/env sh" offset="0"/>
       <match type="string" value="#!/usr/bin/env bash" offset="0"/>
-      <match type="string" value="#!/usr/bin/env csh" offset="0"/>
-      <match type="string" value="#!/usr/bin/env tcsh" offset="0"/>
       <match type="string" value="#!/usr/bin/env zsh" offset="0"/>
-
+      <match type="string" value="#!/usr/bin/env ksh" offset="0"/>
     </magic>
     <glob pattern="*.sh"/>
-    <glob pattern="*.csh"/>
   </mime-type>
   <mime-type type="application/x-shockwave-flash">
     <_comment>Shockwave Flash file</_comment>
@@ -2160,12 +2171,6 @@ command to generate the output files.
     <_comment>Java source code</_comment>
     <glob pattern="*.java"/>
   </mime-type>
-  <mime-type type="text/x-ksh">
-    <_comment>Korn shell script</_comment>
-    <magic priority="50">
-      <match type="string" value="/bin/ksh" offset="1:16"/>
-    </magic>
-  </mime-type>
   <mime-type type="text/x-ksysv-log">
     <magic priority="50">
       <match type="string" value="KDE System V Init Editor" offset="0"/>