From: "Zeeshan Ali (Khattak)" <zeeshanak@xxxxxxxxx> --- data/oses/ubuntu.xml | 16 ++++++++-------- data/oses/windows.xml | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml index a294cda..e7d0cba 100644 --- a/data/oses/ubuntu.xml +++ b/data/oses/ubuntu.xml @@ -535,7 +535,7 @@ <short-id>ubuntuhardy</short-id> <name>Ubuntu Hardy Heron LTS</name> <version>8.04</version> - <vendor>Canonical</vendor> + <vendor>Canonical Ltd</vendor> <family>Linux</family> <upgrades id="http://ubuntu.com/gutsy"/> <derives-from id="http://ubuntu.com/gutsy"/> @@ -608,7 +608,7 @@ <short-id>ubuntuintrepid</short-id> <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"/> @@ -659,7 +659,7 @@ <short-id>ubuntujaunty</short-id> <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"/> @@ -714,7 +714,7 @@ <short-id>ubuntukarmic</short-id> <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"/> @@ -765,7 +765,7 @@ <short-id>ubuntulucid</short-id> <name>Ubuntu Lucid Lynx LTS</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"/> @@ -830,7 +830,7 @@ <short-id>ubuntumaverick</short-id> <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"/> @@ -894,7 +894,7 @@ <short-id>ubuntunatty</short-id> <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"/> @@ -958,7 +958,7 @@ <short-id>ubuntuoneiric</short-id> <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 f6b4cd3..ae6d311 100644 --- a/data/oses/windows.xml +++ b/data/oses/windows.xml @@ -3,7 +3,7 @@ <os id="http://microsoft.com/windows"> <short-id>windows</short-id> <name>Microsoft Windows</name> - <vendor>Microsoft</vendor> + <vendor>Microsoft Corporation</vendor> <family>Windows</family> <devices> @@ -18,7 +18,7 @@ <short-id>win95</short-id> <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"/> @@ -35,7 +35,7 @@ <short-id>win98</short-id> <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"/> @@ -58,7 +58,7 @@ <short-id>winme</short-id> <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"/> @@ -82,7 +82,7 @@ <short-id>win2k</short-id> <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"/> @@ -115,7 +115,7 @@ <short-id>winxp</short-id> <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"/> @@ -162,7 +162,7 @@ <short-id>win2k3</short-id> <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"/> @@ -212,7 +212,7 @@ <short-id>win2k8</short-id> <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"/> @@ -265,7 +265,7 @@ <short-id>vista</short-id> <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"/> @@ -303,7 +303,7 @@ <short-id>win7</short-id> <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