From: "Zeeshan Ali (Khattak)" <zeeshanak@xxxxxxxxx> Also specify proper names of the vendors. --- data/oses/fedora.xml | 48 ++++++++++++++++++++++++------------------------ data/oses/ubuntu.xml | 32 ++++++++++++++++---------------- data/oses/windows.xml | 44 ++++++++++++++++++++++---------------------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/data/oses/fedora.xml b/data/oses/fedora.xml index b60a55b..528cbdf 100644 --- a/data/oses/fedora.xml +++ b/data/oses/fedora.xml @@ -2,9 +2,9 @@ <os id="http://fedoraproject.org/fedora/5";> <short-id>fedora5</short-id> - <name>Fedora 5</name> + <name>Fedora™ 5</name> <version>5</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <devices> @@ -15,9 +15,9 @@ <os id="http://fedoraproject.org/fedora/6";> <short-id>fedora6</short-id> - <name>Fedora 6</name> + <name>Fedora™ 6</name> <version>6</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/5"/> <derives-from id="http://fedoraproject.org/fedora/5"/> @@ -25,9 +25,9 @@ <os id="http://fedoraproject.org/fedora/7";> <short-id>fedora7</short-id> - <name>Fedora 7</name> + <name>Fedora™ 7</name> <version>7</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/6"/> <derives-from id="http://fedoraproject.org/fedora/6"/> @@ -35,9 +35,9 @@ <os id="http://fedoraproject.org/fedora/8";> <short-id>fedora8</short-id> - <name>Fedora 8</name> + <name>Fedora™ 8</name> <version>8</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/7"/> <derives-from id="http://fedoraproject.org/fedora/7"/> @@ -45,9 +45,9 @@ <os id="http://fedoraproject.org/fedora/9";> <short-id>fedora9</short-id> - <name>Fedora 9</name> + <name>Fedora™ 9</name> <version>9</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/8"/> <derives-from id="http://fedoraproject.org/fedora/8"/> @@ -63,9 +63,9 @@ <os id="http://fedoraproject.org/fedora/10";> <short-id>fedora10</short-id> - <name>Fedora 10</name> + <name>Fedora™ 10</name> <version>10</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/9"/> <derives-from id="http://fedoraproject.org/fedora/9"/> @@ -77,9 +77,9 @@ <os id="http://fedoraproject.org/fedora/11";> <short-id>fedora11</short-id> - <name>Fedora 11</name> + <name>Fedora™ 11</name> <version>11</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/10"/> <derives-from id="http://fedoraproject.org/fedora/10"/> @@ -91,9 +91,9 @@ <os id="http://fedoraproject.org/fedora/12";> <short-id>fedora12</short-id> - <name>Fedora 12</name> + <name>Fedora™ 12</name> <version>12</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/11"/> <derives-from id="http://fedoraproject.org/fedora/11"/> @@ -120,9 +120,9 @@ <os id="http://fedoraproject.org/fedora/13";> <short-id>fedora13</short-id> - <name>Fedora 13</name> + <name>Fedora™ 13</name> <version>13</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/12"/> <derives-from id="http://fedoraproject.org/fedora/12"/> @@ -149,9 +149,9 @@ <os id="http://fedoraproject.org/fedora/14";> <short-id>fedora14</short-id> - <name>Fedora 14</name> + <name>Fedora™ 14</name> <version>14</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/13"/> <derives-from id="http://fedoraproject.org/fedora/13"/> @@ -211,9 +211,9 @@ <os id="http://fedoraproject.org/fedora/15";> <short-id>fedora15</short-id> - <name>Fedora 15</name> + <name>Fedora™ 15</name> <version>15</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/14"/> <derives-from id="http://fedoraproject.org/fedora/14"/> @@ -273,9 +273,9 @@ <os id="http://fedoraproject.org/fedora/16";> <short-id>fedora16</short-id> - <name>Fedora 16</name> + <name>Fedora™ 16</name> <version>16</version> - <vendor>Fedora Project</vendor> + <vendor>Fedora™ Project</vendor> <family>Linux</family> <upgrades id="http://fedoraproject.org/fedora/15"/> <derives-from id="http://fedoraproject.org/fedora/15"/> diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml index 9f72bb7..03c251e 100644 --- a/data/oses/ubuntu.xml +++ b/data/oses/ubuntu.xml @@ -2,9 +2,9 @@ <os id="http://ubuntu.com/hardy";> <short-id>ubuntuhardy</short-id> - <name>Ubuntu Hardy Heron</name> + <name>Ubuntu® Hardy Heron</name> <version>8.04</version> - <vendor>Canonical</vendor> + <vendor>Canonical® Ltd</vendor> <family>Linux</family> <devices> @@ -14,9 +14,9 @@ <os id="http://ubuntu.com/intrepid";> <short-id>ubuntuintrepid</short-id> - <name>Ubuntu Intrepid Ibex</name> + <name>Ubuntu® Intrepid Ibex</name> <version>8.10</version> - <vendor>Canonical</vendor> + <vendor>Canonical® Ltd</vendor> <family>Linux</family> <upgrades id="http://ubuntu.com/hardy"/> <derives-from id="http://ubuntu.com/hardy"/> @@ -24,9 +24,9 @@ <os id="http://ubuntu.com/jaunty";> <short-id>ubuntujaunty</short-id> - <name>Ubuntu Jaunty Jackalope</name> + <name>Ubuntu® Jaunty Jackalope</name> <version>9.04</version> - <vendor>Canonical</vendor> + <vendor>Canonical® Ltd</vendor> <family>Linux</family> <upgrades id="http://ubuntu.com/intrepid"/> <derives-from id="http://ubuntu.com/intrepid"/> @@ -38,9 +38,9 @@ <os id="http://ubuntu.com/karmic";> <short-id>ubuntukarmic</short-id> - <name>Ubuntu Karmic Koala</name> + <name>Ubuntu® Karmic Koala</name> <version>9.10</version> - <vendor>Canonical</vendor> + <vendor>Canonical® Ltd</vendor> <family>Linux</family> <upgrades id="http://ubuntu.com/jaunty"/> <derives-from id="http://ubuntu.com/jaunty"/> @@ -48,9 +48,9 @@ <os id="http://ubuntu.com/lucid";> <short-id>ubuntulucid</short-id> - <name>Ubuntu Lucid Lynx</name> + <name>Ubuntu® Lucid Lynx</name> <version>10.04</version> - <vendor>Canonical</vendor> + <vendor>Canonical® Ltd</vendor> <family>Linux</family> <upgrades id="http://ubuntu.com/karmic"/> <derives-from id="http://ubuntu.com/karmic"/> @@ -91,9 +91,9 @@ <os id="http://ubuntu.com/maverick";> <short-id>ubuntumaverick</short-id> - <name>Ubuntu Maverick Meerkat</name> + <name>Ubuntu® Maverick Meerkat</name> <version>10.10</version> - <vendor>Canonical</vendor> + <vendor>Canonical® Ltd</vendor> <family>Linux</family> <upgrades id="http://ubuntu.com/lucid"/> <derives-from id="http://ubuntu.com/lucid"/> @@ -134,9 +134,9 @@ <os id="http://ubuntu.com/natty";> <short-id>ubuntunatty</short-id> - <name>Ubuntu Natty Narwhal</name> + <name>Ubuntu® Natty Narwhal</name> <version>11.04</version> - <vendor>Canonical</vendor> + <vendor>Canonical® Ltd</vendor> <family>Linux</family> <upgrades id="http://ubuntu.com/maverick"/> <derives-from id="http://ubuntu.com/maverick"/> @@ -177,9 +177,9 @@ <os id="http://ubuntu.com/oneiric";> <short-id>ubuntuoneiric</short-id> - <name>Ubuntu Oneiric Ocelot</name> + <name>Ubuntu® Oneiric Ocelot</name> <version>11.10</version> - <vendor>Canonical</vendor> + <vendor>Canonical® Ltd</vendor> <family>Linux</family> <upgrades id="http://ubuntu.com/natty"/> <derives-from id="http://ubuntu.com/natty"/> diff --git a/data/oses/windows.xml b/data/oses/windows.xml index af7ab3b..ffde146 100644 --- a/data/oses/windows.xml +++ b/data/oses/windows.xml @@ -2,8 +2,8 @@ <os id="http://microsoft.com/windows";> <short-id>windows</short-id> - <name>Microsoft Windows</name> - <vendor>Microsoft</vendor> + <name>Microsoft® Windows</name> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <devices> @@ -16,9 +16,9 @@ <os id="http://microsoft.com/win95";> <short-id>win95</short-id> - <name>Microsoft Windows 95</name> + <name>Microsoft® Windows 95</name> <version>4.0</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> @@ -33,9 +33,9 @@ <os id="http://microsoft.com/win98";> <short-id>win98</short-id> - <name>Microsoft Windows 98</name> + <name>Microsoft® Windows 98</name> <version>4.1</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win95"/> @@ -56,9 +56,9 @@ <os id="http://microsoft.com/winme";> <short-id>winme</short-id> - <name>Microsoft Windows Millennium Edition</name> + <name>Microsoft® Windows Millennium Edition</name> <version>4.9</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win98"/> @@ -80,9 +80,9 @@ <os id="http://microsoft.com/win2k";> <short-id>win2k</short-id> - <name>Microsoft Windows 2000</name> + <name>Microsoft® Windows 2000</name> <version>5.0</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> @@ -105,9 +105,9 @@ <os id="http://microsoft.com/winxp";> <short-id>winxp</short-id> - <name>Microsoft Windows XP</name> + <name>Microsoft® Windows XP</name> <version>5.1</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win2k"/> @@ -137,9 +137,9 @@ <os id="http://microsoft.com/winxp64";> <short-id>winxp64</short-id> - <name>Microsoft Windows XP (x86_64)</name> + <name>Microsoft® Windows XP (x86_64)</name> <version>5.2</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> @@ -155,9 +155,9 @@ <os id="http://microsoft.com/win2k3";> <short-id>win2k3</short-id> - <name>Microsoft Windows Server 2003</name> + <name>Microsoft® Windows Server 2003</name> <version>5.2</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> @@ -199,9 +199,9 @@ <os id="http://microsoft.com/win2k8";> <short-id>win2k8</short-id> - <name>Microsoft Windows Server 2008</name> + <name>Microsoft® Windows Server 2008</name> <version>6.0</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win2k3"/> @@ -246,9 +246,9 @@ <os id="http://microsoft.com/vista";> <short-id>vista</short-id> - <name>Microsoft Windows Vista</name> + <name>Microsoft® Windows Vista</name> <version>6.0</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/winxp"/> @@ -270,9 +270,9 @@ <os id="http://microsoft.com/win7";> <short-id>win7</short-id> - <name>Microsoft Windows 7</name> + <name>Microsoft® Windows 7</name> <version>6.1</version> - <vendor>Microsoft</vendor> + <vendor>Microsoft® Corporation</vendor> <family>Windows</family> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/vista"/> -- 1.7.7.6
