From a525209dea6fce55825ccc05d82ca82beaa110c2 Mon Sep 17 00:00:00 2001 From: Mandi Ohlinger Date: Tue, 5 Oct 2021 12:56:40 -0400 Subject: [PATCH 1/5] Update index.yml --- windows/hub/index.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/windows/hub/index.yml b/windows/hub/index.yml index 3d697a0ce8..67be6734bf 100644 --- a/windows/hub/index.yml +++ b/windows/hub/index.yml @@ -50,6 +50,18 @@ productDirectory: imageSrc: /windows/resources/images/winlogo.svg summary: See the system requirements for Windows 11, including running Windows 11 on a virtual machine url: /windows/whats-new/windows-11-requirements + - title: Compare Windows 11 Editions + imageSrc: /windows/resources/images/winlogo.svg + summary: Get more information on the edition that's right for your organization + url: https://www.microsoft.com/windows/business/compare-windows-11 + - title: FAQ: Upgrade to Windows 11 + imageSrc: /windows/resources/images/winlogo.svg + summary: See some common questions and answers when upgrading to Windows 11 + url: https://support.microsoft.com/windows/upgrade-to-windows-11-faq-fb6206a2-1a0f-448a-80f1-8668ee5b2bf9 + - title: Windows 11 chip to cloud protection: Security challenges of hybrid work + imageSrc: /windows/resources/images/winlogo.svg + summary: Blog from the Microsoft Windows Security Team + url: https://www.microsoft.com/security/blog/2021/10/04/windows-11-offers-chip-to-cloud-protection-to-meet-the-new-security-challenges-of-hybrid-work - title: Trusted Platform Module (TPM) imageSrc: /windows/resources/images/winlogo.svg summary: Learn more about TPM, and why it's a good thing @@ -135,6 +147,9 @@ conceptualContent: - url: /windows/application-management/remove-provisioned-apps-during-update itemType: how-to-guide text: Keep removed apps from returning during an update + - url: https://blogs.windows.com/windowsdeveloper/2021/10/04/developing-for-windows-11/ + itemType: blog + text: Blog: Develop apps for Windows 11 # Card - title: Client management @@ -244,4 +259,4 @@ additionalContent: - text: Get started with Windows Server url: /windows-server/get-started/get-started-with-windows-server - text: Windows Server blog - url: https://cloudblogs.microsoft.com/windowsserver/ \ No newline at end of file + url: https://cloudblogs.microsoft.com/windowsserver/ From ddba34ce0b284151a0be029adf6f664983c825ba Mon Sep 17 00:00:00 2001 From: Mandi Ohlinger Date: Tue, 5 Oct 2021 12:59:11 -0400 Subject: [PATCH 2/5] Replaced colon --- windows/hub/index.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/hub/index.yml b/windows/hub/index.yml index 67be6734bf..e0bf68fd93 100644 --- a/windows/hub/index.yml +++ b/windows/hub/index.yml @@ -54,7 +54,7 @@ productDirectory: imageSrc: /windows/resources/images/winlogo.svg summary: Get more information on the edition that's right for your organization url: https://www.microsoft.com/windows/business/compare-windows-11 - - title: FAQ: Upgrade to Windows 11 + - title: FAQ - Upgrade to Windows 11 imageSrc: /windows/resources/images/winlogo.svg summary: See some common questions and answers when upgrading to Windows 11 url: https://support.microsoft.com/windows/upgrade-to-windows-11-faq-fb6206a2-1a0f-448a-80f1-8668ee5b2bf9 From ed95e8305b008eb67e4ad9fa0d49ce7604483371 Mon Sep 17 00:00:00 2001 From: Mandi Ohlinger Date: Tue, 5 Oct 2021 13:02:02 -0400 Subject: [PATCH 3/5] Replaced colons --- windows/hub/index.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/hub/index.yml b/windows/hub/index.yml index e0bf68fd93..78210cc37c 100644 --- a/windows/hub/index.yml +++ b/windows/hub/index.yml @@ -58,7 +58,7 @@ productDirectory: imageSrc: /windows/resources/images/winlogo.svg summary: See some common questions and answers when upgrading to Windows 11 url: https://support.microsoft.com/windows/upgrade-to-windows-11-faq-fb6206a2-1a0f-448a-80f1-8668ee5b2bf9 - - title: Windows 11 chip to cloud protection: Security challenges of hybrid work + - title: Windows 11 chip to cloud protection - Security challenges of hybrid work imageSrc: /windows/resources/images/winlogo.svg summary: Blog from the Microsoft Windows Security Team url: https://www.microsoft.com/security/blog/2021/10/04/windows-11-offers-chip-to-cloud-protection-to-meet-the-new-security-challenges-of-hybrid-work @@ -149,7 +149,7 @@ conceptualContent: text: Keep removed apps from returning during an update - url: https://blogs.windows.com/windowsdeveloper/2021/10/04/developing-for-windows-11/ itemType: blog - text: Blog: Develop apps for Windows 11 + text: Blog - Develop apps for Windows 11 # Card - title: Client management From be2b46ea7073f02d471a7c0a630bdb55f86bf90d Mon Sep 17 00:00:00 2001 From: Mandi Ohlinger Date: Tue, 5 Oct 2021 13:05:31 -0400 Subject: [PATCH 4/5] Updated itemType --- windows/hub/index.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/hub/index.yml b/windows/hub/index.yml index 78210cc37c..92b6a6bdcd 100644 --- a/windows/hub/index.yml +++ b/windows/hub/index.yml @@ -148,7 +148,7 @@ conceptualContent: itemType: how-to-guide text: Keep removed apps from returning during an update - url: https://blogs.windows.com/windowsdeveloper/2021/10/04/developing-for-windows-11/ - itemType: blog + itemType: overview text: Blog - Develop apps for Windows 11 # Card From 6802d42e96de930973134cccf2ddbc88f0d612a5 Mon Sep 17 00:00:00 2001 From: Mandi Ohlinger Date: Tue, 5 Oct 2021 14:16:36 -0400 Subject: [PATCH 5/5] Added Win11 Enterprise link --- windows/hub/index.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/hub/index.yml b/windows/hub/index.yml index 92b6a6bdcd..9c115c5b15 100644 --- a/windows/hub/index.yml +++ b/windows/hub/index.yml @@ -50,10 +50,10 @@ productDirectory: imageSrc: /windows/resources/images/winlogo.svg summary: See the system requirements for Windows 11, including running Windows 11 on a virtual machine url: /windows/whats-new/windows-11-requirements - - title: Compare Windows 11 Editions + - title: Learn more about Windows 11 Enterprise imageSrc: /windows/resources/images/winlogo.svg - summary: Get more information on the edition that's right for your organization - url: https://www.microsoft.com/windows/business/compare-windows-11 + summary: Get more information on the features, security, and licensing plans designed for organizations + url: https://www.microsoft.com/microsoft-365/windows/windows-11-enterprise - title: FAQ - Upgrade to Windows 11 imageSrc: /windows/resources/images/winlogo.svg summary: See some common questions and answers when upgrading to Windows 11