From eebf1fee53950150da3a9d66d624db0e5f49b024 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 2 Dec 2024 05:55:15 -0500 Subject: [PATCH 1/8] Freshness review --- education/windows/configure-aad-google-trust.md | 4 ++-- education/windows/edu-stickers.md | 4 ++-- education/windows/edu-themes.md | 4 ++-- education/windows/get-minecraft-for-education.md | 2 +- education/windows/suspcs/provisioning-package.md | 4 ++-- .../windows/tutorial-deploy-apps-winse/considerations.md | 4 ++-- .../windows/tutorial-deploy-apps-winse/create-policies.md | 4 ++-- education/windows/tutorial-deploy-apps-winse/deploy-apps.md | 4 ++-- .../windows/tutorial-deploy-apps-winse/deploy-policies.md | 4 ++-- education/windows/tutorial-deploy-apps-winse/index.md | 4 ++-- .../windows/tutorial-deploy-apps-winse/troubleshoot.md | 4 ++-- .../windows/tutorial-deploy-apps-winse/validate-apps.md | 4 ++-- windows/configuration/start/index.md | 4 ++-- windows/configuration/start/layout.md | 4 ++-- windows/configuration/start/xsd.md | 2 +- windows/configuration/store/index.md | 4 ++-- .../identity-protection/enterprise-certificate-pinning.md | 4 ++-- .../identity-protection/passwordless-experience/index.md | 4 ++-- windows/security/identity-protection/web-sign-in/index.md | 6 +++--- windows/security/licensing-and-edition-requirements.md | 4 ++-- .../data-protection/configure-s-mime.md | 4 ++-- windows/whats-new/windows-licensing.md | 4 ++-- 22 files changed, 43 insertions(+), 43 deletions(-) diff --git a/education/windows/configure-aad-google-trust.md b/education/windows/configure-aad-google-trust.md index 54bf350d77..146fa56c8d 100644 --- a/education/windows/configure-aad-google-trust.md +++ b/education/windows/configure-aad-google-trust.md @@ -1,7 +1,7 @@ --- -title: Configure federation between Google Workspace and Microsoft Entra ID +title: Configure Federation Between Google Workspace And Microsoft Entra Id description: Configuration of a federated trust between Google Workspace and Microsoft Entra ID, with Google Workspace acting as an identity provider (IdP) for Microsoft Entra ID. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: how-to appliesto: --- diff --git a/education/windows/edu-stickers.md b/education/windows/edu-stickers.md index 889b10b393..bdd5d2761c 100644 --- a/education/windows/edu-stickers.md +++ b/education/windows/edu-stickers.md @@ -1,7 +1,7 @@ --- -title: Configure Stickers for Windows 11 SE +title: Configure Stickers For Windows 11 SE description: Learn about the Stickers feature and how to configure it via Intune and provisioning package. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: how-to appliesto: - ✅ Windows 11 SE diff --git a/education/windows/edu-themes.md b/education/windows/edu-themes.md index b0d6efa639..727c1a26bd 100644 --- a/education/windows/edu-themes.md +++ b/education/windows/edu-themes.md @@ -1,7 +1,7 @@ --- -title: Configure education themes for Windows 11 +title: Configure Education Themes For Windows 11 description: Learn about education themes for Windows 11 and how to configure them via Intune and provisioning package. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: how-to appliesto: - ✅ Windows 11 diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index d5a0cb61fa..73cdb99f63 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -1,5 +1,5 @@ --- -title: Get and deploy Minecraft Education +title: Deploy Minecraft Education To Windows Devices description: Learn how to obtain and distribute Minecraft Education to Windows devices. ms.topic: how-to ms.date: 04/10/2024 diff --git a/education/windows/suspcs/provisioning-package.md b/education/windows/suspcs/provisioning-package.md index 677b9b7b6f..bde1800fa4 100644 --- a/education/windows/suspcs/provisioning-package.md +++ b/education/windows/suspcs/provisioning-package.md @@ -1,7 +1,7 @@ --- -title: What's in Set up School PCs provisioning package +title: What's In Set up School PCs Provisioning Package description: Learn about the settings that are configured in the provisioning package created with the Set up School PCs app. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: reference appliesto: - ✅ Windows 11 diff --git a/education/windows/tutorial-deploy-apps-winse/considerations.md b/education/windows/tutorial-deploy-apps-winse/considerations.md index 7f2a9f9207..54cb82322a 100644 --- a/education/windows/tutorial-deploy-apps-winse/considerations.md +++ b/education/windows/tutorial-deploy-apps-winse/considerations.md @@ -1,7 +1,7 @@ --- -title: Important considerations before deploying apps with managed installer +title: Important Considerations Before Deploying Apps With Managed Installer For Windows 11 SE description: Learn about important aspects to consider before deploying apps with managed installer. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: tutorial appliesto: - ✅ Windows 11 SE, version 22H2 and later diff --git a/education/windows/tutorial-deploy-apps-winse/create-policies.md b/education/windows/tutorial-deploy-apps-winse/create-policies.md index 26e022bbbf..6947d4612d 100644 --- a/education/windows/tutorial-deploy-apps-winse/create-policies.md +++ b/education/windows/tutorial-deploy-apps-winse/create-policies.md @@ -1,7 +1,7 @@ --- -title: Create policies to enable applications +title: Create Policies To Enable Applications In Windows 11 SE description: Learn how to create policies to enable the installation and execution of apps on Windows SE. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: tutorial appliesto: - ✅ Windows 11 SE, version 22H2 and later diff --git a/education/windows/tutorial-deploy-apps-winse/deploy-apps.md b/education/windows/tutorial-deploy-apps-winse/deploy-apps.md index 62442e2058..4ab613f7f0 100644 --- a/education/windows/tutorial-deploy-apps-winse/deploy-apps.md +++ b/education/windows/tutorial-deploy-apps-winse/deploy-apps.md @@ -1,7 +1,7 @@ --- -title: Applications deployment considerations +title: Applications Deployment Considerations In Windows 11 SE description: Learn how to deploy different types of applications to Windows 11 SE and some considerations before deploying them. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: tutorial appliesto: - ✅ Windows 11 SE, version 22H2 and later diff --git a/education/windows/tutorial-deploy-apps-winse/deploy-policies.md b/education/windows/tutorial-deploy-apps-winse/deploy-policies.md index 63f6143853..990f4c894b 100644 --- a/education/windows/tutorial-deploy-apps-winse/deploy-policies.md +++ b/education/windows/tutorial-deploy-apps-winse/deploy-policies.md @@ -1,7 +1,7 @@ --- -title: Deploy policies to enable applications +title: Deploy Policies To Enable Applications In Windows 11 SE description: Learn how to deploy AppLocker policies to enable apps execution on Windows SE devices. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: tutorial appliesto: - ✅ Windows 11 SE, version 22H2 and later diff --git a/education/windows/tutorial-deploy-apps-winse/index.md b/education/windows/tutorial-deploy-apps-winse/index.md index 1c09685eed..c96283ec0c 100644 --- a/education/windows/tutorial-deploy-apps-winse/index.md +++ b/education/windows/tutorial-deploy-apps-winse/index.md @@ -1,7 +1,7 @@ --- -title: Deploy applications to Windows 11 SE with Intune +title: Deploy Applications To Windows 11 SE With Intune description: Learn how to deploy applications to Windows 11 SE with Intune and how to validate the apps. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: tutorial appliesto: - ✅ Windows 11 SE, version 22H2 and later diff --git a/education/windows/tutorial-deploy-apps-winse/troubleshoot.md b/education/windows/tutorial-deploy-apps-winse/troubleshoot.md index 38a3ee9d4c..f23a6c4034 100644 --- a/education/windows/tutorial-deploy-apps-winse/troubleshoot.md +++ b/education/windows/tutorial-deploy-apps-winse/troubleshoot.md @@ -1,7 +1,7 @@ --- -title: Troubleshoot app deployment issues in Windows SE +title: Troubleshoot App Deployment Issues In Windows Se description: Troubleshoot common issues when deploying apps to Windows SE devices. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: tutorial appliesto: - ✅ Windows 11 SE, version 22H2 and later diff --git a/education/windows/tutorial-deploy-apps-winse/validate-apps.md b/education/windows/tutorial-deploy-apps-winse/validate-apps.md index 211638de72..4cfa11748b 100644 --- a/education/windows/tutorial-deploy-apps-winse/validate-apps.md +++ b/education/windows/tutorial-deploy-apps-winse/validate-apps.md @@ -1,7 +1,7 @@ --- -title: Validate the applications deployed to Windows SE devices +title: Validate The Applications Deployed To Windows Se Devices description: Learn how to validate the applications deployed to Windows SE devices via Intune. -ms.date: 04/10/2024 +ms.date: 12/02/2024 ms.topic: tutorial appliesto: - ✅ Windows 11 SE, version 22H2 and later diff --git a/windows/configuration/start/index.md b/windows/configuration/start/index.md index 0627e33663..2294ebe5cc 100644 --- a/windows/configuration/start/index.md +++ b/windows/configuration/start/index.md @@ -1,8 +1,8 @@ --- -title: Configure the Start menu +title: Configure The Windows Start Menu With Policy Settings description: Learn how to configure the Windows Start menu to provide quick access to the tools and applications that users need most. ms.topic: overview -ms.date: 04/10/2024 +ms.date: 12/02/2024 zone_pivot_groups: windows-versions-11-10 ms.collection: - essentials-manage diff --git a/windows/configuration/start/layout.md b/windows/configuration/start/layout.md index 81f5d11c75..af0a608300 100644 --- a/windows/configuration/start/layout.md +++ b/windows/configuration/start/layout.md @@ -1,8 +1,8 @@ --- -title: Customize the Start layout +title: Customize The Start Layout For Managed Windows Devices description: Learn how to customize the Windows Start layout, export its configuration, and deploy the customization to other devices. ms.topic: how-to -ms.date: 04/10/2024 +ms.date: 12/02/2024 zone_pivot_groups: windows-versions-11-10 appliesto: --- diff --git a/windows/configuration/start/xsd.md b/windows/configuration/start/xsd.md index 714f0aa70f..ba0f818bc7 100644 --- a/windows/configuration/start/xsd.md +++ b/windows/configuration/start/xsd.md @@ -2,7 +2,7 @@ title: Start XML Schema Definition (XSD) description: Start XSD reference article. ms.topic: reference -ms.date: 04/10/2024 +ms.date: 12/02/2024 appliesto: - ✅ Windows 10 --- diff --git a/windows/configuration/store/index.md b/windows/configuration/store/index.md index 09c92aea0f..b6b7609319 100644 --- a/windows/configuration/store/index.md +++ b/windows/configuration/store/index.md @@ -1,8 +1,8 @@ --- -title: Configure access to the Microsoft Store app +title: Configure Access To The Microsoft Store App For Windows Devices description: Learn how to configure access to the Microsoft Store app. ms.topic: how-to -ms.date: 03/13/2024 +ms.date: 12/02/2024 --- # Configure access to the Microsoft Store app diff --git a/windows/security/identity-protection/enterprise-certificate-pinning.md b/windows/security/identity-protection/enterprise-certificate-pinning.md index 55551c53ca..59d5e97382 100644 --- a/windows/security/identity-protection/enterprise-certificate-pinning.md +++ b/windows/security/identity-protection/enterprise-certificate-pinning.md @@ -1,8 +1,8 @@ --- -title: Enterprise certificate pinning +title: Enterprise Certificate Pinning In Windows description: Enterprise certificate pinning is a Windows feature for remembering, or pinning, a root issuing certificate authority, or end-entity certificate to a domain name. ms.topic: concept-article -ms.date: 03/12/2024 +ms.date: 12/02/2024 --- # Enterprise certificate pinning overview diff --git a/windows/security/identity-protection/passwordless-experience/index.md b/windows/security/identity-protection/passwordless-experience/index.md index 2301f86f81..cb555bfb78 100644 --- a/windows/security/identity-protection/passwordless-experience/index.md +++ b/windows/security/identity-protection/passwordless-experience/index.md @@ -1,9 +1,9 @@ --- -title: Windows passwordless experience +title: Configure Windows Passwordless Experience With Intune description: Learn how Windows passwordless experience enables your organization to move away from passwords. ms.collection: - tier1 -ms.date: 03/12/2024 +ms.date: 12/02/2024 ms.topic: how-to appliesto: - ✅ Windows 11 diff --git a/windows/security/identity-protection/web-sign-in/index.md b/windows/security/identity-protection/web-sign-in/index.md index 86e2b4b834..b44ce81bca 100644 --- a/windows/security/identity-protection/web-sign-in/index.md +++ b/windows/security/identity-protection/web-sign-in/index.md @@ -1,7 +1,7 @@ --- -title: Web sign-in for Windows -description: Learn how Web sign-in in Windows works, key scenarios, and how to configure it. -ms.date: 04/10/2024 +title: Use Web Sign-In To Enable Passwordless Sign-In In Windows +Description: Learn how Web sign-in in Windows works, key scenarios, and how to configure it. +ms.date: 12/02/2024 ms.topic: how-to appliesto: - ✅ Windows 11 diff --git a/windows/security/licensing-and-edition-requirements.md b/windows/security/licensing-and-edition-requirements.md index 34a527cefe..2e2dc3b457 100644 --- a/windows/security/licensing-and-edition-requirements.md +++ b/windows/security/licensing-and-edition-requirements.md @@ -1,8 +1,8 @@ --- -title: Windows security features licensing and edition requirements +title: Windows Security Features Licensing And Edition Requirements description: Learn about Windows licensing and edition requirements for the features included in Windows. ms.topic: conceptual -ms.date: 04/10/2024 +ms.date: 12/02/2024 appliesto: - ✅ Windows 11 ms.author: paoloma diff --git a/windows/security/operating-system-security/data-protection/configure-s-mime.md b/windows/security/operating-system-security/data-protection/configure-s-mime.md index 7781de30a9..456a0d81aa 100644 --- a/windows/security/operating-system-security/data-protection/configure-s-mime.md +++ b/windows/security/operating-system-security/data-protection/configure-s-mime.md @@ -1,8 +1,8 @@ --- -title: Configure S/MIME for Windows +title: Configure S/MIME For Windows description: S/MIME lets users encrypt outgoing messages and attachments so that only intended recipients with a digital ID, also known as a certificate, can read them. Learn how to configure S/MIME for Windows. ms.topic: how-to -ms.date: 04/10/2024 +ms.date: 12/02/2024 --- diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index fef13ecd5b..c50c610a28 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -1,5 +1,5 @@ --- -title: Windows commercial licensing overview +title: Windows Commercial Licensing Overview description: Learn about products and use rights available through Windows commercial licensing. ms.subservice: itpro-security author: paolomatarazzo @@ -8,7 +8,7 @@ manager: aaroncz ms.collection: - tier2 ms.topic: overview -ms.date: 02/29/2024 +ms.date: 12/02/2024 appliesto: - ✅ Windows 11 ms.service: windows-client From 423ee4656061168ebd2a5d5c514665ae3ce52228 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 2 Dec 2024 06:01:03 -0500 Subject: [PATCH 2/8] fixed metadata --- windows/security/identity-protection/web-sign-in/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/identity-protection/web-sign-in/index.md b/windows/security/identity-protection/web-sign-in/index.md index b44ce81bca..a48aa3c89d 100644 --- a/windows/security/identity-protection/web-sign-in/index.md +++ b/windows/security/identity-protection/web-sign-in/index.md @@ -1,6 +1,6 @@ --- title: Use Web Sign-In To Enable Passwordless Sign-In In Windows -Description: Learn how Web sign-in in Windows works, key scenarios, and how to configure it. +description: Learn how Web sign-in in Windows works, key scenarios, and how to configure it. ms.date: 12/02/2024 ms.topic: how-to appliesto: From 39deb112cde006feb7980057a9b0cac0eba43691 Mon Sep 17 00:00:00 2001 From: Padma Jayaraman Date: Mon, 2 Dec 2024 17:59:23 +0530 Subject: [PATCH 3/8] Pencil fix --- .../windows/configure-aad-google-trust.md | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/education/windows/configure-aad-google-trust.md b/education/windows/configure-aad-google-trust.md index 146fa56c8d..99b45ebcb9 100644 --- a/education/windows/configure-aad-google-trust.md +++ b/education/windows/configure-aad-google-trust.md @@ -37,19 +37,19 @@ To test federation, the following prerequisites must be met: ## Configure Google Workspace as an IdP for Microsoft Entra ID -1. Sign in to the [Google Workspace Admin Console](https://admin.google.com) with an account with *super admin* privileges +1. Sign in to the [Google Workspace Admin Console](https://admin.google.com) with an account with *super admin* privileges. 1. Select **Apps > Web and mobile apps** -1. Select **Add app > Search for apps** and search for *microsoft* -1. In the search results page, hover over the *Microsoft Office 365 - Web (SAML)* app and select **Select** +1. Select **Add app > Search for apps** and search for *microsoft*. +1. In the search results page, hover over the *Microsoft Office 365 - Web (SAML)* app and select **Select**. :::image type="content" source="images/google/google-admin-search-app.png" alt-text="Screenshot showing Google Workspace and the search button for Microsoft Office 365 SAML app."::: -1. On the **Google Identity Provider details** page, select **Download Metadata** and take note of the location where the **IdP metadata** - *GoogleIDPMetadata.xml* - file is saved, as it's used to set up Microsoft Entra ID later -1. On the **Service provider detail's** page - - Select the option **Signed response** - - Verify that the Name ID format is set to **PERSISTENT** - - Depending on how the Microsoft Entra users have been provisioned in Microsoft Entra ID, you might need to adjust the **Name ID** mapping.\ - If using Google autoprovisioning, select **Basic Information > Primary email** - - Select **Continue** -1. On the **Attribute mapping** page, map the Google attributes to the Microsoft Entra attributes +1. On the **Google Identity Provider details** page, select **Download Metadata** and take note of the location where the **IdP metadata** - *GoogleIDPMetadata.xml* - file is saved, as it's used to set up Microsoft Entra ID later. +1. On the **Service provider detail's** page: + - Select the option **Signed response**. + - Verify that the Name ID format is set to **PERSISTENT**. + - Depending on how the Microsoft Entra users have been provisioned in Microsoft Entra ID, you might need to adjust the **Name ID** mapping. + If using Google autoprovisioning, select **Basic Information > Primary email**. + - Select **Continue**. +1. On the **Attribute mapping** page, map the Google attributes to the Microsoft Entra attributes. |Google Directory attributes|Microsoft Entra attributes| |-|-| @@ -58,7 +58,7 @@ To test federation, the following prerequisites must be met: > [!IMPORTANT] > You must ensure that your Microsoft Entra user account's email matches that in your Google Workspace. -1. Select **Finish** +1. Select **Finish**. Now that the app is configured, you must enable it for the users in Google Workspace: @@ -139,4 +139,4 @@ From a private browser session, navigate to https://portal.azure.com and sign in 1. The user is redirected to Google Workspace to sign in 1. After Google Workspace authentication, the user is redirected back to Microsoft Entra ID and signed in -:::image type="content" source="images/google/google-sso.gif" alt-text="A GIF that shows the user authenticating the Azure portal using a Google Workspace federated identity."::: + :::image type="content" source="images/google/google-sso.gif" alt-text="A GIF that shows the user authenticating the Azure portal using a Google Workspace federated identity."::: From f03e6c2a8ebfee0b2c4e483bf5161da825afbc1c Mon Sep 17 00:00:00 2001 From: Padma Jayaraman Date: Mon, 2 Dec 2024 19:24:55 +0530 Subject: [PATCH 4/8] Pencil fix --- .../windows/get-minecraft-for-education.md | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index 73cdb99f63..3268fa4f52 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -41,14 +41,14 @@ When you sign up for a Minecraft Education trial, or purchase a subscription, Mi To purchase direct licenses: -1. Go to [https://education.minecraft.net/licensing](https://education.minecraft.net/licensing) -1. Under **Direct Purchase**, select **Buy Now** -1. Sign in to the Admin Center purchase page with an account that has *Billing Admin* privileges in your organization -1. If necessary, fill in any requested organization or payment information -1. Select the quantity of licenses you'd like to purchase and select **Place Order** -1. After you've purchased licenses, you'll need to [assign Minecraft Education licenses to your users](#assign-minecraft-education-licenses) +1. Go to [https://education.minecraft.net/licensing](https://education.minecraft.net/licensing). +1. Under **Direct Purchase**, select **Buy Now**. +1. Sign in to the Admin Center purchase page with an account that has *Billing Admin* privileges in your organization. +1. If necessary, fill in any requested organization or payment information. +1. Select the quantity of licenses you'd like to purchase and select **Place Order**. +1. After you've purchased licenses, you'll need to [assign Minecraft Education licenses to your users](#assign-minecraft-education-licenses). -If you need more licenses for Minecraft Education, see [Buy or remove subscription licenses](/microsoft-365/commerce/licenses/buy-licenses). + If you need more licenses for Minecraft Education, see [Buy or remove subscription licenses](/microsoft-365/commerce/licenses/buy-licenses). ### Volume licensing @@ -85,17 +85,17 @@ For more information about invoices and how to pay by invoice, see [Payment opti You can assign and manage Minecraft Education licenses from the Microsoft 365 admin center.\ You must be a *Global*, *License*, or *User admin* to assign licenses. For more information, see [About Microsoft 365 admin roles][M365-2]. -1. Go to [https://admin.microsoft.com](https://admin.microsoft.com) and sign in with an account that can assign licenses in your organization -1. From the left-hand menu in Microsoft Admin Center, select *Users* -1. From the Users list, select the users you want to add or remove for Minecraft Education access -1. Add the relevant Minecraft Education, A1 for device or A3/A5 license if it not assigned already +1. Go to [https://admin.microsoft.com](https://admin.microsoft.com) and sign in with an account that can assign licenses in your organization. +1. From the left-hand menu in Microsoft Admin Center, select *Users*. +1. From the Users list, select the users you want to add or remove for Minecraft Education access. +1. Add the relevant Minecraft Education, A1 for device or A3/A5 license if it is not assigned already. > [!Note] > If you add a faculty license, the user will be assigned a *teacher* role in the application and will have elevated permissions. 1. If you've assigned a Microsoft 365 A3 or A5 license, after selecting the product license, ensure to toggle *Minecraft Education* on > [!Note] > If you turn off this setting after students have been using Minecraft Education, they will have up to 30 more days to use Minecraft Education before they don't have access -:::image type="content" source="images/minecraft/admin-center-minecraft-license.png" alt-text="Screenshot of the Microsoft 365 admin center - assignment of a Minecraft Education license to a user." lightbox="images/minecraft/admin-center-minecraft-license.png"::: + :::image type="content" source="images/minecraft/admin-center-minecraft-license.png" alt-text="Screenshot of the Microsoft 365 admin center - assignment of a Minecraft Education license to a user." lightbox="images/minecraft/admin-center-minecraft-license.png"::: For more information about license assignment, see [Manage Licenses in the Admin Center][EDU-5]. @@ -105,11 +105,11 @@ There are different ways to install Minecraft Education on Windows devices. You If you're using Microsoft Intune to manage your devices, follow these steps to deploy Minecraft Education: 1. Go to the Microsoft Intune admin center -1. Select **Apps > Windows > Add** -1. Under *App type*, select **Microsoft Store app (new)** and choose **Select** -1. Select **Search the Microsoft Store app (new)** and search for **Minecraft Education** -1. Select the app and choose **Select** -1. On the *App information* screen, select the *install behavior*, then select **Next** +1. Select **Apps > Windows > Add**. +1. Under *App type*, select **Microsoft Store app (new)** and choose **Select**. +1. Select **Search the Microsoft Store app (new)** and search for **Minecraft Education**. +1. Select the app and choose **Select**. +1. On the *App information* screen, select the *install behavior*, then select **Next**. - *System* means install for all users (recommended for most scenarios) - *User* means only install for the targeted user or current user of a device 1. On the *Assignments* screen, choose how you want to target the installation of Minecraft Education @@ -118,31 +118,31 @@ If you're using Microsoft Intune to manage your devices, follow these steps to d 1. Select **Next** 1. On the *Review + Create* screen, select **Create** -Intune will install Minecraft Education at the next device check-in, or will make it available in Company Portal for on-demand installs. + Intune will install Minecraft Education at the next device check-in, or will make it available in Company Portal for on-demand installs. -:::image type="content" source="images/minecraft/win11-minecraft-education.png" alt-text="Screenshot of Minecraft Education executing on a Windows 11 device."::: + :::image type="content" source="images/minecraft/win11-minecraft-education.png" alt-text="Screenshot of Minecraft Education executing on a Windows 11 device."::: -For more information how to deploy Minecraft Education, see: + For more information how to deploy Minecraft Education, see: -- [Windows installation guide][EDU-6] -- [Chromebook installation guide][EDU-7] -- [iOS installation guide][EDU-8] -- [macOS installation guide][EDU-9] + - [Windows installation guide][EDU-6] + - [Chromebook installation guide][EDU-7] + - [iOS installation guide][EDU-8] + - [macOS installation guide][EDU-9] -If you're having trouble installing the app, you can get more help on the [Minecraft Education support page][AKA-1]. + If you're having trouble installing the app, you can get more help on the [Minecraft Education support page][AKA-1]. - -[EDU-1]: https://educommunity.minecraft.net/hc/articles/360047116432 -[EDU-2]: https://educommunity.minecraft.net/hc/articles/360061371532 -[EDU-3]: https://www.microsoft.com/education/products/office -[EDU-4]: https://educommunity.minecraft.net/hc/articles/360061369812 -[EDU-6]: https://educommunity.minecraft.net/hc/articles/13106858087956 -[EDU-5]: https://educommunity.minecraft.net/hc/articles/360047118672 -[EDU-7]: https://educommunity.minecraft.net/hc/articles/4404625978516 -[EDU-8]: https://educommunity.minecraft.net/hc/articles/360047556351 -[EDU-9]: https://educommunity.minecraft.net/hc/articles/360047118792 + + [EDU-1]: https://educommunity.minecraft.net/hc/articles/360047116432 + [EDU-2]: https://educommunity.minecraft.net/hc/articles/360061371532 + [EDU-3]: https://www.microsoft.com/education/products/office + [EDU-4]: https://educommunity.minecraft.net/hc/articles/360061369812 + [EDU-6]: https://educommunity.minecraft.net/hc/articles/13106858087956 + [EDU-5]: https://educommunity.minecraft.net/hc/articles/360047118672 + [EDU-7]: https://educommunity.minecraft.net/hc/articles/4404625978516 + [EDU-8]: https://educommunity.minecraft.net/hc/articles/360047556351 + [EDU-9]: https://educommunity.minecraft.net/hc/articles/360047118792 -[M365-1]: /microsoft-365/commerce/billing-and-payments/pay-for-your-subscription -[M365-2]: /microsoft-365/admin/add-users/about-admin-roles + [M365-1]: /microsoft-365/commerce/billing-and-payments/pay-for-your-subscription + [M365-2]: /microsoft-365/admin/add-users/about-admin-roles -[AKA-1]: https://aka.ms/minecraftedusupport + [AKA-1]: https://aka.ms/minecraftedusupport From 0b421c2768ff8ddb9565077f86b968a834c85074 Mon Sep 17 00:00:00 2001 From: Padma Jayaraman Date: Mon, 2 Dec 2024 22:32:15 +0530 Subject: [PATCH 5/8] Reverted changes --- .../windows/configure-aad-google-trust.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/education/windows/configure-aad-google-trust.md b/education/windows/configure-aad-google-trust.md index 99b45ebcb9..65c6673c04 100644 --- a/education/windows/configure-aad-google-trust.md +++ b/education/windows/configure-aad-google-trust.md @@ -37,19 +37,19 @@ To test federation, the following prerequisites must be met: ## Configure Google Workspace as an IdP for Microsoft Entra ID -1. Sign in to the [Google Workspace Admin Console](https://admin.google.com) with an account with *super admin* privileges. +1. Sign in to the [Google Workspace Admin Console](https://admin.google.com) with an account with *super admin* privileges 1. Select **Apps > Web and mobile apps** -1. Select **Add app > Search for apps** and search for *microsoft*. -1. In the search results page, hover over the *Microsoft Office 365 - Web (SAML)* app and select **Select**. +1. Select **Add app > Search for apps** and search for *microsoft* +1. In the search results page, hover over the *Microsoft Office 365 - Web (SAML)* app and select **Select** :::image type="content" source="images/google/google-admin-search-app.png" alt-text="Screenshot showing Google Workspace and the search button for Microsoft Office 365 SAML app."::: -1. On the **Google Identity Provider details** page, select **Download Metadata** and take note of the location where the **IdP metadata** - *GoogleIDPMetadata.xml* - file is saved, as it's used to set up Microsoft Entra ID later. +1. On the **Google Identity Provider details** page, select **Download Metadata** and take note of the location where the **IdP metadata** - *GoogleIDPMetadata.xml* - file is saved, as it's used to set up Microsoft Entra ID later 1. On the **Service provider detail's** page: - - Select the option **Signed response**. - - Verify that the Name ID format is set to **PERSISTENT**. - - Depending on how the Microsoft Entra users have been provisioned in Microsoft Entra ID, you might need to adjust the **Name ID** mapping. - If using Google autoprovisioning, select **Basic Information > Primary email**. - - Select **Continue**. -1. On the **Attribute mapping** page, map the Google attributes to the Microsoft Entra attributes. + - Select the option **Signed response** + - Verify that the Name ID format is set to **PERSISTENT** + - Depending on how the Microsoft Entra users have been provisioned in Microsoft Entra ID, you might need to adjust the **Name ID** mapping + If using Google autoprovisioning, select **Basic Information > Primary email** + - Select **Continue** +1. On the **Attribute mapping** page, map the Google attributes to the Microsoft Entra attributes |Google Directory attributes|Microsoft Entra attributes| |-|-| @@ -58,7 +58,7 @@ To test federation, the following prerequisites must be met: > [!IMPORTANT] > You must ensure that your Microsoft Entra user account's email matches that in your Google Workspace. -1. Select **Finish**. +1. Select **Finish** Now that the app is configured, you must enable it for the users in Google Workspace: From 8cf70cc17a66c5ae6309b3dd45b7b8efd5f73529 Mon Sep 17 00:00:00 2001 From: Padma Jayaraman Date: Mon, 2 Dec 2024 22:47:24 +0530 Subject: [PATCH 6/8] Reverted periods --- .../windows/get-minecraft-for-education.md | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index 3268fa4f52..1b8a44d7c4 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -41,14 +41,14 @@ When you sign up for a Minecraft Education trial, or purchase a subscription, Mi To purchase direct licenses: -1. Go to [https://education.minecraft.net/licensing](https://education.minecraft.net/licensing). -1. Under **Direct Purchase**, select **Buy Now**. -1. Sign in to the Admin Center purchase page with an account that has *Billing Admin* privileges in your organization. -1. If necessary, fill in any requested organization or payment information. -1. Select the quantity of licenses you'd like to purchase and select **Place Order**. -1. After you've purchased licenses, you'll need to [assign Minecraft Education licenses to your users](#assign-minecraft-education-licenses). +1. Go to [https://education.minecraft.net/licensing](https://education.minecraft.net/licensing) +1. Under **Direct Purchase**, select **Buy Now** +1. Sign in to the Admin Center purchase page with an account that has *Billing Admin* privileges in your organization +1. If necessary, fill in any requested organization or payment information +1. Select the quantity of licenses you'd like to purchase and select **Place Order** +1. After you've purchased licenses, you'll need to [assign Minecraft Education licenses to your users](#assign-minecraft-education-licenses) - If you need more licenses for Minecraft Education, see [Buy or remove subscription licenses](/microsoft-365/commerce/licenses/buy-licenses). + If you need more licenses for Minecraft Education, see [Buy or remove subscription licenses](/microsoft-365/commerce/licenses/buy-licenses) ### Volume licensing @@ -85,12 +85,12 @@ For more information about invoices and how to pay by invoice, see [Payment opti You can assign and manage Minecraft Education licenses from the Microsoft 365 admin center.\ You must be a *Global*, *License*, or *User admin* to assign licenses. For more information, see [About Microsoft 365 admin roles][M365-2]. -1. Go to [https://admin.microsoft.com](https://admin.microsoft.com) and sign in with an account that can assign licenses in your organization. -1. From the left-hand menu in Microsoft Admin Center, select *Users*. -1. From the Users list, select the users you want to add or remove for Minecraft Education access. -1. Add the relevant Minecraft Education, A1 for device or A3/A5 license if it is not assigned already. +1. Go to [https://admin.microsoft.com](https://admin.microsoft.com) and sign in with an account that can assign licenses in your organization +1. From the left-hand menu in Microsoft Admin Center, select *Users* +1. From the Users list, select the users you want to add or remove for Minecraft Education access +1. Add the relevant Minecraft Education, A1 for device or A3/A5 license if it is not assigned already > [!Note] - > If you add a faculty license, the user will be assigned a *teacher* role in the application and will have elevated permissions. + > If you add a faculty license, the user will be assigned a *teacher* role in the application and will have elevated permissions 1. If you've assigned a Microsoft 365 A3 or A5 license, after selecting the product license, ensure to toggle *Minecraft Education* on > [!Note] > If you turn off this setting after students have been using Minecraft Education, they will have up to 30 more days to use Minecraft Education before they don't have access @@ -105,11 +105,11 @@ There are different ways to install Minecraft Education on Windows devices. You If you're using Microsoft Intune to manage your devices, follow these steps to deploy Minecraft Education: 1. Go to the Microsoft Intune admin center -1. Select **Apps > Windows > Add**. -1. Under *App type*, select **Microsoft Store app (new)** and choose **Select**. -1. Select **Search the Microsoft Store app (new)** and search for **Minecraft Education**. -1. Select the app and choose **Select**. -1. On the *App information* screen, select the *install behavior*, then select **Next**. +1. Select **Apps > Windows > Add** +1. Under *App type*, select **Microsoft Store app (new)** and choose **Select** +1. Select **Search the Microsoft Store app (new)** and search for **Minecraft Education** +1. Select the app and choose **Select** +1. On the *App information* screen, select the *install behavior*, then select **Next** - *System* means install for all users (recommended for most scenarios) - *User* means only install for the targeted user or current user of a device 1. On the *Assignments* screen, choose how you want to target the installation of Minecraft Education From 7665c16271fbfb360b63d7d0597f0a3240e92e90 Mon Sep 17 00:00:00 2001 From: Padma Jayaraman Date: Mon, 2 Dec 2024 22:51:39 +0530 Subject: [PATCH 7/8] Reverted slash --- education/windows/configure-aad-google-trust.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/education/windows/configure-aad-google-trust.md b/education/windows/configure-aad-google-trust.md index 65c6673c04..4f9ce1a8ed 100644 --- a/education/windows/configure-aad-google-trust.md +++ b/education/windows/configure-aad-google-trust.md @@ -46,7 +46,7 @@ To test federation, the following prerequisites must be met: 1. On the **Service provider detail's** page: - Select the option **Signed response** - Verify that the Name ID format is set to **PERSISTENT** - - Depending on how the Microsoft Entra users have been provisioned in Microsoft Entra ID, you might need to adjust the **Name ID** mapping + - Depending on how the Microsoft Entra users have been provisioned in Microsoft Entra ID, you might need to adjust the **Name ID** mapping\ If using Google autoprovisioning, select **Basic Information > Primary email** - Select **Continue** 1. On the **Attribute mapping** page, map the Google attributes to the Microsoft Entra attributes From ec3bbd5adb51da0c017ea04dfe09b51ff7d996b9 Mon Sep 17 00:00:00 2001 From: Padma Jayaraman Date: Mon, 2 Dec 2024 22:57:00 +0530 Subject: [PATCH 8/8] Fixed alignment --- .../data-protection/configure-s-mime.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/operating-system-security/data-protection/configure-s-mime.md b/windows/security/operating-system-security/data-protection/configure-s-mime.md index 456a0d81aa..ef44453923 100644 --- a/windows/security/operating-system-security/data-protection/configure-s-mime.md +++ b/windows/security/operating-system-security/data-protection/configure-s-mime.md @@ -68,4 +68,4 @@ When you receive a signed email, the app provides a feature to install correspon 1. Select the digital signature icon in the reading pane 1. Select **Install.** - :::image type="content" alt-text="Screenshot of the Windows Mail app, showing a message to install the sender's encryption certificate." source="images/install-cert.png"::: + :::image type="content" alt-text="Screenshot of the Windows Mail app, showing a message to install the sender's encryption certificate." source="images/install-cert.png":::