← Older revision
Revision as of 20:08, June 13, 2015
Line 3:
Line 3:
|body=
|body=
'''Windows'''<br>
'''Windows'''<br>
−
[[Windows]] {{!}} [[Windows RT]] {{!}} [[Windows Store]] {{!}} [[Windows Phone]] {{!}} [[Windows Phone Store]] {{!}} [[Windows Server]]
+
[[Windows]] ([[Windows Store|Store]]) {{!}} [[Windows Phone]] ([[Windows Phone Store|Store)]] {{!}} [[Windows Server]] {{!}} [[Windows Embedded]]
----
----
−
'''Windows Embedded'''<br>
+
'''Apps, Software and Web Services'''<br>
−
[[Windows Embedded Automotive|Automotive]] {{!}} [[Windows Embedded Compact|Compact]] {{!}} [[Windows Embedded Industry|Industry]] {{!}} [[Windows Embedded Handheld|Handheld]]
+
[[Bing]] {{!}} [[Microsoft Edge]] {{!}} [[GroupMe]] {{!}} [[Internet Explorer]] {{!}} [[MSN]] {{!}} [[Microsoft Office|Office]] ([[Office 365|365]]) {{!}} [[Microsoft OneDrive|OneDrive]] {{!}} [[Outlook.com]] {{!}} [[Skype]] {{!}} [[So.cl]] {{!}} [[Xbox Music]] {{!}} [[Xbox Video]] {{!}} [[Yammer]]
----
----
−
'''Software'''<br>
+
'''Business'''<br>
−
[[Internet Explorer]] {{!}} [[Microsoft Money]] {{!}} [[Microsoft Office]] {{!}} [[Windows Essentials]] {{!}} [[Windows Media Player]] {{!}} [[Paint]] {{!}} [[Movie Maker]] {{!}} [[Microsoft Edge]] {{!}} [[WordPad]]
+
[[Microsoft Advertising]] {{!}} [[Microsoft Azure]] {{!}} [[Microsoft Cloud]] {{!}} [[Microsoft SQL Server]]
−
----
−
'''Server'''<br>
−
[[Microsoft SQL Server]] {{!}} [[Microsoft Lync Server]]
----
----
'''Development'''<br>
'''Development'''<br>
−
[[.NET Framework]] {{!}} [[Microsoft Silverlight]] {{!}} [[Microsoft Developer Network]] {{!}} [[Microsoft Expression Studio]] {{!}} [[Microsoft Visual Studio]] {{!}} [[Channel 9 (website)|Channel 9]] {{!}} [[CodePlex]] {{!}} [[Microsoft Advertising]]
+
[[.NET Framework]] {{!}} [[Microsoft Silverlight]] {{!}} [[Microsoft Developer Network]] {{!}} [[Microsoft Expression Studio]] {{!}} [[Microsoft Visual Studio]] {{!}} [[Channel 9 (website)|Channel 9]] {{!}} [[CodePlex]]
−
----
−
'''Web Services'''<br>
−
[[Bing]] {{!}} [[Calendar (Microsoft service)|Calendar]] {{!}} [[GroupMe]] {{!}} [[HealthVault]] {{!}} [[Office 365]] {{!}} [[Microsoft OneDrive|OneDrive]] {{!}} [[Outlook.com]] {{!}} [[Skype]] {{!}} [[Yammer]]
−
----
−
'''[[MSN]]'''<br>
−
[[MSN Finance|Finance]] {{!}} [[MSN Food & Drink|Food & Drink]] {{!}} [[MSN Health & Fitness|Health & Fitness]] {{!}} [[MSN News|News]] {{!}} [[MSN Sports|Sports]] {{!}} [[MSN Travel|Travel]] {{!}} [[MSN Weather|Weather]]
----
----
'''Gaming'''<br>
'''Gaming'''<br>
−
[[DirectX]] {{!}} [[Microsoft Studios]] <small>([[Microsoft Studios/Other|Others]])</small> {{!}} [[Microsoft XNA]] {{!}} [[Xbox]] ([[Xbox (console)]] {{!}} [[Xbox 360]] {{!}} [[Xbox One]]) {{!}} [[Xbox Music]] {{!}} [[Xbox Video]] {{!}} [[Xbox Live]] {{!}} [[Kinect]] {{!}} [[Mojang]] ([[Minecraft]])
+
[[DirectX]] {{!}} [[Microsoft Studios]] <small>([[Microsoft Studios/Other|Others]])</small> {{!}} [[Xbox]] ([[Xbox (console)]] {{!}} [[Xbox 360]] {{!}} [[Xbox One]]) {{!}} [[Xbox Live]]
----
----
'''Hardware'''<br>
'''Hardware'''<br>
−
[[Microsoft PixelSense]] {{!}} [[Microsoft Surface]] {{!}} [[Microsoft Band]] {{!}} [[Microsoft HoloLens]]
+
[[Microsoft Band]] {{!}} [[Microsoft HoloLens]] {{!}} [[Microsoft Mobile]] ([[Microsoft Lumia|Lumia]]) {{!}} [[Microsoft PixelSense]] {{!}} [[Microsoft Surface]]
−
----
−
'''Personal computers'''<br>
−
[[MS-DOS]] {{!}} [[MSX]]
−
----
−
'''[[Microsoft Mobile]]'''<br>
−
[[Nokia Asha|Asha]] {{!}} [[Microsoft Lumia|Lumia]] {{!}} [[Nokia X]]
----
----
'''Other'''<br>
'''Other'''<br>
−
[[Microsoft Student Partners]] {{!}} [[Microsoft Store]] {{!}} [[Control Panel]]
+
[[Microsoft Student Partners]] {{!}} [[Microsoft Store]]
----
----
'''Conventions'''<br>
'''Conventions'''<br>