From 9aa14dc2b6a4cd5385a62df265a84a4d81508c6e Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Wed, 8 Mar 2017 16:24:52 -0800 Subject: [PATCH 1/8] Update index.md Added localizationpriority in metadata so that this gets picked up by Loc team for next loc handoff. This will fix the broken experience for international customers when we did the redirect --- education/windows/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/education/windows/index.md b/education/windows/index.md index f8db1c0562..2be638bb44 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -1,3 +1,4 @@ + --- title: Windows 10 for Education (Windows 10) description: Learn how to use Windows 10 in schools. @@ -6,6 +7,7 @@ ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library ms.pagetype: edu +localizationpriority: high author: CelesteDG --- From d0e314b667ec5add7ee804af698250271a672b13 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Wed, 8 Mar 2017 16:26:58 -0800 Subject: [PATCH 2/8] Update index.md Fixed the extra characters that always get added by GitHub when I edit through the Web UI --- education/windows/index.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/education/windows/index.md b/education/windows/index.md index 2be638bb44..554d36336b 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -65,12 +65,8 @@ author: CelesteDG

[Upgrade Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md)
If you have an education tenant and use Windows 10 Pro in your schools now, find out how you can opt-in to a free upgrade to Windows 10 Pro Education.

-<<<<<<< HEAD -
-

-======= +

->>>>>>> e04a8c5905ed4bcb1df7b6b60d48146df9095a12
From 4e46d112f5e9a24f566096b9aad4a8eb0164efaa Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Wed, 8 Mar 2017 16:27:55 -0800 Subject: [PATCH 3/8] Update index.md --- education/windows/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/education/windows/index.md b/education/windows/index.md index 554d36336b..fadd9b2b74 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -1,4 +1,3 @@ - --- title: Windows 10 for Education (Windows 10) description: Learn how to use Windows 10 in schools. From 2fe1369def71c1f3379c0aaed98fffa725f519c5 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Wed, 8 Mar 2017 16:28:59 -0800 Subject: [PATCH 4/8] Update index.md --- education/windows/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/education/windows/index.md b/education/windows/index.md index fadd9b2b74..8697339d5d 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -58,7 +58,7 @@ author: CelesteDG

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.

-
+ ### ![Upgrade to Windows 10 for education](images/windows.png) Upgrade From 176a956d6df635d0bf9e319b99e1a3159b744785 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Wed, 8 Mar 2017 16:31:02 -0800 Subject: [PATCH 5/8] Update index.md --- education/windows/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/education/windows/index.md b/education/windows/index.md index 8697339d5d..1fa7bad868 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -24,7 +24,7 @@ author: CelesteDG

[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/en-us/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/en-us/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.

-
+/

How-to videos

+
### ![Upgrade to Windows 10 for education](images/windows.png) Upgrade @@ -67,7 +67,7 @@ author: CelesteDG

- + ## Windows 8.1 Follow these links to find step-by-step guidance on how to deploy Windows 8.1 in an academic environment. From d695b6b45b9af0fadc259b626c204455edd3593f Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Wed, 8 Mar 2017 16:36:03 -0800 Subject: [PATCH 6/8] Update index.md --- education/windows/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/education/windows/index.md b/education/windows/index.md index 1fa7bad868..3caf701e82 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -24,7 +24,7 @@ author: CelesteDG

[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/en-us/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/en-us/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.

-/
+

How-to videos

From 76dd710db2d80be2d04049674529a296a01d991d Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Wed, 8 Mar 2017 16:43:34 -0800 Subject: [PATCH 8/8] Update index.md --- education/windows/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/education/windows/index.md b/education/windows/index.md index af628fd1e2..bf4146606d 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -59,7 +59,7 @@ author: CelesteDG
- ### ![Upgrade to Windows 10 for education](images/windows.png) Upgrade +### ![Upgrade to Windows 10 for education](images/windows.png) Upgrade

[Upgrade Windows 10 Pro to Pro Education from Windows Store for Business](windows-10-pro-to-pro-edu-upgrade.md)
If you have an education tenant and use Windows 10 Pro in your schools now, find out how you can opt-in to a free upgrade to Windows 10 Pro Education.