Microsoft 365 Business documentation and resources
Microsoft 365 Business documentation and resources
-
Partner/IT admin
@@ -136,7 +136,7 @@ description: Learn about the product documentation and resources available for M
-
+
@@ -149,7 +149,7 @@ description: Learn about the product documentation and resources available for M- - +
@@ -337,7 +337,7 @@ description: Learn about the product documentation and resources available for M-+
@@ -591,7 +591,7 @@ description: Learn about the product documentation and resources available for M- - +
@@ -779,7 +779,7 @@ description: Learn about the product documentation and resources available for M-+
@@ -798,7 +798,7 @@ description: Learn about the product documentation and resources available for M-+
diff --git a/education/get-started/configure-microsoft-store-for-education.md b/education/get-started/configure-microsoft-store-for-education.md index a8b6eb085a..0e5e235abd 100644 --- a/education/get-started/configure-microsoft-store-for-education.md +++ b/education/get-started/configure-microsoft-store-for-education.md @@ -19,10 +19,9 @@ You'll need to configure Microsoft Store for Education to accept the services ag You can watch the video to see how this is done, or follow the step-by-step guide. - - +You can watch the descriptive audio version here: [Microsoft Education: Configure Microsoft Store for Education (DA)](https://www.youtube.com/watch?v=bStgEpHbEXw) diff --git a/education/get-started/finish-setup-and-other-tasks.md b/education/get-started/finish-setup-and-other-tasks.md index 834f0ee3e6..133ad0bf2e 100644 --- a/education/get-started/finish-setup-and-other-tasks.md +++ b/education/get-started/finish-setup-and-other-tasks.md @@ -22,8 +22,10 @@ Once you've set up your Windows 10 education device, it's worth checking to veri You can watch the video to see how this is done, or follow the step-by-step guide. + + You can watch the descriptive audio version here: [Microsoft Education: Verify Windows 10 education devices are Azure AD joined and managed (DA)](https://www.youtube.com/watch?v=_hVIxaEsu2Y) ## Verify correct device setup @@ -73,8 +75,10 @@ You can follow the rest of the walkthrough to finish setup and complete other ta You can watch the following video to see how to update group settings in Intune for Education and configure Azure settings. Or, you can follow the step-by-step guide for these tasks and the other tasks listed above. + + You can watch the descriptive audio version here: [Microsoft Education: Update settings, apps, and Azure AD settings for your education tenant (DA)](https://www.youtube.com/watch?v=-Rz3VcDXbzs) ## Update group settings in Intune for Education diff --git a/education/get-started/get-started-with-microsoft-education.md b/education/get-started/get-started-with-microsoft-education.md index 88f0f8fba9..e4714cf402 100644 --- a/education/get-started/get-started-with-microsoft-education.md +++ b/education/get-started/get-started-with-microsoft-education.md @@ -8,13 +8,9 @@ ms.sitesec: library ms.topic: hero-article localizationpriority: high ms.pagetype: edu -ms.date: 06/26/2017 author: CelesteDG ms.author: celested -<<<<<<< HEAD -======= ms.date: 07/10/2017 ->>>>>>> bc0aae28f3293b64ef5664ec0524a73070fd7c5e --- # Get started: Deploy and manage a full cloud IT solution with Microsoft Education diff --git a/education/get-started/set-up-office365-edu-tenant.md b/education/get-started/set-up-office365-edu-tenant.md index bdbcb27002..eae9c0f114 100644 --- a/education/get-started/set-up-office365-edu-tenant.md +++ b/education/get-started/set-up-office365-edu-tenant.md @@ -19,8 +19,10 @@ Schools can use Office 365 to save time and be more productive. Built with power Don't have an Office 365 for Education verified tenant or just starting out? Follow these steps to set up an Office 365 for Education tenant. [Learn more about Office 365 for Education plans and pricing](https://products.office.com/en-us/academic/compare-office-365-education-plans). + + You can watch the descriptive audio version here: [Microsoft Education: Set up an Office 365 Education tenant (DA)](https://www.youtube.com/watch?v=d5tQ8KoB3ic) ## To set up a new Office 365 Education tenant diff --git a/education/get-started/set-up-windows-education-devices.md b/education/get-started/set-up-windows-education-devices.md index b4e74b91d7..5fa0dfd262 100644 --- a/education/get-started/set-up-windows-education-devices.md +++ b/education/get-started/set-up-windows-education-devices.md @@ -19,8 +19,10 @@ If you are setting up a Windows 10 device invidividually, and network bandwidth You can watch the video to see how this is done, or follow the step-by-step guide. + + You can watch the descriptive audio version here: [Microsoft Education: Set up a new Windows 10 education devices using the Windows setup experience (DA)](https://www.youtube.com/watch?v=_UtS1Cz2Pno) ## To set up Windows 10 devices using OOBE diff --git a/education/get-started/use-intune-for-education.md b/education/get-started/use-intune-for-education.md index fe8c51ff66..6177eb9d53 100644 --- a/education/get-started/use-intune-for-education.md +++ b/education/get-started/use-intune-for-education.md @@ -37,8 +37,11 @@ Note that for verified education tenants, Microsoft automatically provisions you You can watch the video to see how this is done, or follow the step-by-step guide. - + + You can watch the descriptive audio version here: [Microsoft Education: Use Intune for Education to manage groups, apps, and settings (DA)](https://youtu.be/Tejxfc4V7cQ) ## Set up Intune for Education diff --git a/education/get-started/use-school-data-sync.md b/education/get-started/use-school-data-sync.md index af9fb9cd54..105a60374a 100644 --- a/education/get-started/use-school-data-sync.md +++ b/education/get-started/use-school-data-sync.md @@ -21,7 +21,10 @@ Follow all the steps in this section to use SDS and sample CSV files in a trial You can watch the video to see how this is done, or follow the step-by-step guide. + + You can watch the descriptive audio version here: [Microsoft Education: Use School Data Sync to import student data (DA)](https://www.youtube.com/watch?v=l4b086IMtvc) diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md index 99a039e141..87744a18d7 100644 --- a/education/windows/use-set-up-school-pcs-app.md +++ b/education/windows/use-set-up-school-pcs-app.md @@ -41,8 +41,10 @@ Set up School PCs makes it easy to set up Windows 10 PCs with Microsoft's recomm You can watch the video to see how to use the Set up School PCs app, or follow the step-by-step guide. + + You can watch the descriptive audio version here: [Microsoft Education: Use the Set up School PCs app (DA)](https://www.youtube.com/watch?v=qqe_T2LkGsI) ## Tips for success diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md index 8c297f234b..f623ae9b78 100644 --- a/windows/client-management/mdm/TOC.md +++ b/windows/client-management/mdm/TOC.md @@ -228,6 +228,7 @@ #### [TimeLanguageSettings](policy-csp-timelanguagesettings.md) #### [Update](policy-csp-update.md) #### [Wifi](policy-csp-wifi.md) +#### [WindowsDefenderSecurityCenter](policy-csp-windowsdefendersecuritycenter.md) #### [WindowsInkWorkspace](policy-csp-windowsinkworkspace.md) #### [WindowsLogon](policy-csp-windowslogon.md) #### [WirelessDisplay](policy-csp-wirelessdisplay.md) diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 9e47f6bd79..aadfb8cf3c 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -975,6 +975,20 @@ For details about Microsoft mobile device management protocols for Windows 10 s - Update/ScheduledInstallFourthWeek
- Update/ScheduledInstallSecondWeek
- Update/ScheduledInstallThirdWeek
+- WindowsDefenderSecurityCenter/CompanyName
+- WindowsDefenderSecurityCenter/DisableAppBrowserUI
+- WindowsDefenderSecurityCenter/DisableEnhancedNotifications
+- WindowsDefenderSecurityCenter/DisableFamilyUI
+- WindowsDefenderSecurityCenter/DisableHealthUI
+- WindowsDefenderSecurityCenter/DisableNetworkUI
+- WindowsDefenderSecurityCenter/DisableNotifications
+- WindowsDefenderSecurityCenter/DisableVirusUI
+- WindowsDefenderSecurityCenter/DisallowExploitProtectionOverride
+- WindowsDefenderSecurityCenter/Email
+- WindowsDefenderSecurityCenter/EnableCustomizedToasts
+- WindowsDefenderSecurityCenter/EnableInAppCustomization
+- WindowsDefenderSecurityCenter/Phone
+- WindowsDefenderSecurityCenter/URL
@@ -1270,8 +1284,27 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware- When you enable EncryptionMethodByDriveType, you must specify values for all three drives (operating system, fixed data, and removable data), otherwise it will fail (500 return status). For example, if you only set the encrytion method for the OS and removable drives, you will get a 500 return status.
- When you enable SystemDrivesRecoveryMessage, you must specify values for all three settings (pre-boot recovery screen, recovery message, and recovery URL), otherwise it will fail (500 return status). For example, if you only specify values for message and URL, you will get a 500 return status.
- - + ++ [Policy CSP](policy-configuration-service-provider.md) ++ Added the following new policies for Windows 10, version 1709:
+-
+
- WindowsDefenderSecurityCenter/CompanyName +
- WindowsDefenderSecurityCenter/DisableAppBrowserUI +
- WindowsDefenderSecurityCenter/DisableEnhancedNotifications +
- WindowsDefenderSecurityCenter/DisableFamilyUI +
- WindowsDefenderSecurityCenter/DisableHealthUI +
- WindowsDefenderSecurityCenter/DisableNetworkUI +
- WindowsDefenderSecurityCenter/DisableNotifications +
- WindowsDefenderSecurityCenter/DisableVirusUI +
- WindowsDefenderSecurityCenter/DisallowExploitProtectionOverride +
- WindowsDefenderSecurityCenter/Email +
- WindowsDefenderSecurityCenter/EnableCustomizedToasts +
- WindowsDefenderSecurityCenter/EnableInAppCustomization +
- WindowsDefenderSecurityCenter/Phone +
- WindowsDefenderSecurityCenter/URL +
-
+
- + WindowsDefenderSecurityCenter/CompanyName + +
- + WindowsDefenderSecurityCenter/DisableAppBrowserUI + +
- + WindowsDefenderSecurityCenter/DisableEnhancedNotifications + +
- + WindowsDefenderSecurityCenter/DisableFamilyUI + +
- + WindowsDefenderSecurityCenter/DisableHealthUI + +
- + WindowsDefenderSecurityCenter/DisableNetworkUI + +
- + WindowsDefenderSecurityCenter/DisableNotifications + +
- + WindowsDefenderSecurityCenter/DisableVirusUI + +
- + WindowsDefenderSecurityCenter/DisallowExploitProtectionOverride + +
- + WindowsDefenderSecurityCenter/Email + +
- + WindowsDefenderSecurityCenter/EnableCustomizedToasts + +
- + WindowsDefenderSecurityCenter/EnableInAppCustomization + +
- + WindowsDefenderSecurityCenter/Phone + +
- + WindowsDefenderSecurityCenter/URL + +
-
diff --git a/windows/client-management/mdm/policy-csp-windowsdefendersecuritycenter.md b/windows/client-management/mdm/policy-csp-windowsdefendersecuritycenter.md
new file mode 100644
index 0000000000..7f6d64ab86
--- /dev/null
+++ b/windows/client-management/mdm/policy-csp-windowsdefendersecuritycenter.md
@@ -0,0 +1,517 @@
+---
+title: Policy CSP - WindowsDefenderSecurityCenter
+description: Policy CSP - WindowsDefenderSecurityCenter
+ms.author: maricia
+ms.topic: article
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
+ms.date: 07/06/2017
+---
+
+# Policy CSP - WindowsDefenderSecurityCenter
+
+> [!WARNING]
+> Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
+
+
+
+ +## WindowsDefenderSecurityCenter policies + + +**WindowsDefenderSecurityCenter/CompanyName** + + ++
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. The company name that is displayed to the users. CompanyName is required for both EnableCustomizedToasts and EnableInAppCustomization. If you disable or do not configure this setting, or do not have EnableCustomizedToasts or EnableInAppCustomization enabled, then devices will not display the contact options. + +
Value type is string. Supported operations are Add, Get, Replace and Delete. + + + + +**WindowsDefenderSecurityCenter/DisableAppBrowserUI** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Use this policy setting if you want to disable the display of the app and browser protection area in Windows Defender Security Center. If you disable or do not configure this setting, Windows defender Security Center will display this area. + +
Value type is integer. Supported operations are Add, Get, Replace and Delete. Valid values: + +- 0 - (Disable) The users can see the display of the app and browser protection area in Windows Defender Security Center. +- 1 - (Enable) The users cannot see the display of the app and browser protection area in Windows Defender Security Center. + + + + +**WindowsDefenderSecurityCenter/DisableEnhancedNotifications** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Use this policy if you want Windows Defender Security Center to only display notifications which are considered critical. If you disable or do not configure this setting, Windows Defender Security Center will display critical and non-critical notifications to users. + +> [!Note] +> If Suppress notification is enabled then users will not see critical or non-critical messages. + +
Value type is integer. Supported operations are Add, Get, Replace and Delete. Valid values: + +- 0 - (Disable) Windows Defender Security Center will display critical and non-critical notifications to users.. +- 1 - (Enable) Windows Defender Security Center only display notifications which are considered critical on clients. + + + + +**WindowsDefenderSecurityCenter/DisableFamilyUI** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Use this policy setting if you want to disable the display of the family options area in Windows Defender Security Center. If you disable or do not configure this setting, Windows defender Security Center will display this area. + +
Value type is integer. Supported operations are Add, Get, Replace and Delete. Valid values: + +- 0 - (Disable) The users can see the display of the family options area in Windows Defender Security Center. +- 1 - (Enable) The users cannot see the display of the family options area in Windows Defender Security Center. + + + + +**WindowsDefenderSecurityCenter/DisableHealthUI** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Use this policy setting if you want to disable the display of the device performance and health area in Windows Defender Security Center. If you disable or do not configure this setting, Windows defender Security Center will display this area. + +
Value type is integer. Supported operations are Add, Get, Replace and Delete. Valid values: + +- 0 - (Disable) The users can see the display of the device performance and health area in Windows Defender Security Center. +- 1 - (Enable) The users cannot see the display of the device performance and health area in Windows Defender Security Center. + + + + +**WindowsDefenderSecurityCenter/DisableNetworkUI** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Use this policy setting if you want to disable the display of the firewall and network protection area in Windows Defender Security Center. If you disable or do not configure this setting, Windows defender Security Center will display this area. + +
Value type is integer. Supported operations are Add, Get, Replace and Delete. Valid values: + +- 0 - (Disable) The users can see the display of the firewall and network protection area in Windows Defender Security Center. +- 1 - (Enable) The users cannot see the display of the firewall and network protection area in Windows Defender Security Center. + + + + +**WindowsDefenderSecurityCenter/DisableNotifications** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Use this policy setting if you want to disable the display of Windows Defender Security Center notifications. If you disable or do not configure this setting, Windows Defender Security Center notifications will display on devices. + +
Value type is integer. Supported operations are Add, Get, Replace and Delete. Valid values: + +- 0 - (Disable) The users can see the display of Windows Defender Security Center notifications. +- 1 - (Enable) The users cannot see the display of Windows Defender Security Center notifications. + + + + +**WindowsDefenderSecurityCenter/DisableVirusUI** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Use this policy setting if you want to disable the display of the virus and threat protection area in Windows Defender Security Center. If you disable or do not configure this setting, Windows defender Security Center will display this area. + +
Value type is integer. Supported operations are Add, Get, Replace and Delete. Valid values: + +- 0 - (Disable) The users can see the display of the virus and threat protection area in Windows Defender Security Center. +- 1 - (Enable) The users cannot see the display of the virus and threat protection area in Windows Defender Security Center. + + + + +**WindowsDefenderSecurityCenter/DisallowExploitProtectionOverride** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Prevent users from making changes to the exploit protection settings area in the Windows Defender Security Center. If you disable or do not configure this setting, local users can make changes in the exploit protection settings area. + +
Value type is integer. Supported operations are Add, Get, Replace and Delete.Valid values: + +- 0 - (Disable) Local users are allowed to make changes in the exploit protection settings area. +- 1 - (Enable) Local users cannot make changes in the exploit protection settings area. + + + + +**WindowsDefenderSecurityCenter/Email** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. The email address that is displayed to users. The default mail application is used to initiate email actions. If you disable or do not configure this setting, or do not have EnableCustomizedToasts or EnableInAppCustomization enabled, then devices will not display contact options. + +
Value type is string. Supported operations are Add, Get, Replace and Delete. + + + + +**WindowsDefenderSecurityCenter/EnableCustomizedToasts** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. Enable this policy to display your company name and contact options in the notifications. If you disable or do not configure this setting, or do not provide CompanyName and a minimum of one contact method (Phone using Skype, Email, Help portal URL) Windows Defender Security Center will display a default notification text. + +
Value type is integer. Supported operations are Add, Get, Replace, and Delete. Valid values: + +- 0 - (Disable) Notifications contain a default notification text. +- 1 - (Enable) Notifications contain the company name and contact options. + + + + + +**WindowsDefenderSecurityCenter/EnableInAppCustomization** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709.Enable this policy to have your company name and contact options displayed in a contact card fly out in Windows Defender Security Center. If you disable or do not configure this setting, or do not provide CompanyName and a minimum of one contact method (Phone using Skype, Email, Help portal URL) Windows Defender Security Center will not display the contact card fly out notification. + +
Value type is integer. Supported operations are Add, Get, Replace, and Delete. Valid values: + +- 0 - (Disable) Do not display the company name and contact options in the card fly out notification. +- 1 - (Enable) Display the company name and contact options in the card fly out notification. + + + + +**WindowsDefenderSecurityCenter/Phone** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. The phone number or Skype ID that is displayed to users. Skype is used to initiate the call. If you disable or do not configure this setting, or do not have EnableCustomizedToasts or EnableInAppCustomization enabled, then devices will not display contact options. + +
Value type is string. Supported operations are Add, Get, Replace, and Delete. + + + + +**WindowsDefenderSecurityCenter/URL** + + +
+
+ + + ++ +Home +Pro +Business +Enterprise +Education +Mobile +MobileEnterprise ++ + + +3
+3
+3
+3
+ +Added in Windows 10, version 1709. The help portal URL this is displayed to users. The default browser is used to initiate this action. If you disable or do not configure this setting, or do not have EnableCustomizedToasts or EnableInAppCustomization enabled, then the device will not display contact options. + +
Value type is Value type is string. Supported operations are Add, Get, Replace, and Delete. + + + \ No newline at end of file diff --git a/windows/deployment/change-history-for-deploy-windows-10.md b/windows/deployment/change-history-for-deploy-windows-10.md index 7353568c47..c9b44a991f 100644 --- a/windows/deployment/change-history-for-deploy-windows-10.md +++ b/windows/deployment/change-history-for-deploy-windows-10.md @@ -12,6 +12,11 @@ ms.date: 06/28/2017 # Change history for Deploy Windows 10 This topic lists new and updated topics in the [Deploy Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](/windows/windows-10). +## July 2017 +| New or changed topic | Description | +|----------------------|-------------| +| The table of contents for deployment topics was reorganized. + ## June 2017 | New or changed topic | Description | |----------------------|-------------| diff --git a/windows/deployment/update/waas-restart.md b/windows/deployment/update/waas-restart.md index 0b33aa08b4..15b695c9ad 100644 --- a/windows/deployment/update/waas-restart.md +++ b/windows/deployment/update/waas-restart.md @@ -26,24 +26,24 @@ You can use Group Policy settings, mobile device management (MDM) or Registry (n In Group Policy, within **Configure Automatic Updates**, you can configure a forced restart after a specified instllation time. -To set the time, you need to go to **Configure Automatic Updates**, select option **4 - Auto download and schedule the instal**, and then enter a time in the **Scheduled install time** dropdown. Alternatively, you can specify that installtion will occur during the automatic maintenance time (configured using **Computer Configuration\Administrative Templates\Windows Components\Maintenance Scheduler**). +To set the time, you need to go to **Configure Automatic Updates**, select option **4 - Auto download and schedule the install**, and then enter a time in the **Scheduled install time** dropdown. Alternatively, you can specify that installation will occur during the automatic maintenance time (configured using **Computer Configuration\Administrative Templates\Windows Components\Maintenance Scheduler**). **Always automatically restart at the scheduled time** forces a restart after the specified installation time and lets you configure a timer to warn a signed-in user that a restart is going to occur. While not recommended, the same result can be achieved through Registry. Under **HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate\AU**, set **AuOptions** to **4**, set the install time with **ScheduledInstallTime**, enable **AlwaysAutoRebootAtScheduledTime** and specify the delay in minutes through **AlwaysAutoRebootAtScheduledTimeMinutes**. Similar to Group Policy, **AlwaysAutoRebootAtScheduledTimeMinutes** sets the timer to warn a signed-in user that a restart is going to occur. -For a detailed description of these regsitry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart). +For a detailed description of these registry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart). ## Delay automatic reboot -When **Configure Automatic Updates** is enabled in Group Policy, you can enable one of the following additional policies to delay an automatic reboot after update installtion: +When **Configure Automatic Updates** is enabled in Group Policy, you can enable one of the following additional policies to delay an automatic reboot after update installation: - **Turn off auto-restart for updates during active hours** prevents automatic restart during active hours. - **No auto-restart with logged on users for scheduled automatic updates installations** prevents automatic restart when a user is signed in. If a user schedules the restart in the update notification, the device will restart at the time the user specifies even if a user is signed in at the time. This policy only applies when **Configure Automatic Updates** is set to option **4-Auto download and schedule the install**. You can also use Registry, to prevent automatic restarts when a user is signed in. Under **HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate\AU**, set **AuOptions** to **4** and enable **NoAutoRebootWithLoggedOnUsers**. As with Group Policy, if a user schedules the restart in the update notification, it will override this setting. -For a detailed description of these regsitry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart). +For a detailed description of these registry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart). ## Configure active hours @@ -57,7 +57,7 @@ Administrators can use multiple ways to set active hours for managed devices: - You can use Group Policy, as described in the procedure that follows. - You can use MDM, as described in [Configuring active hours with MDM](#configuring-active-hours-with-mdm). -- While not recommended, you can also configure active hours, as descrbied in [Configuring active hours through Registry](#configuring-active-hours-through-registry). +- While not recommended, you can also configure active hours, as described in [Configuring active hours through Registry](#configuring-active-hours-through-registry). ### Configuring active hours with Group Policy @@ -77,7 +77,7 @@ Any settings configured through Registry may conflict with any existing configur You should set a combination of the following registry values, in order to configure active hours. Under **HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate** use **SetActiveHours** to enable or disable active hours and **ActiveHoursStart**,**ActiveHoursEnd** to specify the range of active hours. -For a detailed description of these regsitry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart). +For a detailed description of these registry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart). >[!NOTE] >To configure active hours manually on a single device, go to **Settings** > **Update & security** > **Windows Update** and select **Change active hours**. @@ -94,7 +94,7 @@ To configure active hours max range through MDM, use [**Update/ActiveHoursMaxRan ## Limit restart delays -After an update is installed, Windows 10 attemtps automatic restart outside of active hours. If the restart does not succeed after 7 days (by default), the user will see a notification that restart is required. You can use the **Specify deadline before auto-restart for update installation** policy to change the delay from 7 days to a number of days between 2 and 14. +After an update is installed, Windows 10 attempts automatic restart outside of active hours. If the restart does not succeed after 7 days (by default), the user will see a notification that restart is required. You can use the **Specify deadline before auto-restart for update installation** policy to change the delay from 7 days to a number of days between 2 and 14. ## Control restart notifications @@ -123,7 +123,7 @@ To do so through MDM, use [**Update/SetAutoRestartNotificationDisable**](https:/ ### Scheduled auto-restart warnings -Since users are not able to postpone a scheduled restart once the deadline has been reached, you can configure a warning reminder prior to the scheduled a restart. You can also configure a configure a warning prior to the restart, to notify users once the restart is imminent and allow them to save their work. +Since users are not able to postpone a scheduled restart once the deadline has been reached, you can configure a warning reminder prior to the scheduled restart. You can also configure a warning prior to the restart, to notify users once the restart is imminent and allow them to save their work. To configure both through Group Policy, find **Configure auto-restart warning notifications schedule for updates** under **Computer Configuration\Administrative Templates\Windows Components\Windows Update**. The warning reminder can be configured by **Reminder (hours)** and the warning prior to an imminent auto-restart can be configured by **Warning (mins)**. @@ -185,7 +185,7 @@ The following tables list registry values that correspond to the Group Policy se There are 3 different registry combinations for controlling restart behavior: - To set active hours, **SetActiveHours** should be **1**, while **ActiveHoursStart** and **ActiveHoursEnd** should define the time range. -- To schedule a specific instllation and reboot time, **AUOptions** should be **4**, **ScheduledInstallTime** should specify the installation time, **AlwaysAutoRebootAtScheduledTime** set to **1** and **AlwaysAutoRebootAtScheduledTimeMinutes** should specify number of minutes to wait before rebooting. +- To schedule a specific installation and reboot time, **AUOptions** should be **4**, **ScheduledInstallTime** should specify the installation time, **AlwaysAutoRebootAtScheduledTime** set to **1** and **AlwaysAutoRebootAtScheduledTimeMinutes** should specify number of minutes to wait before rebooting. - To delay rebooting if a user is logged on, **AUOptions** should be **4**, while **NoAutoRebootWithLoggedOnUsers** is set to **1**. ## Related topics diff --git a/windows/deployment/upgrade/windows-10-edition-upgrades.md b/windows/deployment/upgrade/windows-10-edition-upgrades.md index 3fb9bda5d9..c42d403a33 100644 --- a/windows/deployment/upgrade/windows-10-edition-upgrades.md +++ b/windows/deployment/upgrade/windows-10-edition-upgrades.md @@ -21,8 +21,8 @@ With Windows 10, you can quickly upgrade from one edition of Windows 10 to ano The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer. **Note**: The reboot requirement for upgrading from Pro to Enterprise was removed in version 1607. X = unsupported
-✔ (green) = supported; reboot required
-✔ (blue) = supported; no reboot required. +✔ (green) = supported; reboot required
+✔ (blue) = supported; no reboot required |Method |Home > Pro |Home > Education |Pro > Education |Pro > Enterprise |Ent > Education |Mobile > Mobile Enterprise | diff --git a/windows/deployment/windows-10-auto-pilot.md b/windows/deployment/windows-10-auto-pilot.md index e61588a105..adf60da2d7 100644 --- a/windows/deployment/windows-10-auto-pilot.md +++ b/windows/deployment/windows-10-auto-pilot.md @@ -1,6 +1,6 @@ --- title: Overview of Windows AutoPilot -description: This topic goes over Auto-Pilot and how it helps setup OOBE Windows 10 devices. +description: This topic goes over Windows AutoPilot and how it helps setup OOBE Windows 10 devices. keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune ms.prod: w10 ms.mktglfcycl: deploy @@ -19,21 +19,21 @@ ms.date: 06/30/2017 - Windows 10 Windows AutoPilot is a collection of technologies used to setup and pre-configure new devices, getting them ready for productive use. In addition, you can use Windows AutoPilot to reset, repurpose and recover devices. -This solution enables the IT department to achieve the above with little to no infrastructure to manage, with a process that's easy and simple. +This solution enables an IT department to achieve the above with little to no infrastructure to manage, with a process that's easy and simple. ## Benefits of Windows AutoPilot -Traditionally, IT Pros spend a lot of time on building and customizing images that will later be deployed to devices with a perfectly good OS already installed on them. Windows AutoPilot introduces a new approach. +Traditionally, IT pros spend a lot of time on building and customizing images that will later be deployed to devices with a perfectly good OS already installed on them. Windows AutoPilot introduces a new approach. From the users' perspective, it only takes a few simple operations to make their device ready to use. -From the IT Pros' perspective, the only interaction required from the end-user, is to connect to a network and to verify their credentials. Everything past that is automated. +From the IT pros' perspective, the only interaction required from the end user, is to connect to a network and to verify their credentials. Everything past that is automated. Windows AutoPilot allows you to: -* Automatically join devices to Azure Active Directory -* Auto-enroll devices into MDM services, such as Intune ([*Requires an Azure AD Premium subscription*](#prerequisites)) +* Automatically join devices to Azure Active Directory (Azure AD) +* Auto-enroll devices into MDM services, such as Microsoft Intune ([*Requires an Azure AD Premium subscription*](#prerequisites)) * Restrict the Administrator account creation -* Create and auto-assign devices to configuration groups based on the devices' profile +* Create and auto-assign devices to configuration groups based on a device's profile * Customize OOBE content specific to the organization ### Prerequisites @@ -41,7 +41,7 @@ Windows AutoPilot allows you to: * [Devices must be registered to the organization](#registering-devices-to-your-organization) * Devices have to be pre-installed with Windows 10, version 1703 or later * Devices must have access to the internet -* [Azure AD premium P1 or P2](https://www.microsoft.com/cloud-platform/azure-active-directory-features) +* [Azure AD Premium P1 or P2](https://www.microsoft.com/cloud-platform/azure-active-directory-features) * Microsoft Intune or other MDM services to manage your devices ## Windows AutoPilot Scenarios @@ -55,9 +55,9 @@ The Cloud-Driven scenario enables you to pre-register devices through the Window The end user unboxes and turns on a new device. What follows are a few simple configuration steps: * Select a language and keyboard layout * Connect to the network -* Provide email address (the email of the user's Azure Active Directory account) and password +* Provide email address (the email address of the user's Azure AD account) and password -Multiple additional settings are skipped here, since the device automatically recognizes that [it belongs to an organization](#registering-devices-to-your-organization). Following this process the device is joined to Azure Active Directory, enrolled in Microsoft Intune (or any other MDM service). +Multiple additional settings are skipped here, since the device automatically recognizes that [it belongs to an organization](#registering-devices-to-your-organization). Following this process the device is joined to Azure AD, enrolled in Microsoft Intune (or any other MDM service). MDM enrollment ensures policies are applied, apps are installed and setting are configured on the device. Windows Update for Business applies the latest updates to ensure the device is up to date. @@ -68,7 +68,7 @@ MDM enrollment ensures policies are applied, apps are installed and setting are In order to register devices, you will need to acquire their hardware ID and register it. We are actively working with various hardware vendors to enable them to provide the required information to you, or upload it on your behalf. -If you would like to capture that information by yourself, the following [PowerShell script](https://www.powershellgallery.com/packages/Get-WindowsAutoPilotInfo) will generate a csv file with the devices' hardware ID. +If you would like to capture that information by yourself, you can use the [Get-WindowsAutoPilotInfo PowerShell script](https://www.powershellgallery.com/packages/Get-WindowsAutoPilotInfo), which will generate a .csv file with the device's hardware ID. >[!NOTE] >This PowerShell script requires elevated permissions. @@ -76,7 +76,7 @@ If you would like to capture that information by yourself, the following [PowerS By uploading this information to the Microsoft Store for Business or Partner Center admin portal, you'll be able to assign devices to your organization. Additional options and customization is available through these portals to pre-configure the devices. -Options available for Windows 10, Version 1703: +Options available for Windows 10, version 1703: * Skipping Work or Home usage selection (*Automatic*) * Skipping OEM registration, OneDrive and Cortana (*Automatic*) * Skipping privacy settings @@ -84,19 +84,19 @@ Options available for Windows 10, Version 1703: We are working to add additional options to further personalize and streamline the setup experience in future releases. -To see additional details on how to customize the OOBE experience and how to follow this process, see guidance for [Microsoft Store for Business](/store-for-business/add-profile-to-devices.md) or [Partner Center](https://msdn.microsoft.com/partner-center/autopilot). +To see additional details on how to customize the OOBE experience and how to follow this process, see guidance for [Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/add-profile-to-devices) or [Partner Center](https://msdn.microsoft.com/partner-center/autopilot). ### IT-Driven -If you are planning to use to configure these devices with traditional on-premises or cloud-based solutions, the [Windows Configuration Designer](https://www.microsoft.com/store/p/windows-configuration-designer/9nblggh4tx22) can be used to help automate the process. This is more suited to scenarios in which you require a higher level of control over the provisioning process. For more information on creating provisioning packages with WCD, see [Create a provisioning package for Windows 10](/windows/configuration/provisioning-packages/provisioning-create-package). +If you are planning to use to configure these devices with traditional on-premises or cloud-based solutions, the [Windows Configuration Designer](https://www.microsoft.com/store/p/windows-configuration-designer/9nblggh4tx22) can be used to help automate the process. This is more suited to scenarios in which you require a higher level of control over the provisioning process. For more information on creating provisioning packages with Windows Configuration Designer, see [Create a provisioning package for Windows 10](/windows/configuration/provisioning-packages/provisioning-create-package). ### Teacher-Driven -If you're an IT Pro or a technical staff member at a school, your scenario might be simpler. The [Set Up School PCs](http://www.microsoft.com/store/p/set-up-school-pcs/9nblggh4ls40) app can be used to quickly set up PCs for students and will get you to a productive state faster and simpler. Please see [Use the Set up School PCs app](https://docs.microsoft.com/education/windows/use-set-up-school-pcs-app) for all the details. +If you're an IT pro or a technical staff member at a school, your scenario might be simpler. The [Set Up School PCs](http://www.microsoft.com/store/p/set-up-school-pcs/9nblggh4ls40) app can be used to quickly set up PCs for students and will get you to a productive state faster and simpler. Please see [Use the Set up School PCs app](https://docs.microsoft.com/education/windows/use-set-up-school-pcs-app) for all the details. ## Ensuring your device can be auto-enrolled to MDM -In order for your devices to be auto-enrolled into MDM management, MDM auto-enrollment needs to be configured in Azure AD. To do that with Intune, please follow [Enroll Windows devices for Microsoft Intune](https://docs.microsoft.com/intune/windows-enroll). For other MDM vendors, please consult your vendor for further details. +In order for your devices to be auto-enrolled into MDM management, MDM auto-enrollment needs to be configured in Azure AD. To do that with Intune, please see [Enroll Windows devices for Microsoft Intune](https://docs.microsoft.com/intune/windows-enroll). For other MDM vendors, please consult your vendor for further details. >[!NOTE] ->MDM Auto-enrollment requires an Azure AD Premium P1 or P2 subscription. \ No newline at end of file +>MDM auto-enrollment requires an Azure AD Premium P1 or P2 subscription. - - +