Merge branch 'main' into patch-4

Author: Erikre

.openpublishing.redirection.json

@@ -1,5 +1,35 @@
 {
     "redirections": [
+        {
+            "source_path": "memdocs/intune/configuration/vpn-settings-windows-phone-8-1.md",
+            "redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/intune/configuration/email-settings-windows-phone-8-1.md",
+            "redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/intune/configuration/device-restrictions-windows-phone-8-1.md",
+            "redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/intune/configuration/custom-settings-windows-phone-8-1.md",
+            "redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/intune/apps/store-apps-windows-phone-8-1.md",
+            "redirect_url": "/mem/intune/apps/apps-add",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/intune/apps/lob-apps-windows-phone.md",
+            "redirect_url": "/mem/intune/apps/apps-add",
+            "redirect_document_id": false
+        },      
         {
             "source_path": "memdocs/intune/user-help/set-or-change-your-password-windows.md",
             "redirect_url": "https://support.microsoft.com/windows/windows-sign-in-options-and-account-protection-7b34d4cf-794f-f6bd-ddcc-e73cdf1a6fbf",
@@ -1097,6 +1127,40 @@
             "source_path": "memdocs/configmgr/sum/deploy-use/uup-preview.md",
             "redirect_url": "/mem/configmgr/sum/index",
             "redirect_document_id": true
+        },
+        {
+            "source_path": "windows-365/enterprise/on-premises-network-connections.md",
+            "redirect_url": "/windows-365/enterprise/azure-network-connections",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "windows-365/enterprise/create-on-premises-network-connection.md",
+            "redirect_url": "/windows-365/enterprise/create-azure-network-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "windows-365/enterprise/edit-on-premises-network-connection.md",
+            "redirect_url": "/windows-365/enterprise/edit-azure-network-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "windows-365/enterprise/delete-on-premises-network-connection.md",
+            "redirect_url": "/windows-365/enterprise/delete-azure-network-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "windows-365/enterprise/troubleshoot-on-premises-network-connection.md",
+            "redirect_url": "/windows-365/enterprise/troubleshoot-azure-network-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "windows-365/get-users-started.md",
+            "redirect_url":"/windows-365/end-user-access-cloud-pc",
+            "redirect_document_id": false
+        }, {
+            "source_path": "memdocs/intune/remote-actions/remote-assist-mobile-devices.md",
+            "redirect_url": "/mem/intune/remote-actions/remote-help",
+            "redirect_document_id": false
         }
     ]
 }

memdocs/analytics/enroll-configmgr.md

@@ -2,7 +2,7 @@
 title: Quickstart - Enroll Configuration Manager devices
 titleSuffix: Microsoft Endpoint Manager
 description: In this quickstart, you enroll Configuration Manager devices into Endpoint analytics.
-ms.date: 11/15/2021
+ms.date: 05/03/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-analytics
 ms.topic: quickstart
@@ -33,7 +33,7 @@ Before you start this tutorial, make sure you have the following prerequisites:
 
 ### Licensing Prerequisites
 
-Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md).
+Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md). Proactive remediations has an additional licensing requirement, for more information see, the [Endpoint analytics licensing requirements overview](overview.md#licensing-prerequisites).
 
 ## Endpoint analytics permissions
 

memdocs/analytics/enroll-intune.md

@@ -2,7 +2,7 @@
 title: Quickstart - Enroll Intune devices
 titleSuffix: Microsoft Endpoint Manager
 description: In this quickstart, you enroll Intune devices into Endpoint analytics.
-ms.date: 10/05/2021
+ms.date: 05/03/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-analytics
 ms.topic: quickstart
@@ -43,7 +43,7 @@ To enroll devices to Endpoint analytics, they need to send required functional d
 
 ### Licensing Prerequisites
 
-Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md).
+Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md). Proactive remediations has an additional licensing requirement, for more information see, the [Endpoint analytics licensing requirements overview](overview.md#licensing-prerequisites).
 
 ### Endpoint analytics permissions
 

memdocs/analytics/proactive-remediations.md

@@ -62,11 +62,14 @@ Proactive remediations requires the [licensing for Endpoint analytics](enroll-in
 - You can have up to 200 script packages.
    - A script package can contain a detection script only or both a detection script and a remediation script.
 - Ensure the scripts are encoded in UTF-8.
+  - If the option **Enforce script signature check** is enabled in the [Settings](#bkmk_prs_deploy) page of creating a script package, then make sure that the scripts are encoded in UTF-8 not UTF-8 BOM.
 - The maximum allowed output size limit is 2048 characters.
 - If the option **Enforce script signature check** is enabled in the [Settings](#bkmk_prs_deploy) page of creating a script package, the script runs using the device's PowerShell execution policy. The default execution policy for Windows client computers is **Restricted**. The default execution for Windows Server devices is **RemoteSigned**. For more information, see [PowerShell execution policies](/powershell/module/microsoft.powershell.core/about/about_execution_policies#powershell-execution-policies).
    - Scripts built into Proactive remediations are signed and the certificate is added to the **Trusted Publishers** certificate store of the device.
    - When using third-party scripts that are signed, make sure the certificate is in the **Trusted Publishers** certificate store. As with any certificate, the certificate authority must be trusted by the device.
   - Scripts without **Enforce script signature check** use the **Bypass** execution policy.
+- Don't put secrets in scripts. Consider using parameters to handle secrets instead. <!--13957089-->
+- Don't put reboot commands in detection or remediations scripts. <!--13957089-->
 
 ## <a name="bkmk_prs_deploy"></a> Deploy built-in script packages
 

memdocs/autopilot/enrollment-autopilot.md

@@ -65,7 +65,7 @@ ms.collection:
 
       When creating expressions:
 
-      - To create a group that includes all of your Autopilot devices, enter: `(device.devicePhysicalIDs -any (_ -contains "[ZTDId]"))`.
+      - To create a group that includes all of your Autopilot devices, enter: `(device.devicePhysicalIDs -any (_ -contains "[ZTDID]"))`.
       - Intune's group tag field maps to the `OrderID` attribute on Azure AD devices. To create a group that includes all Autopilot devices with a specific group tag (the Azure AD device `OrderID`), enter: `(device.devicePhysicalIds -any (_ -eq "[OrderID]:179887111881"))`.
       - To create a group that includes all your Autopilot devices with a specific Purchase Order ID, enter: `(device.devicePhysicalIds -any (_ -eq "[PurchaseOrderId]:76222342342"))`
 

memdocs/configmgr/apps/deploy-use/uninstall-applications.md

@@ -80,7 +80,7 @@ Many customers have lots of collections because for every application they need
 
 Starting in version 2107, you can enable an application deployment to support implicit uninstall. If a resource is in a collection, the application installs. Then when you remove the resource from the collection, the application uninstalls.
 
-Starting in version 2111, this behavior also supports [application groups](create-app-groups.md#app-approval).<!-- 10479618 --> When this article refers to an _application_, it also applies to app groups.
+Starting in version 2111, this behavior also supports [application groups](create-app-groups.md).<!-- 10479618 --> When this article refers to an _application_, it also applies to app groups.
 
 > [!NOTE]
 > In version 2111 and later, this behavior applies to deployments to device or user collections.<!--10393847--> In version 2107, this behavior only applies to deployments to device collections.

memdocs/configmgr/comanage/tutorial-co-manage-clients.md

@@ -149,7 +149,7 @@ Automatic enrollment also lets users enroll their Windows 10 or later devices to
     > [!NOTE]
     > Some tenants may not have these options to configure.<!-- SCCMDocs#1230 -->
     >
-    > **Microsoft Intune** is how you configure the MDM app for Azure AD. **Microsoft Intune Enrollment** is a specific Azure AD app that's created when you apply multi-factor authentication policies for iOS and Android enrollment. For more information, see [Require multi-factor authentication for Intune device enrollments](/intune/enrollment/multi-factor-authentication).
+    > **Microsoft Intune** is how you configure the MDM app for Azure AD. **Microsoft Intune Enrollment** is a specific Azure AD app that's created when you apply multi-factor authentication policies for iOS and Android enrollment. For more information, see [Require multi-factor authentication for Intune device enrollments](../../intune/enrollment/multi-factor-authentication.md).
 
 5. For MDM user scope, select **All**, and then **Save**.  
 
@@ -159,6 +159,9 @@ With hybrid Azure AD set-up and Configuration Manager client configurations in p
 
 When you enable co-management, you'll assign a collection as a *Pilot group*. This is a group that contains a small number of clients to test your co-management configurations. We recommend you create a suitable collection before you start the procedure. Then you can select that collection without exiting the procedure to do so. You may need multiple collections since you can assign a different *Pilot group* for each workload.
 
+> [!NOTE]
+> Since devices are enrolled in the Microsoft Intune service based on its Azure AD device token, and not a user token, only the default [Intune enrollment restriction](../../intune/enrollment/enrollment-restrictions-set.md) will apply to the enrollment. 
+
 ### Enable co-management for versions 2111 and later
 
 [!INCLUDE [Enable Co-management starting in version 2111](includes/enable-co-management-2111.md)]

memdocs/configmgr/core/TOC.yml

@@ -285,14 +285,14 @@ items:
     items:
     - name: Technical Preview overview
       href: get-started/technical-preview.md
+    - name: 2204 features
+      href: get-started/2022/technical-preview-2204.md       
     - name: 2203 features
       href: get-started/2022/technical-preview-2203.md 
     - name: 2202 features
       href: get-started/2022/technical-preview-2202.md 
     - name: 2201 features
-      href: get-started/2022/technical-preview-2201.md       
-    - name: 2112 features
-      href: get-started/2021/technical-preview-2112.md      
+      href: get-started/2022/technical-preview-2201.md   
   - name: Migrate data between hierarchies
     items:
     - name: Migration overview

memdocs/configmgr/core/clients/deploy/about-client-settings.md

@@ -676,7 +676,7 @@ _Applies to version 2103 and later_
 
 Enable this option for Software Center to use the Microsoft Edge WebView2 browser control. The WebView2 browser control provides improved security and user experience. For example, more websites should work with these custom tabs without displaying script errors or security warnings.
 
-If it's not already installed, the Configuration Manager client installs the **Microsoft Edge WebView2 runtime (fixed version)** on the device. Clients download the WebView2 redistributable installation file from the management point. The installer is over 100 MB in size. If you need to enable this setting on a large number of clients, and are concerned about the effect of network usage, predeploy the WebView2 runtime as an application. Use the software distribution features of Configuration Manager to better control the content distribution and timing of software installation.<!-- 12769440 -->
+If it's not already installed, the Configuration Manager client installs the **Microsoft Edge WebView2 runtime (fixed version)** on the device. The installer is over 100 MB in size. If you need to enable this setting on a large number of clients, and are concerned about the effect of network usage, predeploy the WebView2 runtime as an application. Use the software distribution features of Configuration Manager to better control the content distribution and timing of software installation.<!-- 12769440 -->
 
 > [!NOTE]
 > - If the client device isn't running .NET Framework version 4.6.2 or later, it falls back to use the Internet Explorer browser control. Starting in version 2107, the client requires .NET version 4.6.2, and version 4.8 is recommended.<!--10402814--> For more information, see [Prerequisites for deploying clients to Windows computers](prerequisites-for-deploying-clients-to-windows-computers.md#more-details-about-microsoft-net).

memdocs/configmgr/core/clients/manage/cmg/modify-cloud-management-gateway.md

@@ -95,7 +95,7 @@ To make changes that the conversion process doesn't support, you need to [Redepl
 ### Process to convert a CMG to a virtual machine scale set
 
 > [!IMPORTANT]
-> First review the prerequisites for [virtual machine scale sets](plan-cloud-management-gateway.md#virtual-machine-scale-sets). For example, make sure that you register the necessary [Azure resource providers](configure-azure-ad.md#configure-azure-resource-providers) in the subscription.<!-- memdocs#2434 -->
+> First review the prerequisites for [virtual machine scale sets](plan-cloud-management-gateway.md#virtual-machine-scale-sets). For example, make sure that you register the necessary [Azure resource providers](configure-azure-ad.md#configure-azure-resource-providers) in the subscription<!-- memdocs#2434 -->. You also need both Subscription Owner permission to the associated subscription and Global Administrator permissions for the associated tenant.
 
 1. In the Configuration Manager console, go to the **Administration** workspace, expand **Cloud Services**, and select the **Cloud Management Gateway** node.