Merge branch 'main' into patch-82

Author: Erikre

.gitignore

@@ -16,3 +16,4 @@ _themes/
 .openpublishing.build.mdproj
 .openpublishing.buildcore.ps1
 packages.config
+.DS_Store

.openpublishing.redirection.json

@@ -1,5 +1,84 @@
 {
     "redirections": [
+        {
+            "source_path": "memdocs/intune/developer/app-sdk-android.md",
+            "redirect_url": "/mem/intune/developer/app-sdk-android-phase1",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "memdocs/intune/developer/app-sdk-android-testing-guide.md",
+            "redirect_url": "/mem/intune/developer/app-sdk-android-phase1",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "memdocs/intune/fundamentals/end-user-company-portal-messages.md",
+            "redirect_url": "/mem/intune/user-help/sign-in-to-the-company-portal",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "memdocs/intune/user-help/your-device-is-noncompliant-cant-evaluate.md",
+            "redirect_url": "/mem/intune/user-help/",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "memdocs/intune/user-help/you-need-to-update-your-company-portal-app-windows.md",
+            "redirect_url": "/mem/intune/user-help/install-a-new-version-of-the-company-portal-app",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "memdocs/intune/user-help/what-happens-if-you-install-the-Company-Portal-app-and-enroll-your-device-in-intune-ios.md",
+            "redirect_url": "/mem/intune/user-help/use-managed-devices-to-get-work-done",
+        }, 
+        {
+            "source_path": "memdocs/intune/user-help/how-to-set-the-period-before-your-android-device-is-locked.md",
+            "redirect_url": "/mem/intune/user-help/set-the-amount-of-time-before-your-device-is-locked-android",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "memdocs/intune/user-help/how-to-reconnect-a-compromised-android-device.md",
+            "redirect_url": "/mem/intune/user-help/your-device-is-rooted-and-you-cant-connect-android",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "memdocs/intune/user-help/how-to-encrypt-your-windows-device.md",
+            "redirect_url": "https://support.microsoft.com/windows/turn-on-device-encryption-0c453637-bc88-5f74-5105-741561aae838",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path": "memdocs/intune/fundamentals/end-user-mam-apps-android.md",
+            "redirect_url": "/mem/intune/user-help/use-managed-apps-on-your-device-android",
+            "redirect_document_id": true
+        }, 
+        {
+            "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 +1176,46 @@
             "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
+        },
+        {
+            "source_path": "memdocs/analytics/productivity-score.md",
+            "redirect_url": "/mem/analytics/adoption-score",
+            "redirect_document_id": false
+        }        
     ]
 }

memdocs/analytics/productivity-score.md memdocs/analytics/adoption-score.mdmemdocs/analytics/productivity-score.md renamed to memdocs/analytics/adoption-score.md

@@ -1,8 +1,8 @@
 ---
-title: Endpoint analytics page in Microsoft Productivity Score
+title: Endpoint analytics page in Microsoft Adoption Score
 titleSuffix: Microsoft Endpoint Manager
-description: Get details about endpoint analytics in Microsoft Productivity Score
-ms.date: 11/15/2021
+description: Get details about endpoint analytics in Microsoft Adoption Score
+ms.date: 08/25/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-analytics
 ms.topic: conceptual
@@ -12,17 +12,17 @@ manager: dougeby
 ms.localizationpriority: high
 ---
 
-# Endpoint analytics in Microsoft Productivity Score
-<!--IN8529842-->
- Understanding how your devices contribute to your end user’s experience is critical to any digital transformation effort. Endpoint analytics information was added to the Microsoft productivity score to further your understanding. The **Endpoint analytics** page in [Microsoft Productivity Score](/microsoft-365/admin/productivity/productivity-score) shares organizational level insights with the other roles outside of Microsoft Endpoint Manager. The visibility and insights this provides in areas like device boot times and application reliability can help your users by highlighting potential issues within your organization. For instance, Endpoint analytics can expose a long sign-in process or issues with applications unexpectedly stopping.  
+# Endpoint analytics in Microsoft Adoption Score
+<!--IN8529842, MAX6471785-->
+Understanding how your devices contribute to your end user's experience is critical to any digital transformation effort. Endpoint analytics information was added to the Microsoft Adoption Score to further your understanding. The **Endpoint analytics** page in [Microsoft Adoption Score](/microsoft-365/admin/productivity/productivity-score) shares organizational level insights with the other roles outside of Microsoft Endpoint Manager. The visibility and insights this provides in areas like device boot times and application reliability can help your users by highlighting potential issues within your organization. For instance, Endpoint analytics can expose a long sign-in process or issues with applications unexpectedly stopping.  
 
-## Endpoint analytics page in the Productivity Score report
+## Endpoint analytics page in the Adoption Score report
 
-Endpoint analytics contains great insights, but most people couldn't see them since it requires access to the Microsoft Endpoint Manager admin center. If you happened to be an Intune Admin or a Global Administrator, you could display the analytics. However, other users of Microsoft Productivity Score may have been unaware this information existed. Displaying these insights to Microsoft Productivity Score users allows them to use the data to help drive transformation efforts across your organization.
+Endpoint analytics contains great insights, but most people couldn't see them since it requires access to the Microsoft Endpoint Manager admin center. If you happened to be an Intune Admin or a Global Administrator, you could display the analytics. However, other users of Microsoft Adoption Score may have been unaware this information existed. Displaying these insights to Microsoft Adoption Score users allows them to use the data to help drive transformation efforts across your organization.
 
 :::image type="content" source="media/8529842-endpoint-analytics-microsoft-365-admin-center.png" alt-text="Endpoint analytics in the Microsoft 365 admin center" lightbox="media/8529842-endpoint-analytics-microsoft-365-admin-center.png":::
 
-The **Endpoint analytics** page looks similar to the other pages in Productivity Score, making it easy to dive right in. The following information is displayed on the **Endpoint analytics** page:
+The **Endpoint analytics** page looks similar to the other pages in Adoption Score, making it easy to dive right in. The following information is displayed on the **Endpoint analytics** page:
 
 - The current Endpoint analytics score
 - Endpoint analytics score over the past 180 days
@@ -53,7 +53,7 @@ Selecting the **Learn more** link under the startup performance information give
 
 ## Application reliability metrics
 
-The overall **Application reliability score** for your tenant is shown with the peer benchmark in the chart. Selecting the **Learn more about app reliability** link under the app reliability information gives you additional details and a link to **View more in Microsoft Endpoint Manager**. The following **Application reliability** information is provided from [Microsoft Productivity Score](/microsoft-365/admin/productivity/productivity-score):
+The overall **Application reliability score** for your tenant is shown with the peer benchmark in the chart. Selecting the **Learn more about app reliability** link under the app reliability information gives you additional details and a link to **View more in Microsoft Endpoint Manager**. The following **Application reliability** information is provided from [Microsoft Adoption Score](/microsoft-365/admin/productivity/productivity-score):
 
 - **Top apps reducing your score in the last 14 days**
    - **App name**: The app identifier in the file manifest provided by your client devices. The app name is typically in executable (or .exe) format.
@@ -71,8 +71,9 @@ Currently, the following roles aren't supported:
 - Exchange Administrator
 - SharePoint Administrator
 - Lync Administrator
+
 ## Next steps
 
 For more information, see:
 - [Work from anywhere](work-from-anywhere.md) 
-- [Startup performance scores](startup-performance.md)
+- [Startup performance scores](startup-performance.md)

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/includes/startup-score.md

@@ -7,7 +7,7 @@ ms.topic: include
 ms.date: 03/03/2020
 ms.localizationpriority: medium
 ---
-<!--Don't apply H2 in this include file since they are context driven by article. Used in the productivity-score.md and startup-performance.md files -->
+<!--Don't apply H2 in this include file since they are context driven by article. Used in the adoption-score.md and startup-performance.md files -->
 The **Startup performance score** helps IT get users from power-on to productivity quickly, without lengthy boot and sign-in delays. The **Startup score** is a number between 0 and 100. This score is a weighted average of **Boot score** and the **Sign-in** score, which are computed as follows:
 
 - **Boot score**: Based on the time from power-on to sign in. We look at the last boot time from each device, excluding the update phase, then score it from 0 (poor) to 100 (exceptional). These scores are averaged to provide an overall tenant boot score.