From 242b524891140dbe6688a9705be46fbdb5134b86 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Tue, 17 Oct 2017 10:25:38 -0700 Subject: [PATCH 1/4] changed MSfB line items to not supported per PM. home to edu, home to pro edu, s to pro, s to workstations --- windows/deployment/upgrade/windows-10-edition-upgrades.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/deployment/upgrade/windows-10-edition-upgrades.md b/windows/deployment/upgrade/windows-10-edition-upgrades.md index ebc7205c81..c1f05fe42e 100644 --- a/windows/deployment/upgrade/windows-10-edition-upgrades.md +++ b/windows/deployment/upgrade/windows-10-edition-upgrades.md @@ -43,10 +43,10 @@ X = unsupported
|-----------------| ------------------------------------ | ---- ----------------------- | ------------------------- | -------------------------------------- | ----------------------------------- | --------------------------------------------- | | **Home > Pro** | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | | **Home > Pro for Workstations** | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | -| **Home > Pro Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) (MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | -| **Home > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) (MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | -| **S > Pro** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | -| **S > Pro for Workstations** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | +| **Home > Pro Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **Home > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | +| **S > Pro** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | +| **S > Pro for Workstations** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | | **S > Pro Education** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | | **S > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) (MSfB) | ![supported, reboot required](../images/check_grn.png) | ![not supported](../images/x_blk.png) | | **S > Enterprise** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1703 - PC), (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![not supported](../images/x_blk.png) | From aa527bfd2b6f0e224d0452988d197bdbec0f684e Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Tue, 17 Oct 2017 11:49:44 -0700 Subject: [PATCH 2/4] updated the win10s steps --- education/windows/test-windows10s-for-edu.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md index 28761e9071..c8332719a5 100644 --- a/education/windows/test-windows10s-for-edu.md +++ b/education/windows/test-windows10s-for-edu.md @@ -167,14 +167,20 @@ After going back to your previous edition of Windows 10, you may receive the fol If you see this message, follow these steps to stop receiving the message: -1. Restart your PC and enter UEFI/BIOS. Depending on your PC, you may need to press **Delete**, **F1**, or **F2** as soon as the PC begins to power on. -2. Once you've accessed the UEFI/BIOS, look for the menu item labeled **Security** or **Security Settings** and navigate to it. -3. Look for an option called **Secure boot configuration**, **Secure boot**, or **UEFI Boot** and disable this option. -4. Save your settings and then exit UEFI/BIOS. This will restart your PC. +1. If you have BitLocker enabled, disable it first in the Control Panel. Go to **Manage BitLocker** and select **Turn off BitLocker**. +2. Open Windows **Settings** and go to **Update & security > Recovery**. +3. In the **Recover** page, find **Advanced startup** and select **Restart now** to start your PC. +4. After restarting, in the **Choose an option** page, select **Troubleshoot**. +5. In the **Troubleshoot** page, select **Advanced options**, and in the **Advanced options** page select **UEFI Firmware Settings**. +6. In the **UEFI Firmware Settings** page, select **Restart** to get to the device-specific BIOS menu. +7. Once you've accessed UEFI, look for the menu item labeled **Security** or **Security Settings** and navigate to it. +8. Look for an option called **Secure boot configuration**, **Secure boot**, or **UEFI Boot**. If you can't find one of these options, check the **Boot** menu. +9. Disable the secure boot/UEFI boot option. +4. Save your settings and then exit UEFI. This will restart your PC. 5. After Windows is done booting up, confirm that you no longer see the message. > [!NOTE] - > We recommend following these steps again to re-enable the **Secure boot configuration**, **Secure boot**, or **UEFI Boot** option, which you disabled in step 3. + > We recommend following these steps again to re-enable the **Secure boot configuration**, **Secure boot**, or **UEFI Boot** option, which you disabled in step 9, and then subsequently re-enable BitLocker (if you previously had this enabled). ### Use installation media to reinstall Windows 10 From 424da53fd2e572d822cef940161205736e137cf1 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Tue, 17 Oct 2017 11:52:08 -0700 Subject: [PATCH 3/4] updated --- education/windows/test-windows10s-for-edu.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md index c8332719a5..83cbe8a2b0 100644 --- a/education/windows/test-windows10s-for-edu.md +++ b/education/windows/test-windows10s-for-edu.md @@ -176,8 +176,8 @@ If you see this message, follow these steps to stop receiving the message: 7. Once you've accessed UEFI, look for the menu item labeled **Security** or **Security Settings** and navigate to it. 8. Look for an option called **Secure boot configuration**, **Secure boot**, or **UEFI Boot**. If you can't find one of these options, check the **Boot** menu. 9. Disable the secure boot/UEFI boot option. -4. Save your settings and then exit UEFI. This will restart your PC. -5. After Windows is done booting up, confirm that you no longer see the message. +10. Save your settings and then exit UEFI. This will restart your PC. +11. After Windows is done booting up, confirm that you no longer see the message. > [!NOTE] > We recommend following these steps again to re-enable the **Secure boot configuration**, **Secure boot**, or **UEFI Boot** option, which you disabled in step 9, and then subsequently re-enable BitLocker (if you previously had this enabled). From 0690d13938e56d54841c3c0477661265b386030e Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Tue, 17 Oct 2017 12:11:17 -0700 Subject: [PATCH 4/4] updated --- education/windows/test-windows10s-for-edu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md index 83cbe8a2b0..d44592f9e9 100644 --- a/education/windows/test-windows10s-for-edu.md +++ b/education/windows/test-windows10s-for-edu.md @@ -172,7 +172,7 @@ If you see this message, follow these steps to stop receiving the message: 3. In the **Recover** page, find **Advanced startup** and select **Restart now** to start your PC. 4. After restarting, in the **Choose an option** page, select **Troubleshoot**. 5. In the **Troubleshoot** page, select **Advanced options**, and in the **Advanced options** page select **UEFI Firmware Settings**. -6. In the **UEFI Firmware Settings** page, select **Restart** to get to the device-specific BIOS menu. +6. In the **UEFI Firmware Settings** page, select **Restart** to get to the device-specific UEFI/BIOS menu. 7. Once you've accessed UEFI, look for the menu item labeled **Security** or **Security Settings** and navigate to it. 8. Look for an option called **Secure boot configuration**, **Secure boot**, or **UEFI Boot**. If you can't find one of these options, check the **Boot** menu. 9. Disable the secure boot/UEFI boot option.