From 760934a6e94ce88cf664e0be990e31d49e4e833e Mon Sep 17 00:00:00 2001 From: tiaraquan Date: Wed, 29 Jun 2022 17:41:53 -0700 Subject: [PATCH 01/10] Added new URLs. --- .../prepare/windows-autopatch-configure-network.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deployment/windows-autopatch/prepare/windows-autopatch-configure-network.md b/windows/deployment/windows-autopatch/prepare/windows-autopatch-configure-network.md index a1fb48b746..93a0fbe3bd 100644 --- a/windows/deployment/windows-autopatch/prepare/windows-autopatch-configure-network.md +++ b/windows/deployment/windows-autopatch/prepare/windows-autopatch-configure-network.md @@ -32,7 +32,7 @@ The Windows Autopatch URL is used for anything our service runs on the customer | Microsoft service | URLs required on allowlist | | ----- | ----- | -| Windows Autopatch | | +| Windows Autopatch | | ### Required Microsoft product endpoints From 0d8c35f1cf5f9f2fd3a0dcbb29644d7b29ef397b Mon Sep 17 00:00:00 2001 From: Aaron Czechowski Date: Thu, 30 Jun 2022 11:55:44 -0700 Subject: [PATCH 02/10] delete minecraft promotion article --- .openpublishing.redirection.json | 5 ++ .../windows/get-minecraft-device-promotion.md | 90 ------------------- 2 files changed, 5 insertions(+), 90 deletions(-) delete mode 100644 education/windows/get-minecraft-device-promotion.md diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index 9a87d541b5..04826145f2 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -19559,6 +19559,11 @@ "source_path": "windows/deployment/deploy-windows-mdt/deploy-a-windows-11-image-using-mdt.md", "redirect_url": "/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt", "redirect_document_id": false + }, + { + "source_path": "education/windows/get-minecraft-device-promotion.md", + "redirect_url": "/education/windows/get-minecraft-for-education", + "redirect_document_id": false } ] } diff --git a/education/windows/get-minecraft-device-promotion.md b/education/windows/get-minecraft-device-promotion.md deleted file mode 100644 index 258525651d..0000000000 --- a/education/windows/get-minecraft-device-promotion.md +++ /dev/null @@ -1,90 +0,0 @@ ---- -title: Get Minecraft Education Edition with your Windows 10 device promotion -description: Windows 10 device promotion for Minecraft Education Edition licenses -keywords: school, Minecraft, education edition -ms.prod: w10 -ms.mktglfcycl: plan -ms.sitesec: library -ms.localizationpriority: medium -author: dansimp -searchScope: - - Store -ms.author: dansimp -ms.date: 06/05/2018 -ms.reviewer: -manager: dansimp ---- - -# Get Minecraft: Education Edition with Windows 10 device promotion - -**Applies to:** - -- Windows 10 - -The **Minecraft: Education Edition** with Windows 10 device promotion ended January 31, 2018. - -Qualifying customers that received one-year subscriptions for Minecraft: Education Edition as part of this program and wish to continue using the game in their schools can purchase new subscriptions in Microsoft Store for Education. -For more information on purchasing Minecraft: Education Edition, see [Add Minecraft to your Store for Education](./school-get-minecraft.md?toc=%2fmicrosoft-store%2feducation%2ftoc.json). - ->[!Note] ->**Minecraft: Education Edition** with Windows 10 device promotion subscriptions are valid for 1 year from the time -of redemption. At the end of 1 year, the promotional subscriptions will expire and any people using these subscriptions will be reverted to a trial license of **Minecraft: Education Edition**. - -To prevent being reverted to a trial license, admins or teachers need to purchase new **Minecraft: Education Edition** subscriptions from Store for Education, and assign licenses to users who used a promotional subscription. - - - \ No newline at end of file From e30aa032818b7592e7b4a8343db1532f3f73cc34 Mon Sep 17 00:00:00 2001 From: Aaron Czechowski Date: Thu, 30 Jun 2022 12:01:59 -0700 Subject: [PATCH 03/10] remove minecraft promotion from TOC --- education/windows/TOC.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/education/windows/TOC.yml b/education/windows/TOC.yml index 3a592b8263..717ae6c902 100644 --- a/education/windows/TOC.yml +++ b/education/windows/TOC.yml @@ -53,8 +53,6 @@ href: teacher-get-minecraft.md - name: "For IT administrators: get Minecraft Education Edition" href: school-get-minecraft.md - - name: "Get Minecraft: Education Edition with Windows 10 device promotion" - href: get-minecraft-device-promotion.md - name: Test Windows 10 in S mode on existing Windows 10 education devices href: test-windows10s-for-edu.md - name: Enable Windows 10 in S mode on Surface Go devices From 07d2e54d883048371dcf12b2250944ad3bcc0933 Mon Sep 17 00:00:00 2001 From: Christopher McClister <5713373+cmcclister@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:37:18 -0700 Subject: [PATCH 04/10] Remove windows-update in .openpublishing.publish.config.json under main branch. --- .openpublishing.publish.config.json | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index c04926735a..6b0aff2a70 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -273,22 +273,6 @@ "build_entry_point": "docs", "template_folder": "_themes" }, - { - "docset_name": "windows-update", - "build_source_folder": "windows/update", - "build_output_subfolder": "windows-update", - "locale": "en-us", - "monikers": [], - "moniker_ranges": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes" - }, { "docset_name": "win-threat-protection", "build_source_folder": "windows/threat-protection", @@ -360,13 +344,13 @@ "Pdf" ] }, - "need_generate_pdf_url_template": true, "targets": { "Pdf": { "template_folder": "_themes.pdf" } }, "docs_build_engine": {}, + "need_generate_pdf_url_template": true, "contribution_branch_mappings": {}, "need_generate_pdf": false, "need_generate_intellisense": false From b87ca714a4deb815e33ec2cdec677d0ab22d221d Mon Sep 17 00:00:00 2001 From: Christopher McClister <5713373+cmcclister@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:37:40 -0700 Subject: [PATCH 05/10] Remove win-threat-protection in .openpublishing.publish.config.json under main branch. --- .openpublishing.publish.config.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 6b0aff2a70..2d771fbd37 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -273,22 +273,6 @@ "build_entry_point": "docs", "template_folder": "_themes" }, - { - "docset_name": "win-threat-protection", - "build_source_folder": "windows/threat-protection", - "build_output_subfolder": "win-threat-protection", - "locale": "en-us", - "monikers": [], - "moniker_ranges": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes" - }, { "docset_name": "win-whats-new", "build_source_folder": "windows/whats-new", From 1730a89084edad99371b485c7708a5042c96538c Mon Sep 17 00:00:00 2001 From: Christopher McClister <5713373+cmcclister@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:38:11 -0700 Subject: [PATCH 06/10] Remove release-information in .openpublishing.publish.config.json under main branch. --- .openpublishing.publish.config.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 2d771fbd37..1f93ea6915 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -81,22 +81,6 @@ "build_entry_point": "docs", "template_folder": "_themes" }, - { - "docset_name": "release-information", - "build_source_folder": "windows/release-information", - "build_output_subfolder": "release-information", - "locale": "en-us", - "monikers": [], - "moniker_ranges": [], - "open_to_public_contributors": false, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes" - }, { "docset_name": "smb", "build_source_folder": "smb", From 861ae2072f1cf18eb6e10577123f0eb9a639a105 Mon Sep 17 00:00:00 2001 From: Christopher McClister <5713373+cmcclister@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:38:30 -0700 Subject: [PATCH 07/10] Remove windows-plan in .openpublishing.publish.config.json under main branch. --- .openpublishing.publish.config.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 1f93ea6915..a1acf6deeb 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -209,22 +209,6 @@ "build_entry_point": "docs", "template_folder": "_themes" }, - { - "docset_name": "windows-plan", - "build_source_folder": "windows/plan", - "build_output_subfolder": "windows-plan", - "locale": "en-us", - "monikers": [], - "moniker_ranges": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes" - }, { "docset_name": "windows-privacy", "build_source_folder": "windows/privacy", From aa44479381967fe075566234be157bc0373abca0 Mon Sep 17 00:00:00 2001 From: Christopher McClister <5713373+cmcclister@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:38:45 -0700 Subject: [PATCH 08/10] Remove keep-secure in .openpublishing.publish.config.json under main branch. --- .openpublishing.publish.config.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index a1acf6deeb..e9a52b9400 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -49,22 +49,6 @@ "build_entry_point": "docs", "template_folder": "_themes" }, - { - "docset_name": "keep-secure", - "build_source_folder": "windows/keep-secure", - "build_output_subfolder": "keep-secure", - "locale": "en-us", - "monikers": [], - "moniker_ranges": [], - "open_to_public_contributors": false, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes" - }, { "docset_name": "microsoft-edge", "build_source_folder": "browsers/edge", From 84828bfcb7178214fe7e22a1e8c0f0c0dd8d4b9d Mon Sep 17 00:00:00 2001 From: Christopher McClister <5713373+cmcclister@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:39:19 -0700 Subject: [PATCH 09/10] Remove hololens in .openpublishing.publish.config.json under main branch. --- .openpublishing.publish.config.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index e9a52b9400..253a70b3bf 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -17,22 +17,6 @@ "build_entry_point": "docs", "template_folder": "_themes" }, - { - "docset_name": "hololens", - "build_source_folder": "devices/hololens", - "build_output_subfolder": "hololens", - "locale": "en-us", - "monikers": [], - "moniker_ranges": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes" - }, { "docset_name": "internet-explorer", "build_source_folder": "browsers/internet-explorer", From 5f285490112fb6c9a9a3e31cef3bfc8b63714be3 Mon Sep 17 00:00:00 2001 From: Christopher McClister <5713373+cmcclister@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:39:40 -0700 Subject: [PATCH 10/10] Remove win-device-security in .openpublishing.publish.config.json under main branch. --- .openpublishing.publish.config.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 253a70b3bf..284f6f33a1 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -145,22 +145,6 @@ "build_entry_point": "docs", "template_folder": "_themes" }, - { - "docset_name": "win-device-security", - "build_source_folder": "windows/device-security", - "build_output_subfolder": "win-device-security", - "locale": "en-us", - "monikers": [], - "moniker_ranges": [], - "open_to_public_contributors": true, - "type_mapping": { - "Conceptual": "Content", - "ManagedReference": "Content", - "RestApi": "Content" - }, - "build_entry_point": "docs", - "template_folder": "_themes" - }, { "docset_name": "windows-hub", "build_source_folder": "windows/hub",