From 156a59b958098ec46f9152787805daab19add3fa Mon Sep 17 00:00:00 2001
From: Celeste de Guzman <celested@microsoft.com>
Date: Thu, 3 Aug 2017 16:46:56 -0700
Subject: [PATCH 1/3] added the device manufacturer site in two formats for
 testing

---
 education/windows/test-windows10s-for-edu.md | 44 +++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md
index 70c9420c31..1db3d3319a 100644
--- a/education/windows/test-windows10s-for-edu.md
+++ b/education/windows/test-windows10s-for-edu.md
@@ -77,8 +77,50 @@ Make sure all drivers are installed and working properly on your device running
 
 Check with your device manufacturer before trying Windows 10 S on your device to see if the drivers are available and supported by the device manufacturer. 
 
+> [!div class="op_single_selector" title1="Device manufacturer"]
+> - [Acer](https://www.acer.com/ac/en/US/content/windows10s-compatible-list)
+> - [American Future Tech](https://www.ibuypower.com/Support/Support)
+> - [Asus](https://www.asus.com/event/2017/win10S/)
+> - [Atec](http://www.atec.kr/contents/ms_info.html)
+> - [Axdia](https://www.odys.de/web/web_lan_en_hmp_1_win10s_ja.html)
+> - [Casper](http://www.casper.com.tr/window10sdestegi)
+> - [Cyberpower](https://www.cyberpowerpc.com/support/)
+> - [Daewoo](http://www.lucoms.com/v2/cs/cs_windows10.asp)
+> - [Fujitsu](http://support.ts.fujitsu.com/IndexProdSupport.asp?OpenTab=win10_update)
+> - [Global K](http://compaq.com.br/sistemas-compativeis-com-windows-10-s.html)
+> - [HP](https://support.hp.com/us-en/document/c05588871)
+> - [LANIT Trading](http://irbis-digital.ru/support/podderzhka-windows-10-s/)
+> - [Lenovo](https://support.lenovo.com/us/en/solutions/ht504589)
+> - [LG](http://www.lg.com/us/content/html/hq/windows10update/Win10S_UpdateInfo.html)
+> - [MCJ](https://www2.mouse-jp.co.jp/ssl/user_support2/info.asp?N_ID=361)
+> - [Micro P/Exertis](http://support.linxtablets.com/WindowsSupport/Articles/Windows_10_S_Supported_Devices.aspx)
+> - [MSI](https://www.msi.com/Landing/Win10S)
+> - [Panasonic](https://panasonic.net/cns/pc/Windows10S/)
+> - [Positivo SA](http://www.positivoinformatica.com.br/atualizacao-windows-10)
+> - [Positivo da Bahia](http://www.br.vaio.com/atualizacao-windows-10/)
+> - [Samsung](http://www.samsung.com/us/support/windows10s/)
+> - [Toshiba](http://win10upgrade.toshiba.com/win10s/information?region=TAIS&country=US&lang=en)
+> - [Trekstor](http://www.trekstor.de/windows-10-s-en.html)
+> - [Trigem](http://www.trigem.co.kr/windows/win10S.html)
+> - [Vaio](http://us.vaio.com/support/knowledge-base/windows-10-s-compatibility-information/)
+> - [Wortmann](https://www.wortmann.de/en-gb/content/+windows-10-s-supportinformation/windows-10-s-supportinformation.aspx)
+
+
+|   |   |   |
+| - | - | - |
+| [Acer](https://www.acer.com/ac/en/US/content/windows10s-compatible-list) | [American Future Tech](https://www.ibuypower.com/Support/Support) | [Asus](https://www.asus.com/event/2017/win10S/) |
+| [Atec](http://www.atec.kr/contents/ms_info.html) | [Axdia](https://www.odys.de/web/web_lan_en_hmp_1_win10s_ja.html) | [Casper](http://www.casper.com.tr/window10sdestegi) |
+| [Cyberpower](https://www.cyberpowerpc.com/support/) | [Daewoo](http://www.lucoms.com/v2/cs/cs_windows10.asp) | [Fujitsu](http://support.ts.fujitsu.com/IndexProdSupport.asp?OpenTab=win10_update) |
+| [Global K](http://compaq.com.br/sistemas-compativeis-com-windows-10-s.html) | [HP](https://support.hp.com/us-en/document/c05588871) | [LANIT Trading](http://irbis-digital.ru/support/podderzhka-windows-10-s/) |
+| [Lenovo](https://support.lenovo.com/us/en/solutions/ht504589) | [LG](http://www.lg.com/us/content/html/hq/windows10update/Win10S_UpdateInfo.html) | [MCJ](https://www2.mouse-jp.co.jp/ssl/user_support2/info.asp?N_ID=361) |
+| [Micro P/Exertis](http://support.linxtablets.com/WindowsSupport/Articles/Windows_10_S_Supported_Devices.aspx) | [MSI](https://www.msi.com/Landing/Win10S) | [Panasonic](https://panasonic.net/cns/pc/Windows10S/) |
+| [Positivo SA](http://www.positivoinformatica.com.br/atualizacao-windows-10) | [Positivo da Bahia](http://www.br.vaio.com/atualizacao-windows-10/) | [Samsung](http://www.samsung.com/us/support/windows10s/) |
+| [Toshiba](http://win10upgrade.toshiba.com/win10s/information?region=TAIS&country=US&lang=en) | [Trekstor](http://www.trekstor.de/windows-10-s-en.html) | [Trigem](http://www.trigem.co.kr/windows/win10S.html) |
+| [Vaio](http://us.vaio.com/support/knowledge-base/windows-10-s-compatibility-information/) | [Wortmann](https://www.wortmann.de/en-gb/content/+windows-10-s-supportinformation/windows-10-s-supportinformation.aspx) |  |
+
+
 > [!NOTE]
-> We'll update this section with more information so check back again soon.
+> If you don't see any device listed on the manufacturer's web site, check back again later as more devices get added in future.
 
 <!--
 * [Microsoft](https://www.microsoft.com/surface/en-us/support/windows-and-office/surface-devices-that-work-with-windows-10-s)

From 2d932f4e154a978dbd4b9bf4fb5a8fa55c358419 Mon Sep 17 00:00:00 2001
From: Celeste de Guzman <celested@microsoft.com>
Date: Thu, 3 Aug 2017 16:49:51 -0700
Subject: [PATCH 2/3] added Microsoft to the list of device manufacturers

---
 education/windows/test-windows10s-for-edu.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md
index 1db3d3319a..23cecbe424 100644
--- a/education/windows/test-windows10s-for-edu.md
+++ b/education/windows/test-windows10s-for-edu.md
@@ -94,6 +94,7 @@ Check with your device manufacturer before trying Windows 10 S on your device to
 > - [LG](http://www.lg.com/us/content/html/hq/windows10update/Win10S_UpdateInfo.html)
 > - [MCJ](https://www2.mouse-jp.co.jp/ssl/user_support2/info.asp?N_ID=361)
 > - [Micro P/Exertis](http://support.linxtablets.com/WindowsSupport/Articles/Windows_10_S_Supported_Devices.aspx)
+> - [Microsoft](https://www.microsoft.com/surface/en-us/support/windows-and-office/surface-devices-that-work-with-windows-10-s)
 > - [MSI](https://www.msi.com/Landing/Win10S)
 > - [Panasonic](https://panasonic.net/cns/pc/Windows10S/)
 > - [Positivo SA](http://www.positivoinformatica.com.br/atualizacao-windows-10)
@@ -113,10 +114,10 @@ Check with your device manufacturer before trying Windows 10 S on your device to
 | [Cyberpower](https://www.cyberpowerpc.com/support/) | [Daewoo](http://www.lucoms.com/v2/cs/cs_windows10.asp) | [Fujitsu](http://support.ts.fujitsu.com/IndexProdSupport.asp?OpenTab=win10_update) |
 | [Global K](http://compaq.com.br/sistemas-compativeis-com-windows-10-s.html) | [HP](https://support.hp.com/us-en/document/c05588871) | [LANIT Trading](http://irbis-digital.ru/support/podderzhka-windows-10-s/) |
 | [Lenovo](https://support.lenovo.com/us/en/solutions/ht504589) | [LG](http://www.lg.com/us/content/html/hq/windows10update/Win10S_UpdateInfo.html) | [MCJ](https://www2.mouse-jp.co.jp/ssl/user_support2/info.asp?N_ID=361) |
-| [Micro P/Exertis](http://support.linxtablets.com/WindowsSupport/Articles/Windows_10_S_Supported_Devices.aspx) | [MSI](https://www.msi.com/Landing/Win10S) | [Panasonic](https://panasonic.net/cns/pc/Windows10S/) |
-| [Positivo SA](http://www.positivoinformatica.com.br/atualizacao-windows-10) | [Positivo da Bahia](http://www.br.vaio.com/atualizacao-windows-10/) | [Samsung](http://www.samsung.com/us/support/windows10s/) |
-| [Toshiba](http://win10upgrade.toshiba.com/win10s/information?region=TAIS&country=US&lang=en) | [Trekstor](http://www.trekstor.de/windows-10-s-en.html) | [Trigem](http://www.trigem.co.kr/windows/win10S.html) |
-| [Vaio](http://us.vaio.com/support/knowledge-base/windows-10-s-compatibility-information/) | [Wortmann](https://www.wortmann.de/en-gb/content/+windows-10-s-supportinformation/windows-10-s-supportinformation.aspx) |  |
+| [Micro P/Exertis](http://support.linxtablets.com/WindowsSupport/Articles/Windows_10_S_Supported_Devices.aspx) | [Microsoft](https://www.microsoft.com/surface/en-us/support/windows-and-office/surface-devices-that-work-with-windows-10-s) | [MSI](https://www.msi.com/Landing/Win10S) |
+| [Panasonic](https://panasonic.net/cns/pc/Windows10S/) | [Positivo SA](http://www.positivoinformatica.com.br/atualizacao-windows-10) | [Positivo da Bahia](http://www.br.vaio.com/atualizacao-windows-10/) |
+| [Samsung](http://www.samsung.com/us/support/windows10s/) | [Toshiba](http://win10upgrade.toshiba.com/win10s/information?region=TAIS&country=US&lang=en) | [Trekstor](http://www.trekstor.de/windows-10-s-en.html) |
+| [Trigem](http://www.trigem.co.kr/windows/win10S.html) | [Vaio](http://us.vaio.com/support/knowledge-base/windows-10-s-compatibility-information/) | [Wortmann](https://www.wortmann.de/en-gb/content/+windows-10-s-supportinformation/windows-10-s-supportinformation.aspx) |
 
 
 > [!NOTE]

From 19c678d75dd90a64f48074f5d41cb424ccbacb4a Mon Sep 17 00:00:00 2001
From: Celeste de Guzman <celested@microsoft.com>
Date: Fri, 4 Aug 2017 14:59:29 -0700
Subject: [PATCH 3/3] updated the M365B FAQ and removed the pulldown menu in
 favor of table for the try Win10S offer

---
 bcs/support/microsoft-365-business-faqs.md   |  2 +-
 education/windows/test-windows10s-for-edu.md | 30 --------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/bcs/support/microsoft-365-business-faqs.md b/bcs/support/microsoft-365-business-faqs.md
index 7f9d9778a9..ee6c45006b 100644
--- a/bcs/support/microsoft-365-business-faqs.md
+++ b/bcs/support/microsoft-365-business-faqs.md
@@ -186,7 +186,7 @@ No, Microsoft will not charge for the preview. If you work with an outside [IT p
 
 I’m an existing Office 365 customer. Will I be charged for an Office 365 subscription while I am using the Microsoft 365 Business preview?
 
-Customers will continue to be charged for any active Office 365 plan to which they are subscribed.
+The Microsoft 365 Business preview is free and does not require an existing Office 365 Business Premium subscription. Current Office 365 customers will continue to be billed for active Office 365 subscriptions that are not associated with the Microsoft 365 Business preview.
 
 What is the best way to deploy Microsoft 365 Business in my organization? 
 --------------------------------------------------------------------------
diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md
index 23cecbe424..b2d7a6aa5a 100644
--- a/education/windows/test-windows10s-for-edu.md
+++ b/education/windows/test-windows10s-for-edu.md
@@ -77,36 +77,6 @@ Make sure all drivers are installed and working properly on your device running
 
 Check with your device manufacturer before trying Windows 10 S on your device to see if the drivers are available and supported by the device manufacturer. 
 
-> [!div class="op_single_selector" title1="Device manufacturer"]
-> - [Acer](https://www.acer.com/ac/en/US/content/windows10s-compatible-list)
-> - [American Future Tech](https://www.ibuypower.com/Support/Support)
-> - [Asus](https://www.asus.com/event/2017/win10S/)
-> - [Atec](http://www.atec.kr/contents/ms_info.html)
-> - [Axdia](https://www.odys.de/web/web_lan_en_hmp_1_win10s_ja.html)
-> - [Casper](http://www.casper.com.tr/window10sdestegi)
-> - [Cyberpower](https://www.cyberpowerpc.com/support/)
-> - [Daewoo](http://www.lucoms.com/v2/cs/cs_windows10.asp)
-> - [Fujitsu](http://support.ts.fujitsu.com/IndexProdSupport.asp?OpenTab=win10_update)
-> - [Global K](http://compaq.com.br/sistemas-compativeis-com-windows-10-s.html)
-> - [HP](https://support.hp.com/us-en/document/c05588871)
-> - [LANIT Trading](http://irbis-digital.ru/support/podderzhka-windows-10-s/)
-> - [Lenovo](https://support.lenovo.com/us/en/solutions/ht504589)
-> - [LG](http://www.lg.com/us/content/html/hq/windows10update/Win10S_UpdateInfo.html)
-> - [MCJ](https://www2.mouse-jp.co.jp/ssl/user_support2/info.asp?N_ID=361)
-> - [Micro P/Exertis](http://support.linxtablets.com/WindowsSupport/Articles/Windows_10_S_Supported_Devices.aspx)
-> - [Microsoft](https://www.microsoft.com/surface/en-us/support/windows-and-office/surface-devices-that-work-with-windows-10-s)
-> - [MSI](https://www.msi.com/Landing/Win10S)
-> - [Panasonic](https://panasonic.net/cns/pc/Windows10S/)
-> - [Positivo SA](http://www.positivoinformatica.com.br/atualizacao-windows-10)
-> - [Positivo da Bahia](http://www.br.vaio.com/atualizacao-windows-10/)
-> - [Samsung](http://www.samsung.com/us/support/windows10s/)
-> - [Toshiba](http://win10upgrade.toshiba.com/win10s/information?region=TAIS&country=US&lang=en)
-> - [Trekstor](http://www.trekstor.de/windows-10-s-en.html)
-> - [Trigem](http://www.trigem.co.kr/windows/win10S.html)
-> - [Vaio](http://us.vaio.com/support/knowledge-base/windows-10-s-compatibility-information/)
-> - [Wortmann](https://www.wortmann.de/en-gb/content/+windows-10-s-supportinformation/windows-10-s-supportinformation.aspx)
-
-
 |   |   |   |
 | - | - | - |
 | [Acer](https://www.acer.com/ac/en/US/content/windows10s-compatible-list) | [American Future Tech](https://www.ibuypower.com/Support/Support) | [Asus](https://www.asus.com/event/2017/win10S/) |