From 99b418b2aa17b65f8f142322a94502b89940cda3 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Thu, 11 May 2017 23:12:47 -0400 Subject: [PATCH 01/16] Update windows-spotlight.md Added 1703 warning for lock-screen Group Policy. --- windows/configuration/windows-spotlight.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windows/configuration/windows-spotlight.md b/windows/configuration/windows-spotlight.md index 42bb79449f..381022081c 100644 --- a/windows/configuration/windows-spotlight.md +++ b/windows/configuration/windows-spotlight.md @@ -69,6 +69,8 @@ Windows Spotlight is enabled by default. Windows 10 provides Group Policy and mo >[!WARNING] > In Windows 10, version 1607, the **Force a specific default lock screen image** policy setting will prevent users from changing the lock screen image. This behavior will be corrected in a future release. +> +> In Windows 10, version 1703, the **Force a specific default lock screen image** policy setting applies only intermittently and may not produce expected results. This behavior will be corrected in a future release. ![lockscreen policy details](images/lockscreenpolicy.png) From e2cb1bad164d68dd674c0f41dd9d431e6181a50f Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Fri, 28 Jul 2017 15:59:28 -0700 Subject: [PATCH 02/16] changed the index for the Microsoft 365 hub --- microsoft-365/index.md | 70 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/microsoft-365/index.md b/microsoft-365/index.md index a6053ce471..6627665e7b 100644 --- a/microsoft-365/index.md +++ b/microsoft-365/index.md @@ -1 +1,69 @@ -# Placeholder! \ No newline at end of file +--- +layout: HubPage +hide_bc: true +author: v-kents +ms.author: celested +ms.topic: hub-page +title: Microsoft 365 Documentation +description: Microsoft 365 is a complete, intelligent solution, including Office 365, Windows 10, and Enterprise Mobility + Security, that empowers everyone to be creative and work together, securely. + +--- + \ No newline at end of file From cd7415ef582a8ef36836108de5bdf573ffc5e36c Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Fri, 28 Jul 2017 16:08:57 -0700 Subject: [PATCH 03/16] updated --- microsoft-365/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/microsoft-365/index.md b/microsoft-365/index.md index 6627665e7b..9680f85fcc 100644 --- a/microsoft-365/index.md +++ b/microsoft-365/index.md @@ -6,7 +6,6 @@ ms.author: celested ms.topic: hub-page title: Microsoft 365 Documentation description: Microsoft 365 is a complete, intelligent solution, including Office 365, Windows 10, and Enterprise Mobility + Security, that empowers everyone to be creative and work together, securely. - ---
From b3d95d7f7c72d435ba9248b9acd0ecbe3a34e20e Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Tue, 1 Aug 2017 13:30:18 -0700 Subject: [PATCH 04/16] removed dupe Win10S link and commented out link that no longer has a lab active --- education/windows/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/education/windows/index.md b/education/windows/index.md index 705b3402b8..b4ea1b4fef 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -41,11 +41,12 @@ ms.author: celested ## ![Deploy Windows 10 for Education](images/PCicon.png) Deploy

[Set up Windows devices for education](set-up-windows-10.md)
Depending on your school's device management needs, you can use the Set up School PCs app or the Windows Configuration Designer tool to quickly set up student PCs.

-

[Test Windows 10 S on existing Windows 10 education devices](test-windows10s-for-edu.md)
Test Windows 10 S on existing Windows 10 Pro or Windows 10 Pro Education devices.

[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
Get step-by-step guidance to help you deploy Windows 10 in a school environment.

[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.

[Test Windows 10 S on existing Windows 10 education devices](test-windows10s-for-edu.md)
Test Windows 10 S on a variety of Windows 10 devices (except Windows 10 Home) in your school and share your feedback with us.

+ ## ![Switch to Windows 10 for Education](images/windows.png) Switch From 1d0ccd9a5808b71ab6538350be3ed10bfa970074 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Tue, 1 Aug 2017 14:15:49 -0700 Subject: [PATCH 05/16] updated --- education/windows/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/education/windows/index.md b/education/windows/index.md index b4ea1b4fef..aefd20431d 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -48,6 +48,7 @@ ms.author: celested

Try it out: Windows 10 deployment (for education)
Learn how to upgrade devices running the Windows 7 operating system to Windows 10 Anniversary Update, and how to manage devices, apps, and users in Windows 10 Anniversary Update.

For the best experience, use this guide in tandem with the TechNet Virtual Lab: IT Pro Try-It-Out.

--> + ## ![Switch to Windows 10 for Education](images/windows.png) Switch

[Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md)
If you have an education tenant and use Windows 10 Pro or Windows 10 S in your schools, find out how you can opt-in to a free switch to Windows 10 Pro Education.

From 1556bc43864f3517faf2bf5fb68aa404de5382a9 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Tue, 1 Aug 2017 14:44:22 -0700 Subject: [PATCH 06/16] updated --- education/windows/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/education/windows/index.md b/education/windows/index.md index aefd20431d..b4ea1b4fef 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -48,7 +48,6 @@ ms.author: celested

Try it out: Windows 10 deployment (for education)
Learn how to upgrade devices running the Windows 7 operating system to Windows 10 Anniversary Update, and how to manage devices, apps, and users in Windows 10 Anniversary Update.

For the best experience, use this guide in tandem with the TechNet Virtual Lab: IT Pro Try-It-Out.

--> - ## ![Switch to Windows 10 for Education](images/windows.png) Switch

[Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md)
If you have an education tenant and use Windows 10 Pro or Windows 10 S in your schools, find out how you can opt-in to a free switch to Windows 10 Pro Education.

From 8dc4561a5df0ffd98ddf4c375dc944c7fe1fa8f6 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Tue, 1 Aug 2017 14:44:29 -0700 Subject: [PATCH 07/16] revised Explain text --- .../accounts-administrator-account-status.md | 8 ++++---- .../security-policy-settings/security-options.md | 1 + .../shutdown-clear-virtual-memory-pagefile.md | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/windows/device-security/security-policy-settings/accounts-administrator-account-status.md b/windows/device-security/security-policy-settings/accounts-administrator-account-status.md index 5a3cde966e..9d0427bb2e 100644 --- a/windows/device-security/security-policy-settings/accounts-administrator-account-status.md +++ b/windows/device-security/security-policy-settings/accounts-administrator-account-status.md @@ -20,16 +20,14 @@ Describes the best practices, location, values, and security considerations for This security setting determines whether the local administrator account is enabled or disabled. -If you try to enable the administrator account after it has been disabled, and if the current administrator password does not meet the password requirements, you cannot enable the account. In this case, an alternative member of the Administrators group must reset the password on the administrator account. - -If you disable this policy setting, and one of the following conditions exists on the computer, the administrator account is not disabled. +The following conditions prevent disabling the administrator account, even if this security setting is disabled. 1. No other local administrator account exists 2. The administrator account is currently in use 3. All other local administrator accounts are: 1. Disabled 2. Listed in the [Deny log on locally](deny-log-on-locally.md) User Rights Assignment -If the current administrator password does not meet the password requirements, you will not be able to enable the administrator account again after it has been disabled. In this case, another member of the Administrators group must set the password on the administrator account. +If the administrator account is disabled, you cannot enable it if the password does not meet requirements. In this case, another member of the Administrators group must reset the password. ### Possible values - Enabled @@ -51,12 +49,14 @@ Computer Configuration\\Windows Settings\\Security Settings\\Local Policies\\Sec The following table lists the actual and effective default values for this policy. Default values are also listed on the policy’s property page. | Server type or GPO | Default value | +| - | - | | Default Domain Policy | Not defined | | Default Domain Controller Policy |Not defined | | Stand-Alone Server Default Settings | Enabled | | DC Effective Default Settings | Enabled | | Member Server Effective Default Settings | Enabled | | Client Computer Effective Default Settings | Disabled | +   ## Policy management diff --git a/windows/device-security/security-policy-settings/security-options.md b/windows/device-security/security-policy-settings/security-options.md index b4896738f7..dc499508d8 100644 --- a/windows/device-security/security-policy-settings/security-options.md +++ b/windows/device-security/security-policy-settings/security-options.md @@ -53,6 +53,7 @@ For info about setting security policies, see [Configure security policy setting | [Domain member: Maximum machine account password age](domain-member-maximum-machine-account-password-age.md) |Describes the best practices, location, values, and security considerations for the **Domain member: Maximum machine account password age** security policy setting.| |[Domain member: Require strong (Windows 2000 or later) session key](domain-member-require-strong-windows-2000-or-later-session-key.md)| Describes the best practices, location, values, and security considerations for the **Domain member: Require strong (Windows 2000 or later) session key** security policy setting. | | [Interactive logon: Display user information when the session is locked](interactive-logon-display-user-information-when-the-session-is-locked.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Display user information when the session is locked** security policy setting. | +| [Interactive logon: Don't display last signed-in](interactive-logon-do-not-display-last-user-name.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Don't display last signed-in** security policy setting.| | [Interactive logon: Do not display last user name](interactive-logon-do-not-display-last-user-name.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not display last user name** security policy setting.| | [Interactive logon: Do not require CTRL+ALT+DEL](interactive-logon-do-not-require-ctrl-alt-del.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not require CTRL+ALT+DEL** security policy setting.| | [Interactive logon: Machine account lockout threshold](interactive-logon-machine-account-lockout-threshold.md) | Describes the best practices, location, values, management, and security considerations for the **Interactive logon: Machine account lockout threshold** security policy setting.| diff --git a/windows/device-security/security-policy-settings/shutdown-clear-virtual-memory-pagefile.md b/windows/device-security/security-policy-settings/shutdown-clear-virtual-memory-pagefile.md index 348aa4eb2d..16ed671235 100644 --- a/windows/device-security/security-policy-settings/shutdown-clear-virtual-memory-pagefile.md +++ b/windows/device-security/security-policy-settings/shutdown-clear-virtual-memory-pagefile.md @@ -9,7 +9,7 @@ ms.pagetype: security author: brianlic-msft --- -# Shutdown: Clear virtual memory pagefile - security policy setting +# Shutdown: Clear virtual memory pagefile **Applies to** - Windows 10 From 2b02dd51d23a89497d7b9e7eb50bcb3f954072f3 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 1 Aug 2017 21:45:27 +0000 Subject: [PATCH 08/16] Merged PR 2506: Restore AutoPilot topic to deployment TOC And add the topic to what's new and index. --- windows/deployment/TOC.md | 2 ++ windows/deployment/deploy-whats-new.md | 6 ++++++ windows/deployment/index.md | 1 + 3 files changed, 9 insertions(+) diff --git a/windows/deployment/TOC.md b/windows/deployment/TOC.md index caad0cb6b2..e367ff26c8 100644 --- a/windows/deployment/TOC.md +++ b/windows/deployment/TOC.md @@ -2,6 +2,7 @@ ## [What's new in Windows 10 deployment](deploy-whats-new.md) ## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) + ## [Windows 10 Enterprise Subscription Activation](windows-10-enterprise-subscription-activation.md) ### [Windows 10 Enterprise E3 in CSP](windows-10-enterprise-e3-overview.md) ### [Configure VDA for Enterprise Subscription Activation](vda-subscription-activation.md) @@ -9,6 +10,7 @@ ## [Resolve Windows 10 upgrade errors](upgrade/resolve-windows-10-upgrade-errors.md) ## [Deploy Windows 10](deploy.md) +### [Overview of Windows AutoPilot](windows-10-auto-pilot.md) ### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) ### [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) diff --git a/windows/deployment/deploy-whats-new.md b/windows/deployment/deploy-whats-new.md index f9d589c6b8..fddacf3a05 100644 --- a/windows/deployment/deploy-whats-new.md +++ b/windows/deployment/deploy-whats-new.md @@ -35,6 +35,12 @@ For more information, see [Windows 10 Enterprise E3 in CSP](windows-10-enterpris ## Deployment solutions and tools +### Windows AutoPilot + +Windows AutoPilot streamlines and automates the process of setting up and configuring new devices, with minimal interaction required from the end user. You can also use Windows AutoPilot to reset, repurpose and recover devices. + +Windows AutoPilot joins devices to Azure Active Directory (Azure AD), optionally enrolls into MDM services, configures security policies, and sets a custom out-of-box-experience (OOBE) for the end user. For more information, see [Overview of Windows AutoPilot](windows-10-auto-pilot.md). + ### Upgrade Readiness The Upgrade Readiness tool moved from public preview to general availability on March 2, 2017. diff --git a/windows/deployment/index.md b/windows/deployment/index.md index b32e2d7095..0c8e252f29 100644 --- a/windows/deployment/index.md +++ b/windows/deployment/index.md @@ -27,6 +27,7 @@ Windows 10 upgrade options are discussed and information is provided about plann |Topic |Description | |------|------------| +|[Overview of Windows AutoPilot](windows-10-auto-pilot.md) |Windows AutoPilot deployment is a new cloud service from Microsoft that provides a zero touch experience for deploying Windows 10 devices. | |[Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) |This topic provides information about support for upgrading directly to Windows 10 from a previous operating system. | |[Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) |This topic provides information about support for upgrading from one edition of Windows 10 to another. | |[Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md) |With Upgrade Readiness, enterprises now have the tools to plan and manage the upgrade process end to end, allowing them to adopt new Windows releases more quickly. With Windows telemetry enabled, Upgrade Readiness collects system, application, and driver data for analysis. We then identify compatibility issues that can block an upgrade and suggest fixes when they are known to Microsoft. The Upgrade Readiness workflow steps you through the discovery and rationalization process until you have a list of computers that are ready to be upgraded. | From 7947abe7819f10c70c6c413bc3c55c186eadbd4b Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Tue, 1 Aug 2017 14:46:26 -0700 Subject: [PATCH 09/16] updated to try and fix funky switch formatting --- education/windows/index.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/education/windows/index.md b/education/windows/index.md index b4ea1b4fef..e84bfe7051 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -44,9 +44,6 @@ ms.author: celested

[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
Get step-by-step guidance to help you deploy Windows 10 in a school environment.

[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.

[Test Windows 10 S on existing Windows 10 education devices](test-windows10s-for-edu.md)
Test Windows 10 S on a variety of Windows 10 devices (except Windows 10 Home) in your school and share your feedback with us.

- ## ![Switch to Windows 10 for Education](images/windows.png) Switch @@ -68,3 +65,7 @@ Follow these links to find step-by-step guidance on how to deploy Windows 8.1 in ## Related topics - [Microsoft Education documentation and resources](https://docs.microsoft.com/education) - [Windows 10 and Windows 10 Mobile](https://technet.microsoft.com/itpro/windows/index) + + From 1b3a212f2e3963ae9ba76654038e503a6e10b3b1 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Tue, 1 Aug 2017 14:53:14 -0700 Subject: [PATCH 10/16] revised Explain text --- .../security-policy-settings/security-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/device-security/security-policy-settings/security-options.md b/windows/device-security/security-policy-settings/security-options.md index dc499508d8..ef8b7caae4 100644 --- a/windows/device-security/security-policy-settings/security-options.md +++ b/windows/device-security/security-policy-settings/security-options.md @@ -54,7 +54,7 @@ For info about setting security policies, see [Configure security policy setting |[Domain member: Require strong (Windows 2000 or later) session key](domain-member-require-strong-windows-2000-or-later-session-key.md)| Describes the best practices, location, values, and security considerations for the **Domain member: Require strong (Windows 2000 or later) session key** security policy setting. | | [Interactive logon: Display user information when the session is locked](interactive-logon-display-user-information-when-the-session-is-locked.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Display user information when the session is locked** security policy setting. | | [Interactive logon: Don't display last signed-in](interactive-logon-do-not-display-last-user-name.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Don't display last signed-in** security policy setting.| -| [Interactive logon: Do not display last user name](interactive-logon-do-not-display-last-user-name.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not display last user name** security policy setting.| +| [Interactive logon: Don't dispplay username at sign-in](interactive-logon-dont-display-username-at-sign-in.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not display username at sign-in** security policy setting.| | [Interactive logon: Do not require CTRL+ALT+DEL](interactive-logon-do-not-require-ctrl-alt-del.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not require CTRL+ALT+DEL** security policy setting.| | [Interactive logon: Machine account lockout threshold](interactive-logon-machine-account-lockout-threshold.md) | Describes the best practices, location, values, management, and security considerations for the **Interactive logon: Machine account lockout threshold** security policy setting.| | [Interactive logon: Machine inactivity limit](interactive-logon-machine-inactivity-limit.md)| Describes the best practices, location, values, management, and security considerations for the **Interactive logon: Machine inactivity limit** security policy setting.| From 87ea3ac48565101aaa029bae9ff7d9febf6c0a47 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Tue, 1 Aug 2017 14:54:34 -0700 Subject: [PATCH 11/16] typo --- .../security-policy-settings/security-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/device-security/security-policy-settings/security-options.md b/windows/device-security/security-policy-settings/security-options.md index ef8b7caae4..e8cba42ee3 100644 --- a/windows/device-security/security-policy-settings/security-options.md +++ b/windows/device-security/security-policy-settings/security-options.md @@ -54,7 +54,7 @@ For info about setting security policies, see [Configure security policy setting |[Domain member: Require strong (Windows 2000 or later) session key](domain-member-require-strong-windows-2000-or-later-session-key.md)| Describes the best practices, location, values, and security considerations for the **Domain member: Require strong (Windows 2000 or later) session key** security policy setting. | | [Interactive logon: Display user information when the session is locked](interactive-logon-display-user-information-when-the-session-is-locked.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Display user information when the session is locked** security policy setting. | | [Interactive logon: Don't display last signed-in](interactive-logon-do-not-display-last-user-name.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Don't display last signed-in** security policy setting.| -| [Interactive logon: Don't dispplay username at sign-in](interactive-logon-dont-display-username-at-sign-in.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not display username at sign-in** security policy setting.| +| [Interactive logon: Don't display username at sign-in](interactive-logon-dont-display-username-at-sign-in.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not display username at sign-in** security policy setting.| | [Interactive logon: Do not require CTRL+ALT+DEL](interactive-logon-do-not-require-ctrl-alt-del.md)| Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not require CTRL+ALT+DEL** security policy setting.| | [Interactive logon: Machine account lockout threshold](interactive-logon-machine-account-lockout-threshold.md) | Describes the best practices, location, values, management, and security considerations for the **Interactive logon: Machine account lockout threshold** security policy setting.| | [Interactive logon: Machine inactivity limit](interactive-logon-machine-inactivity-limit.md)| Describes the best practices, location, values, management, and security considerations for the **Interactive logon: Machine inactivity limit** security policy setting.| From 7c1cb73007e34b519fcfaaed7c1212fb5a92835b Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Tue, 1 Aug 2017 14:59:18 -0700 Subject: [PATCH 12/16] typo --- .../accounts-administrator-account-status.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/windows/device-security/security-policy-settings/accounts-administrator-account-status.md b/windows/device-security/security-policy-settings/accounts-administrator-account-status.md index 9d0427bb2e..ed67dc80c4 100644 --- a/windows/device-security/security-policy-settings/accounts-administrator-account-status.md +++ b/windows/device-security/security-policy-settings/accounts-administrator-account-status.md @@ -18,16 +18,17 @@ Describes the best practices, location, values, and security considerations for ## Reference -This security setting determines whether the local administrator account is enabled or disabled. +This security setting determines whether the local Administrator account is enabled or disabled. -The following conditions prevent disabling the administrator account, even if this security setting is disabled. -1. No other local administrator account exists -2. The administrator account is currently in use -3. All other local administrator accounts are: +The following conditions prevent disabling the Administrator account, even if this security setting is disabled. + +1. The administrator account is currently in use +2. The Administrators group has no other members +3. All other members of the Administrator group are: 1. Disabled 2. Listed in the [Deny log on locally](deny-log-on-locally.md) User Rights Assignment -If the administrator account is disabled, you cannot enable it if the password does not meet requirements. In this case, another member of the Administrators group must reset the password. +If the Administrator account is disabled, you cannot enable it if the password does not meet requirements. In this case, another member of the Administrators group must reset the password. ### Possible values - Enabled From fcd92fcd7db0a70d9a65313b4c2c0118cd4583cc Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 1 Aug 2017 22:49:32 +0000 Subject: [PATCH 13/16] Merged PR 2513: Removed a redundant requirement bullet Removed a redundant requirement bullet --- .../windows-10-enterprise-subscription-activation.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/windows/deployment/windows-10-enterprise-subscription-activation.md b/windows/deployment/windows-10-enterprise-subscription-activation.md index 18be96b9ba..4df11b541b 100644 --- a/windows/deployment/windows-10-enterprise-subscription-activation.md +++ b/windows/deployment/windows-10-enterprise-subscription-activation.md @@ -78,10 +78,7 @@ When you have the required Azure AD subscription, group-based licensing is the p ### Existing Enterprise deployments -If you have already deployed Windows 10 Enterprise, but you want to move away from depending on KMS servers and MAK keys for Windows client machines, you are able to seamlessly transition as long as the following requirements are met: - -- Hardware generation is Windows 8 or later -- The computer has been activated with a firmware-embedded Windows 10 Pro product key +If you have already deployed Windows 10 Enterprise, but you want to move away from depending on KMS servers and MAK keys for Windows client machines, you are able to seamlessly transition as long as the computer has been activated with a firmware-embedded Windows 10 Pro product key. If the computer has never been activated with a Pro key, run the following script. Copy the text below into a .cmd file and run the file from an elevated command prompt: From 03f734a8ae7234990739359d6b95667488d9d277 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Tue, 1 Aug 2017 16:18:53 -0700 Subject: [PATCH 14/16] typo --- .../accounts-administrator-account-status.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/device-security/security-policy-settings/accounts-administrator-account-status.md b/windows/device-security/security-policy-settings/accounts-administrator-account-status.md index ed67dc80c4..aa07230763 100644 --- a/windows/device-security/security-policy-settings/accounts-administrator-account-status.md +++ b/windows/device-security/security-policy-settings/accounts-administrator-account-status.md @@ -22,9 +22,9 @@ This security setting determines whether the local Administrator account is enab The following conditions prevent disabling the Administrator account, even if this security setting is disabled. -1. The administrator account is currently in use +1. The Administrator account is currently in use 2. The Administrators group has no other members -3. All other members of the Administrator group are: +3. All other members of the Administrators group are: 1. Disabled 2. Listed in the [Deny log on locally](deny-log-on-locally.md) User Rights Assignment From 20e92b74f1f1b3c2d6c52c7fdae18a89c1a90671 Mon Sep 17 00:00:00 2001 From: Maricia Alforque Date: Wed, 2 Aug 2017 16:05:00 +0000 Subject: [PATCH 15/16] Merged PR 2508: DynamicManagement CSP is supported in Windows 10 mobile 12699415 DynamicManagement CSP is supported in Mobile SKU in RS3 --- .../mdm/configuration-service-provider-reference.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md index f5bba14384..f619993de2 100644 --- a/windows/client-management/mdm/configuration-service-provider-reference.md +++ b/windows/client-management/mdm/configuration-service-provider-reference.md @@ -840,8 +840,8 @@ Footnotes: cross mark check mark2 check mark2 - cross mark - cross mark + check mark3 + check mark3 From dc056a1a6d3ea5fb33cd911125f8e09b39b75608 Mon Sep 17 00:00:00 2001 From: Nicholas Brower Date: Wed, 2 Aug 2017 17:46:26 +0000 Subject: [PATCH 16/16] Merged PR 2520: removing SKU support for Games/ policy removing SKU support for Games/ policy --- .../client-management/mdm/policy-csp-games.md | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/windows/client-management/mdm/policy-csp-games.md b/windows/client-management/mdm/policy-csp-games.md index 2ee49e217d..5cb47e7195 100644 --- a/windows/client-management/mdm/policy-csp-games.md +++ b/windows/client-management/mdm/policy-csp-games.md @@ -23,26 +23,6 @@ ms.date: 07/14/2017 **Games/AllowAdvancedGamingServices** - - - - - - - - - - - - - - - - - - - -
HomeProBusinessEnterpriseEducationMobileMobile Enterprise
check mark1check mark1check mark1check mark1check mark1check mark1