Merge conflicts and January release date changes

Author: Brenduns

.acrolinx-config.edn

@@ -1,2 +1,2 @@
-{:allowed-branchname-matches ["master" "release-.*"]
+{:allowed-branchname-matches ["main" "release-.*"]
  :allowed-filename-matches ["(?i)memdocs/(?:(?!configmgr/mdt/use-the-mdt.md))" "windows-365"]}

.openpublishing.publish.config.json

@@ -35,15 +35,15 @@
   "sync_notification_subscribers": [],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/memdocs",
-  "git_repository_branch_open_to_public_contributors": "master",
+  "git_repository_branch_open_to_public_contributors": "main",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "contribution_branch_mappings": {},
   "dependent_repositories": [
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -55,7 +55,7 @@
     {
       "path_to_root": "_themes.pdf",
       "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     }
   ],

.openpublishing.redirection.json

@@ -1062,7 +1062,26 @@
             "source_path": "windows-365/whats-new.md",
             "redirect_url": "/windows-365/enterprise/whats-new",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/analytics/recommended-software.md",  
+            "redirect_url": "/mem/analytics/work-from-anywhere",  
+            "redirect_document_id": true 
+        },
+        {
+            "source_path": "memdocs/configmgr/develop/core/understand/configuration-manager-sdk-samples.md",
+            "redirect_url": "/mem/configmgr/develop/core/changes/whats-new-sdk",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/configmgr/develop/core/changes/what-s-new-in-the-system-center-configuration-manager-sdk.md",
+            "redirect_url": "/mem/configmgr/develop/core/changes/whats-new-sdk",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "memdocs/configmgr/develop/core/understand/sqlviews/reports-supplied-with-configuration-manager.md",
+            "redirect_url": "/mem/configmgr/core/servers/manage/list-of-reports",
+            "redirect_document_id": true
         }
-
     ]
 }

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: 10/05/2021
+ms.date: 11/15/2021
 ms.prod: configuration-manager
 ms.technology: configmgr-analytics
 ms.topic: quickstart
@@ -11,6 +11,7 @@ ms.author: mstewart
 manager: dougeby
 # Customer intent: As a Microsoft Endpoint Manager administrator, I want to enroll Configuration Manager devices into Endpoint analytics so that I can gain insights into the user experience.
 ms.localizationpriority: high
+ms.collection: highpri
 ---
 
 # Quickstart: Enroll Configuration Manager devices into Endpoint analytics
@@ -56,12 +57,12 @@ Configuration Manager-managed devices send data to Intune via the connector on t
 ## Limitations
 
 - Endpoint analytics insights are not available for devices running Windows Server editions.
-- With the exception of the [Recommended software report](recommended-software.md), Endpoint analytics supports only Windows 10 or later devices.
 - Using multiple Configuration Manager hierarchies with a single Endpoint analytics instance is not currently supported.
 
 ## <a name="bkmk_cm_enroll"></a> Enroll devices managed by Configuration Manager
 <!--6051638, 5924760-->
-Before you enroll Configuration Manager devices, verify the [prerequisites](#bkmk_prereq) including enabling [Microsoft Endpoint Manager tenant attach](../configmgr/tenant-attach/device-sync-actions.md).
+Before you enroll Configuration Manager devices, verify the [prerequisites](#bkmk_prereq) including enabling [Microsoft Endpoint Manager tenant attach](../configmgr/tenant-attach/device-sync-actions.md). Starting in Configuration Manager 2111, cloud attaching your environment was simplified. You can use the recommended defaults to enable both Endpoint analytics and tenant attach at the same time. For more information, see [Enable cloud attach](..\configmgr\cloud-attach\enable.md).<!--10964629-->
+
 
 ### <a name="bkmk_cm_upload"></a> Enable data upload in Configuration Manager
 
@@ -84,7 +85,7 @@ Onboarding from  the Endpoint analytics portal is required for both  Configurati
 
 The **Enable Endpoint analytics data collection** client setting allows your managed endpoints to send data necessary for Endpoint analytics to your site server. This setting does not control whether data gets uploaded to the Microsoft Endpoint Manager admin center.
 
-Starting in Configuration Manager version 2006, the **Enable Endpoint analytics data collection** setting is enabled by default for devices targeted by only the default [client settings](../configmgr/core/clients/deploy/about-client-settings.md). If you're upgrading to version 2006 from Configuration Manager version 1910 or prior, the Endpoint analytics data collection policy will be enabled in your custom client settings upon upgrade. You can enable or disable data collection by following the instructions below: <!--7065447, 7741111-->
+The **Enable Endpoint analytics data collection** setting is enabled by default for devices targeted by only the default [client settings](../configmgr/core/clients/deploy/about-client-settings.md). If you're upgrading to version 2006 from Configuration Manager version 1910 or prior, the Endpoint analytics data collection policy will be enabled in your custom client settings upon upgrade. You can enable or disable data collection by following the instructions below: <!--7065447, 7741111-->
 
 1. In the Configuration Manager console, go to **Administration** > **Client Settings** > **Default Client Settings**.
 1. Right-click and select **Properties** then select the **Computer Agent** settings.

memdocs/analytics/enroll-intune.md

@@ -11,6 +11,7 @@ ms.author: mstewart
 manager: dougeby
 # Customer intent: As a Microsoft Endpoint Manager administrator, I want to enroll Intune devices into Endpoint analytics so that I can gain insights into the user experience.
 ms.localizationpriority: high
+ms.collection: highpri
 ---
 
 # Quickstart: Enroll Intune devices into Endpoint analytics

memdocs/analytics/includes/overview-page.md

@@ -4,18 +4,18 @@ ms.author: mstewart
 ms.prod: configuration-manager
 ms.technology: configmgr-comanage
 ms.topic: include
-ms.date: 06/30/2020
-ms.localizationpriority: medium
+ms.date: 11/15/2021
+ms.localizationpriority: high
 ---
 <!--Don't apply H2 in this include file since they are context driven by article. Used in scores.md, enroll-configmgr.md and enroll-intune.md files -->
 
-- The **Endpoint analytics score** is a 50/50 weighted average of the [**Recommended software**](../recommended-software.md) and [**Startup performance scores**](../startup-performance.md). We'll be expanding the set of subscores over time.
+- The **Endpoint analytics score** is a weighted average of the [Startup performance](../startup-performance.md), [Application reliability](../app-reliability.md), and [Work from anywhere](../work-from-anywhere.md) scores.
 
 - You can compare your current score to other scores by setting a baseline.
   - There's a built-in baseline for **All organizations (median)** to see how you compare to a typical enterprise. You can create new baselines based on your current metrics so you can track progress or view regressions over time. For more information, see [baseline settings](../settings.md#bkmk_baselines).
    - Baseline markers are shown for your overall score and subscores. If any of the scores have regressed by more than the configurable threshold from the selected baseline, the score is displayed in red and the top-level score is flagged as needing attention.
   - A status of **insufficient data** means you don't have enough devices reporting to provide a meaningful score. We currently require at least five devices.
 
-- **Insights and recommendations** is a prioritized list to improve your score. This list is filtered to the subnode's context when you navigate to **Best practices** or **Recommended software**.
+- **Insights and recommendations** is a prioritized list to improve your score. This list is filtered to the subnode's context when you navigate.
 
-[![Endpoint analytics overview page](../media/overview-page.png)](../media/overview-page.png#lightbox)
+:::image type="content" source="../media/8816759-overview-page.png" alt-text="Screenshot of the Endpoint analytics overview page." lightbox="../media/8816759-overview-page.png":::

memdocs/analytics/index.yml

@@ -12,6 +12,7 @@ metadata:
   ms.author: mstewart
   ms.date: 09/23/2021
   ms.localizationpriority: high
+  ms.collection: highpri
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
 
@@ -22,6 +23,14 @@ landingContent:
         links:
           - text: Endpoint analytics overview
             url: overview.md
+          - text: Scores, baselines, and insights
+            url: scores.md
+      - linkListType: whats-new
+        links:
+          - text: Work from anywhere
+            url: work-from-anywhere.md
+          - text: Startup performance
+            url: startup-performance.md
 
   # Card 
   - title: Get started