Merge conflict resolution

Author: Brenduns

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
     "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",
@@ -1196,10 +1206,16 @@
             "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
+        }        
     ]
 }

README.md

@@ -3,48 +3,54 @@
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
 For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
 
-# Docs.microsoft.com GitHub repository
+# GitHub repository for Microsoft technical documentation
 
-You've found one of the GitHub repositories that houses the source for content published to [https://docs.microsoft.com](https://docs.microsoft.com/.), home of all technical content for Microsoft's Cloud and Enterprise Division.
+You've found one of the GitHub repositories that houses the source for content published to [Microsoft Docs](https://docs.microsoft.com/), home of all technical content for Microsoft's Cloud and Enterprise Division.
 
 ## Contribute to your documentation
+
 We **want and encourage contributions** from our community (users, customers, partners, friends on other planets) and Microsoft employees to improve your documentation. Here are some tips:
 
-* **Create a GitHub account**: Sign up is free at [GitHub.com](https://www.github.com).
+* **Create a GitHub account**: Sign up for free at [GitHub](https://www.github.com).
+
+* **Use your browser**: There are two options:
 
-* **Use your browser**: There are two options: 
+    **Option 1: Edit directly from Microsoft Docs**
 
-    **Option 1: Edit directly from docs.microsoft.com**  
-    1. Go to the topic, such as [https://docs.microsoft.com/mem/intune/protect/troubleshoot-policies-in-microsoft-intune](mem/intune/protect/troubleshoot-policies-in-microsoft-intune.md). 
+    1. Browse to the [InTune](/mem/intune) article you want to edit.
     2. Select **Edit** (top right). This shows the markdown file in the GitHub repository.
-    3. Select the pencil icon. When you hover over the pencil icon, you'll see the **Edit this file** tooltip. 
-    4. Make your changes, and then **commit** your changes. 
+    3. Select the pencil icon. When you hover over the pencil icon, you'll see the **Edit this file** tooltip.
+    4. Make your changes, and then **commit** your changes.
     5. Create the pull request.
-    
-    **Option 2: Find the article in this repository, and update**  
-    1. Most topics are in `https://github.com/MicrosoftDocs/memdocs/tree/master/memdocs/intune`. In this folder, search for the topic name, such as `troubleshoot-policies-in-microsoft-intune`. 
-    2. Select the link, and click the pencil icon. When you hover over the pencil icon, you'll see the **Edit this file** tooltip. 
-    3. Make your changes, and then **commit** your changes. 
-    4. Create the pull request. 
+
+    **Option 2: Find the article in this repository, and update**
+
+    1. Most topics are in `https://github.com/MicrosoftDocs/memdocs/tree/master/memdocs/intune`. In this folder, search for the topic name, such as `troubleshoot-policies-in-microsoft-intune`.
+    2. Select the link, and click the pencil icon. When you hover over the pencil icon, you'll see the **Edit this file** tooltip.
+    3. Make your changes, and then **commit** your changes.
+    4. Create the pull request.
 
   When you make an update, you may be prompted to sign a license agreement. This is a one-time task. So any future updates by your GitHub username won't need to sign again. 
 
   The value in the `author` metadata (at the top of every topic) lists the GitHub author. In the `troubleshoot-policies-in-microsoft-intune` example, you'll see `MandiOhlinger`. In your pull request, you can also mention (@*authorValue*) the author if you like.
 
-* **MSFT Employees**: After you create a GitHub account, link it to your Microsoft email address. When your account is linked, you don't have to sign a license agreement to make an update. Steps:
+* **MSFT Employees**: After you create a GitHub account, link it to your Microsoft email address. When your account is linked, you don't have to sign a license agreement to make an update. Follow these steps:
 
-  1. On a device with corpnet, go to [GitHub account setup](https://review.docs.microsoft.com/en-us/help/contribute/contribute-get-started-setup-github?branch=master). If you're not on corpnet, this link returns a 404.
+  1. On a device with access to corpnet, go to [GitHub account setup](https://review.docs.microsoft.com/en-us/help/contribute/contribute-get-started-setup-github?branch=master). If you're not on corpnet, this link returns a 404.
 
-    Creating a GitHub account, and linking to your Microsoft account is a one-time thing. When your account is linked, you don't have to sign a license agreement to make an update. 
+     Creating a GitHub account, and linking to your Microsoft account is a one-time thing. When your account is linked, you don't have to sign a license agreement to make an update.
 
-  2. In your browser, go to the article, and select **Edit**. Switch to the private repo (IntuneDocs-pr):  
-    **From**: https://github.com/MicrosoftDocs/memdocs/...  
-    **To**: https://github.com/MicrosoftDocs/memdocs-pr/...
+  2. In your browser, go to the article, and select **Edit**. Switch to the private repo (`IntuneDocs-pr`):
+
+     **From**: `https://github.com/MicrosoftDocs/memdocs/...`
+
+     **To**: `https://github.com/MicrosoftDocs/memdocs-pr/...`
 
-  3. Select the pencil icon, and make your changes. 
+  3. Select the pencil icon, and make your changes.
 
 ## Use markdown to format your topic
-All the articles in this repository use GitHub-flavored markdown. Here's a list of resources to get started:
+
+All the articles in this repository use GitHub-flavored Markdown. Here's a list of resources to get started:
 
 * [Markdown basics](https://help.github.com/articles/basic-writing-and-formatting-syntax/)
 * [Printable markdown cheatsheet](https://guides.github.com/pdfs/markdown-cheatsheet-online.pdf)

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/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.

memdocs/analytics/media/8529842-application-reliability.png

@@ -27,8 +27,8 @@ items:
     href: app-reliability.md
   - name: Work from anywhere
     href: work-from-anywhere.md
-  - name: Endpoint analytics in Microsoft Productivity Score
-    href: productivity-score.md
+  - name: Endpoint analytics in Microsoft Adoption Score
+    href: adoption-score.md
 - name: How-to guides
   items:
   - name: Manage settings

memdocs/analytics/media/8529842-endpoint-analytics-microsoft-365-admin-center.png

@@ -13,7 +13,7 @@ author: aczechowski
 ms.author: aaroncz
 ms.reviewer: jubaptis
 manager: dougeby
-ms.date: 08/23/2021
+ms.date: 08/23/2022
 ms.collection:
   - M365-modern-desktop
   - highpri
@@ -132,7 +132,7 @@ Some of these services will also need to check certificate revocation lists (CRL
 
 The device can be hybrid Azure AD joined. The computer should be on the internal network for hybrid Azure AD join to work. For more information, see [Windows Autopilot user-driven mode](user-driven.md#user-driven-mode-for-hybrid-azure-ad-join).
 
-### <a name="tpm"></a> Autopilot self-Deploying mode and Autopilot pre-provisioning
+### <a name="tpm"></a> Autopilot self-deploying mode and Autopilot pre-provisioning
 
 The TPM attestation process requires access to a set of HTTPS URLs, which are unique for each TPM provider. Ensure access to this URL pattern: `*.microsoftaik.azure.net`.
 

memdocs/analytics/media/8529842-startup-performance-metrics.png

@@ -9,7 +9,7 @@ author: scottbreenmsft
 
 ms.author: brenduns
 manager: dougeby
-ms.date: 06/01/2022
+ms.date: 09/07/2022
 ms.topic: conceptual
 ms.service: mem
 ms.subservice: fundamentals
@@ -28,6 +28,7 @@ ms.custom: intune-azure
 ms.collection:
   - M365-identity-device-management
   - highpri
+  - highseo
 ---
 
 # Tutorial: Set up and configure a cloud-native Windows endpoint with Microsoft Endpoint Manager
@@ -560,6 +561,12 @@ Following are some settings available in the settings catalog that might be rele
   - Microsoft App Store
     - Require Private Store Only - **Only Private store is enabled**
 
+      > [!NOTE]
+      > This setting applies to Windows 10. On Windows 11, this setting blocks access to the public Microsoft store. A private store is coming to Windows 11. For more information, go to:
+      > 
+      > - [Update to Endpoint Manager integration with the Microsoft Store on Windows](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/update-to-endpoint-manager-integration-with-the-microsoft-store/ba-p/3585077)
+      > - [FAQ: Supporting Microsoft Store experiences on managed devices](https://techcommunity.microsoft.com/t5/windows-management/faq-supporting-microsoft-store-experiences-on-managed-devices/m-p/3585286)
+
 - **Block Gaming**  
   Organizations might prefer that corporate endpoints can't be used to play games. The Gaming page within the Settings app can be hidden entirely using the following setting.
   For additional information on the settings page visibility, go to the [CSP documentation](/windows/client-management/mdm/policy-csp-settings#settings-pagevisibilitylist) and the ms-settings [URI scheme reference](/windows/uwp/launch-resume/launch-settings-app#ms-settings-uri-scheme-reference).