Index: 10-wireless-mice.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-wireless-mice.fdi,v
retrieving revision 1.4
diff -u -r1.4 10-wireless-mice.fdi
--- 10-wireless-mice.fdi	16 Apr 2006 21:43:16 -0000	1.4
+++ 10-wireless-mice.fdi	18 Apr 2006 17:31:36 -0000
@@ -15,7 +15,7 @@
           <merge key="battery.csr.is_dual" type="bool">false</merge>
         </match>
 
-        <!-- Receiver for Coordless Click! -->
+        <!-- Receiver for Cordless Click! -->
         <match key="usb_device.product_id" int="0xc510"> 
           <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
           <merge key="battery.type" type="string">mouse</merge>
@@ -25,7 +25,7 @@
           <merge key="battery.csr.is_dual" type="bool">false</merge>
         </match>
 
-	<!-- Receiver for Coordless Keyboard + Mouse combo -->
+	<!-- Receiver for Cordless Keyboard + Mouse combo -->
         <match key="usb_device.product_id" int="0xc512"> 
           <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
           <merge key="battery.type" type="string">keyboard</merge>
@@ -45,72 +45,6 @@
           <merge key="battery.csr.is_dual" type="bool">false</merge>
         </match>
 
-        <!-- Wheel Mouse Optical -->
-        <match key="usb_device.product_id" int="0xc00e">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">true</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- MouseMan Traveler -->
-        <match key="usb_device.product_id" int="0xc00f">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">true</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- MouseMan Dual Optical -->
-        <match key="usb_device.product_id" int="0xc012">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">true</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- MX300 Optical Mouse -->
-        <match key="usb_device.product_id" int="0xc024">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">true</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- MX500 Optical Mouse -->
-        <match key="usb_device.product_id" int="0xc025">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">true</merge>
-          <merge key="battery.csr.has_sms" type="bool">true</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- iFeel Mouse (silver) -->
-        <match key="usb_device.product_id" int="0xc031">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">true</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
         <!-- Mouse Receiver -->
         <match key="usb_device.product_id" int="0xc501">
           <append key="info.addons" type="strlist">hald-addon-usb-csr</append>