Merge branch 'main' into release-win365-2204

Author: v-alje

memdocs/intune/apps/apps-add-android-for-work.md

@@ -8,7 +8,7 @@ keywords:
 author: Erikre
 ms.author: erikre
 manager: dougeby
-ms.date: 03/29/2022
+ms.date: 05/05/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: apps
@@ -235,6 +235,7 @@ For dedicated, fully managed, and corporate-owned work profile devices, you can
 
 - **Default**: The app's updates are subject to default conditions (described above). 
 - **High Priority**: The app will update as soon as possible from when a new update is released, disregarding all of the default conditions. This may be disruptive for some users since the update can occur while the device is being used.
+- **Postpone**: When the app receives a new update, a 90-day waiting period is triggered. After 90 days, the app is updated to the newest version available, even if that version was not the update that triggered the waiting period. Note that the 90-day window is not configurable. To terminate the waiting period early, change the update mode to either **Default** or **High Priority**.
 
 To edit the app update mode:
 1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431).

memdocs/intune/configuration/tutorial-walkthrough-administrative-templates.md

@@ -67,7 +67,7 @@ This feature applies to:
 
 ## Prerequisites
 
-- A Microsoft 365 E3 or E5 subscription, which includes Intune and Azure Active Directory (AD) premium. If you don't have an E3 or E5 subscription, [try it for free](/office365/admin/try-or-buy-microsoft-365).
+- A Microsoft 365 E3 or E5 subscription, which includes Intune and Azure Active Directory (AD) premium. If you don't have an E3 or E5 subscription, [try it for free](/microsoft-365/commerce/try-or-buy-microsoft-365).
 
   For more information on what you get with the different Microsoft 365 licenses, see [Transform your Enterprise with Microsoft 365](https://www.microsoft.com/microsoft-365/compare-all-microsoft-365-plans).
 

memdocs/intune/configuration/wired-network-settings-windows.md

@@ -87,7 +87,7 @@ This article describes the settings you can configure.
       - **PKCS certificate**: Select an existing PKCS **client certificate** profile and existing trusted **root certificate** that are also deployed to the device. The client certificate is the identity presented by the device to the server to authenticate the connection.
       - **PFX Import certificate**: Select an existing imported PFX certificate profile. The client certificate is the identity presented by the device to authenticate the connection.
 
-        For more information on imported PFX certificates, see [Configure and use imported PKCS certificates with Intune](/protect/certificates-imported-pfx-configure).
+        For more information on imported PFX certificates, see [Configure and use imported PKCS certificates with Intune](/mem/intune/protect/certificates-imported-pfx-configure).
 
       - **Derived credential**: Select an existing certificate profile that's derived from a user's smart card. For more information, see [Use derived credentials in Microsoft Intune](../protect/derived-credentials.md).
 
@@ -114,7 +114,7 @@ This article describes the settings you can configure.
 
       - **PFX Import certificate**: Select an existing imported PFX certificate profile. The client certificate is the identity presented by the device to authenticate the network connection.
 
-        For more information on imported PFX certificates, see [Configure and use imported PKCS certificates with Intune](/protect/certificates-imported-pfx-configure).
+        For more information on imported PFX certificates, see [Configure and use imported PKCS certificates with Intune](/mem/intune/protect/certificates-imported-pfx-configure).
 
         - **Identity privacy (outer identity)**: Enter the text sent in response to an EAP identity request. This text can be any value, such as `anonymous`. During authentication, this anonymous identity is initially sent, and then followed by the real identification sent in a secure tunnel.
 
@@ -150,7 +150,7 @@ This article describes the settings you can configure.
 
       - **PFX Import certificate**: Select an existing imported PFX certificate profile. The client certificate is the identity presented by the device to authenticate the network connection.
 
-        For more information on imported PFX certificates, see [Configure and use imported PKCS certificates with Intune](/protect/certificates-imported-pfx-configure).
+        For more information on imported PFX certificates, see [Configure and use imported PKCS certificates with Intune](/mem/intune/protect/certificates-imported-pfx-configure).
 
         - **Identity privacy (outer identity)**: Enter the text sent in response to an EAP identity request. This text can be any value, such as `anonymous`. During authentication, this anonymous identity is initially sent, and then followed by the real identification sent in a secure tunnel.