ISO-8859-1 -> UTF-8

26 files changed, 25 insertions, 31 deletions

diff --git a/doc/conf/match-USB-camera.fdi b/doc/conf/match-USB-camera.fdi
index dac0cce9..a3f65081 100644
--- a/doc/conf/match-USB-camera.fdi
+++ b/doc/conf/match-USB-camera.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Example: This device information file matches a Sony digital still 
               camera by matching on the USB vendor and product identifers.  -->
diff --git a/doc/conf/match-USB-mp3-player.fdi b/doc/conf/match-USB-mp3-player.fdi
index 88afef98..5797d73f 100644
--- a/doc/conf/match-USB-mp3-player.fdi
+++ b/doc/conf/match-USB-mp3-player.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Example: This device information file matches an USB Mass Storage based MP3 player 
               by the matching on the USB vendor and product identifiers. -->
diff --git a/doc/conf/match-cardreader.fdi b/doc/conf/match-cardreader.fdi
index 6b88ebff..9ae7b2e8 100644
--- a/doc/conf/match-cardreader.fdi
+++ b/doc/conf/match-cardreader.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Example: This device information file matches a memory card reader with 
               multiple storage ports that can be active at the same time. -->
diff --git a/doc/conf/storage-non-fixed.fdi b/doc/conf/storage-non-fixed.fdi
index 2e7bc899..5c312f75 100644
--- a/doc/conf/storage-non-fixed.fdi
+++ b/doc/conf/storage-non-fixed.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This .fdi files makes sure no fixed storage device gets tagged as
      mountable except if it's a floppy or optical drive -->
diff --git a/doc/conf/storage-policy-examples.fdi b/doc/conf/storage-policy-examples.fdi
index 1f220e6f..cbf482cf 100644
--- a/doc/conf/storage-policy-examples.fdi
+++ b/doc/conf/storage-policy-examples.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
 
diff --git a/doc/conf/storage-skip-all.fdi b/doc/conf/storage-skip-all.fdi
index 5037f5b3..f8b3300e 100644
--- a/doc/conf/storage-skip-all.fdi
+++ b/doc/conf/storage-skip-all.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This .fdi files will tag all storage devices as non mountable -->
 <deviceinfo version="0.2">
diff --git a/doc/spec/hal-spec-examples.xml b/doc/spec/hal-spec-examples.xml
index 7f0e58d0..4849fba5 100644
--- a/doc/spec/hal-spec-examples.xml
+++ b/doc/spec/hal-spec-examples.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <chapter id="examples">
diff --git a/doc/spec/hal-spec-fdi-files.xml b/doc/spec/hal-spec-fdi-files.xml
index f0fc23d7..ba4f1af1 100644
--- a/doc/spec/hal-spec-fdi-files.xml
+++ b/doc/spec/hal-spec-fdi-files.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <chapter id="spec-device-info">
diff --git a/doc/spec/hal-spec-introduction.xml b/doc/spec/hal-spec-introduction.xml
index cce02585..c8f514c3 100644
--- a/doc/spec/hal-spec-introduction.xml
+++ b/doc/spec/hal-spec-introduction.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <chapter id="introduction">
diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 89d3efd9..264d736f 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <chapter id="device-properties">
diff --git a/doc/spec/hal-spec.xml.in b/doc/spec/hal-spec.xml.in
index 3dcf602f..822cc95c 100644
--- a/doc/spec/hal-spec.xml.in
+++ b/doc/spec/hal-spec.xml.in
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVSID: $Id$ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book id="index">
diff --git a/fdi/fdi.dtd b/fdi/fdi.dtd
index bb3e3e18..360d9177 100644
--- a/fdi/fdi.dtd
+++ b/fdi/fdi.dtd
@@ -1,5 +1,4 @@
 <!-- Document Type for FreeDesktop.org Device Information Files -->
-<!-- CVSID: $Id$ -->
 
 <!-- <deviceinfo> is the top-level element of an fdi file. -->
 <!ELEMENT deviceinfo (device*) >
diff --git a/fdi/information/10freedesktop/10-camera-ptp.fdi b/fdi/information/10freedesktop/10-camera-ptp.fdi
index 81e27567..98797252 100644
--- a/fdi/information/10freedesktop/10-camera-ptp.fdi
+++ b/fdi/information/10freedesktop/10-camera-ptp.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
   <device>
diff --git a/fdi/information/10freedesktop/10-cd-dvd-burner.fdi b/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
index 4b09741c..0cb920f3 100644
--- a/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
+++ b/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
 
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 633a7c06..129c352e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
   <device>
diff --git a/fdi/information/10freedesktop/10-usb-pda.fdi b/fdi/information/10freedesktop/10-usb-pda.fdi
index 677ec18b..1133f5e3 100644
--- a/fdi/information/10freedesktop/10-usb-pda.fdi
+++ b/fdi/information/10freedesktop/10-usb-pda.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
 
diff --git a/fdi/information/10freedesktop/10-usb-zip-drives.fdi b/fdi/information/10freedesktop/10-usb-zip-drives.fdi
index c532b3f4..bf2f64c8 100644
--- a/fdi/information/10freedesktop/10-usb-zip-drives.fdi
+++ b/fdi/information/10freedesktop/10-usb-zip-drives.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
   <device>
diff --git a/fdi/information/10freedesktop/10-wireless-mice.fdi b/fdi/information/10freedesktop/10-wireless-mice.fdi
index 6fff1735..4a7f3ed5 100644
--- a/fdi/information/10freedesktop/10-wireless-mice.fdi
+++ b/fdi/information/10freedesktop/10-wireless-mice.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 <deviceinfo version="0.2">
   <device>
     <match key="info.bus" string="usb_device">
diff --git a/fdi/policy/10osvendor/10-keyboard-policy.fdi b/fdi/policy/10osvendor/10-keyboard-policy.fdi
index fd5a2ecc..4bae7c6d 100644
--- a/fdi/policy/10osvendor/10-keyboard-policy.fdi
+++ b/fdi/policy/10osvendor/10-keyboard-policy.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
 
diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index 5030bae2..f59fbdd0 100644
--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
 
diff --git a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
index 3c292fdb..2c2705ab 100644
--- a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
 
diff --git a/fdi/policy/10osvendor/10-toshiba-buttons.fdi b/fdi/policy/10osvendor/10-toshiba-buttons.fdi
index 9ea60353..b2e83d7e 100644
--- a/fdi/policy/10osvendor/10-toshiba-buttons.fdi
+++ b/fdi/policy/10osvendor/10-toshiba-buttons.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
 
diff --git a/fdi/policy/10osvendor/15-storage-luks.fdi b/fdi/policy/10osvendor/15-storage-luks.fdi
index b6e91d66..2746446c 100644
--- a/fdi/policy/10osvendor/15-storage-luks.fdi
+++ b/fdi/policy/10osvendor/15-storage-luks.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
   <device>
diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 0983ecef..f67c7b05 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
   <device>
diff --git a/fdi/preprobe/10osvendor/10-ide-drives.fdi b/fdi/preprobe/10osvendor/10-ide-drives.fdi
index 7cb74ee6..61fa1ff8 100644
--- a/fdi/preprobe/10osvendor/10-ide-drives.fdi
+++ b/fdi/preprobe/10osvendor/10-ide-drives.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 
 <deviceinfo version="0.2">
 
diff --git a/tools/gen-libgphoto-hal-fdi b/tools/gen-libgphoto-hal-fdi
index f932f56b..d26ff889 100755
--- a/tools/gen-libgphoto-hal-fdi
+++ b/tools/gen-libgphoto-hal-fdi
@@ -7,7 +7,7 @@
 # tweaked by David Zeuthen <david@fubar.dk>. 
 
 cat <<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 To get back the original script which generated this file, use:
   cat libgphoto2.fdi | uudecode | gunzip >gen-libgphoto-hal-fdi