diff --git a/browsers/internet-explorer/ie11-deploy-guide/index.md b/browsers/internet-explorer/ie11-deploy-guide/index.md index 8fbae9d633..dfb9b8391c 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/index.md +++ b/browsers/internet-explorer/ie11-deploy-guide/index.md @@ -33,7 +33,7 @@ Because this content isn't intended to be a step-by-step guide, not all of the s ## In this guide |Topic |Description | |------|------------| -|[Change history for Internet Explorer 11](change-history-for-internet-explorer-11.md) |Lists new and updated topics in the Internet Explorer 11 documentation for both Windows 10. | +|[Change history for Internet Explorer 11](change-history-for-internet-explorer-11.md) |Lists new and updated topics in the Internet Explorer 11 documentation for Windows 10. | |[System requirements and language support for Internet Explorer 11 (IE11)](system-requirements-and-language-support-for-ie11.md) |IE11 is available for a number of systems and languages. This topic provides info about the minimum system requirements and language support. | |[List of updated features and tools - Internet Explorer 11 (IE11)](updated-features-and-tools-with-ie11.md) |IE11 includes several new features and tools. This topic includes high-level info about the each of them. | |[Install and Deploy Internet Explorer 11 (IE11)](install-and-deploy-ie11.md) |Use the topics in this section to learn how to customize your Internet Explorer installation package, how to choose the right method for installation, and how to deploy IE into your environment. You can also find more info about your virtualization options for legacy apps. | diff --git a/education/windows/deploy-windows-10-in-a-school-district.md b/education/windows/deploy-windows-10-in-a-school-district.md index 284dd660bf..09c8ad86fe 100644 --- a/education/windows/deploy-windows-10-in-a-school-district.md +++ b/education/windows/deploy-windows-10-in-a-school-district.md @@ -1577,7 +1577,7 @@ For more information about Intune, see [Microsoft Intune Documentation](/intune/ If you selected to deploy and manage apps by using Microsoft Endpoint Manager and Intune in a hybrid configuration, then skip this section and continue to the [Deploy and manage apps by using Microsoft Endpoint Configuration Manager](#deploy-and-manage-apps-by-using-microsoft-endpoint-configuration-manager) section. -You can use Intune to deploy Microsoft Store and Windows desktop apps. Intune provides improved control over which users receive specific apps. In addition, Intune allows you to deploy apps to companion devices (such as iOS, or Android devices). Finally, Intune helps you manage app security and features, such as mobile application management policies that let you manage apps on devices that are not enrolled in Intune or that another solution manages. +You can use Intune to deploy Microsoft Store and Windows desktop apps. Intune provides improved control over which users receive specific apps. In addition, Intune allows you to deploy apps to companion devices (such as iOS or Android devices). Finally, Intune helps you manage app security and features, such as mobile application management policies that let you manage apps on devices that are not enrolled in Intune or that another solution manages. For more information about how to configure Intune to manage your apps, see the following resources: diff --git a/education/windows/index.md b/education/windows/index.md index e41546c523..9db6cd7672 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -18,29 +18,63 @@ ms.date: 10/13/2017 ## ![Learn more about Windows.](images/education.png) Learn -

Windows 10 editions for education customers
Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: Windows 10 Pro Education and Windows 10 Education. These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments.

-

Compare each Windows edition
Find out more about the features and functionality we support in each edition of Windows.

-

Get Windows 10 Education or Windows 10 Pro Education
When you've made your decision, find out how to buy Windows for your school.

+**[Windows 10 editions for education customers](windows-editions-for-education-customers.md)** + +Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: Windows 10 Pro Education and Windows 10 Education. These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments. + +**[Compare each Windows edition](https://www.microsoft.com/WindowsForBusiness/Compare)** + +Find out more about the features and functionality we support in each edition of Windows. + +**[Get Windows 10 Education or Windows 10 Pro Education](https://www.microsoft.com/education/buy-license/overview-of-how-to-buy/default.aspx?tabshow=schools)** + +When you've made your decision, find out how to buy Windows for your school. ## ![Plan for Windows 10 in your school.](images/clipboard.png) Plan -

Windows 10 configuration recommendations for education customers
Provides guidance on ways to customize the OS diagnostic data, consumer experiences, Cortana, search, and some of the preinstalled apps, so that Windows is ready for your school.

-

Deployment recommendations for school IT administrators
Learn how to customize the OS privacy settings, Skype, and Xbox for Windows-based devices used in schools so that you can choose what information is shared with Microsoft.

-Get Minecraft Education Edition
Minecraft Education Edition is built for learning. Learn how to get early access and add it to your Microsoft Store for Business for distribution.

-

Take tests in Windows 10
Take a Test is a new app that lets you create the right environment for taking tests. Learn how to use and get it set up.

-

Chromebook migration guide
Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment.

+**[Windows 10 configuration recommendations for education customers](configure-windows-for-education.md)** + +Provides guidance on ways to customize the OS diagnostic data, consumer experiences, Cortana, search, and some of the preinstalled apps, so that Windows is ready for your school. + +**[Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)** + +Learn how to customize the OS privacy settings, Skype, and Xbox for Windows-based devices used in schools so that you can choose what information is shared with Microsoft. + +**[Get Minecraft Education Edition](get-minecraft-for-education.md)** + +Minecraft Education Edition is built for learning. Learn how to get early access and add it to your Microsoft Store for Business for distribution. + +**[Take tests in Windows 10](take-tests-in-windows-10.md)** + +Take a Test is a new app that lets you create the right environment for taking tests. Learn how to use and get it set up. + +**[Chromebook migration guide](chromebook-migration-guide.md)** + +Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment. ## ![Deploy Windows 10 for Education.](images/PCicon.png) Deploy -

Set up Windows devices for education
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.

-

Deploy Windows 10 in a school
Get step-by-step guidance to help you deploy Windows 10 in a school environment.

-

Deploy Windows 10 in a school district
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 Windows 10 S on various Windows 10 devices (except Windows 10 Home) in your school and share your feedback with us.

+**[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. + +**[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 various 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 -

Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S
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.

+**[Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](change-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. ## Windows 8.1 @@ -55,6 +89,7 @@ Follow these links to find step-by-step guidance on how to deploy Windows 8.1 in

Windows To Go
Learn about the benefits, limitations, and processes involved in deploying Windows To Go.

## Related articles + - [Microsoft Education documentation and resources](/education) - [Windows for business](https://www.microsoft.com/windows/business) - [Microsoft 365 for business](https://www.microsoft.com/microsoft-365/business) diff --git a/smb/cloud-mode-business-setup.md b/smb/cloud-mode-business-setup.md index 6b2ca27ccd..50f1527699 100644 --- a/smb/cloud-mode-business-setup.md +++ b/smb/cloud-mode-business-setup.md @@ -78,7 +78,7 @@ If you're new at setting up Office 365, and you'd like to see how it's done, you **Figure 2** - Microsoft 365 admin center - ![Microsoft 365 admin center.](images/office365_portal.png) + ![Opens the Microsoft 365 admin center.](images/office365_portal.png) 6. Select the **Admin** tile to go to the admin center. @@ -88,7 +88,7 @@ If you're new at setting up Office 365, and you'd like to see how it's done, you **Figure 3** - Admin center - ![Microsoft 365 admin center.](images/office365_admin_portal.png) + ![Complete the Office 365 setup in the Microsoft 365 admin center.](images/office365_admin_portal.png) 8. Go back to the admin center to add or buy a domain.