diff --git a/education/windows/index.md b/education/windows/index.md index 705b3402b8..e84bfe7051 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -41,11 +41,9 @@ 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.

-

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 @@ -67,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) + + diff --git a/microsoft-365/index.md b/microsoft-365/index.md index a6053ce471..9680f85fcc 100644 --- a/microsoft-365/index.md +++ b/microsoft-365/index.md @@ -1 +1,68 @@ -# 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. +--- +
+
+

Microsoft 365 Documentation

+ +
+
\ No newline at end of file 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 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
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: 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..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 @@ -18,18 +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. -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. +The following conditions prevent disabling the Administrator account, even if this security setting is disabled. -If you disable this policy setting, and one of the following conditions exists on the computer, the administrator account is not disabled. -1. No other local administrator account exists -2. The administrator account is currently in use -3. All other local administrator accounts are: +1. The Administrator account is currently in use +2. The Administrators group has no other members +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 -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 +50,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..e8cba42ee3 100644 --- a/windows/device-security/security-policy-settings/security-options.md +++ b/windows/device-security/security-policy-settings/security-options.md @@ -53,7 +53,8 @@ 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: 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 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 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.| 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