Fixing merge conflict

Author: Brenduns

memdocs/analytics/app-reliability.md

@@ -2,7 +2,7 @@
 title: Application reliability in endpoint analytics
 description: Get details about application reliability in endpoint analytics
 titleSuffix: Microsoft Endpoint Manager
-ms.date: 03/01/2021
+ms.date: 03/31/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-analytics
 ms.topic: conceptual
@@ -89,6 +89,8 @@ Selecting a device name opens the **Application reliability** tab for that devic
 
 ## Known issues
 
+[!INCLUDE [Endpoint analytics export to csv value mapping known issue](includes/known-issue-csv-mapping.md)]
+
 ### Some eligible, enrolled devices aren't appearing in the report due to a client certificate issue
 
 **Scenario**: In certain uncommon situations, devices may be missing from the **Application reliability** report. You can determine how many devices are reporting application reliability data by looking at the number of records in the table on the **Device performance** tab of the **Application reliability** report.

memdocs/analytics/includes/known-issue-csv-mapping.md

@@ -0,0 +1,47 @@
+---
+author: mestew
+ms.author: mstewart
+ms.prod: configuration-manager
+ms.technology: configmgr-comanage
+ms.topic: include
+ms.date: 03/31/2022
+ms.localizationpriority: high
+---
+<!--Don't apply H2 in this include file since they are context driven by article. Used in startup-performance.md, work-from-anywhere.md, app-reliability.md, and scores.md files -->
+### Exported csv files display numerical values
+
+When reporting data is exported to a `.csv` file, the exported data doesn't use the friendly names you're used to seeing in the online reports. Use the information below to map the data in the exported file into the meaning of the value: 
+
+**Application reliability report** </br>
+
+- The `TotalAppUsageDuration` and `MeanTimeToFailure` columns in the `.csv` file are integer values with a unit of **minutes**
+- A `MeanTimeToFailure` value of 2147483647 means `No crash events`
+
+**Per device score report** </br>
+
+- A value of `-1` or `-2` in the `EndpointAnalyticsScore`, `StartupPerformanceScore`, and `AppReliabilityScore` columns means the associated score is unavailable
+- Health status: </br>
+
+   |HealthStatus `.csv` value| Report value|
+   |---|---|
+   |0|Unknown|
+   |1|Insufficient data|
+   |2|Needs attention|
+   |3|Meeting goals|
+
+**Startup performance report** </br> 
+
+The `CoreBootTime`, `GPBootTime`, `CoreLogonTime`, `GPLogonTime`, `DesktopUsableTime`, `Median`, and `TimePerProcess` columns are integer values with a unit of **seconds**.
+
+**Work from anywhere report** </br>
+- Column name in `.csv` file: UpgradeEligibility </br>
+Report column name: Windows 11 readiness status </br>
+
+   |`.csv` value| Report value|
+   |---|---|
+   |0|Upgraded|
+   |1|Unknown|
+   |2|Not capable|
+   |3|Capable|
+
+- Column name in `.csv` file: GraphDeviceIsManaged </br> Report column name: Azure AD registered

memdocs/analytics/scores.md

@@ -2,7 +2,7 @@
 title: Scores, baselines, and insights in Endpoint Analytics
 titleSuffix: Microsoft Endpoint Manager
 description: Learn about scores, baselines, and insights in Endpoint Analytics
-ms.date: 03/22/2022
+ms.date: 03/31/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-analytics
 ms.topic: conceptual
@@ -80,6 +80,10 @@ Use the **Add filter** option on tables to display items that match your criteri
 > - The **Disk type** filter doesn't support the value **Unknown**<!--12829141-->. 
 > - Filtering on **Startup performance score** from **Overview** > **Device Scores** returns devices with a score of "--". <!--12829158-->
 
+## Known issues
+
+[!INCLUDE [Endpoint analytics export to csv value mapping known issue](includes/known-issue-csv-mapping.md)]
+
 ## Next steps
 
 - Use [Proactive remediations](proactive-remediations.md) to gather more data and take action on devices

memdocs/analytics/startup-performance.md

@@ -2,7 +2,7 @@
 title: Startup performance in Endpoint Analytics
 titleSuffix: Microsoft Endpoint Manager
 description: Get details about device startup performance in Endpoint Analytics
-ms.date: 11/15/2021
+ms.date: 03/31/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-analytics
 ms.topic: conceptual
@@ -47,7 +47,7 @@ The **Startup performance** page also provides a prioritized list of **Insights
 
 Startup performance provides an insight on the number of devices on which the boot drive is a hard disk. Hard disk drives typically result in boot times three to four times longer than solid-state drives. We also report the expected improvement to start up performance you would gain by moving to solid-state drives.
 
-Click though to see the list of devices that have hard disk drives. The recommended action is to upgrade these devices to solid-state drives.
+Click through to see the list of devices that have hard disk drives. The recommended action is to upgrade these devices to solid-state drives.
 
 ### <a name="bkmk_gp"></a> Group Policy
 
@@ -74,6 +74,10 @@ The **Startup performance** page has reporting tabs that provide support for the
    - **Median delay**: The median delay time of the process for the counted devices.
    - **Total delay**: The sum of the delays for all of the counted devices.
 
+## Known issues
+
+[!INCLUDE [Endpoint analytics export to csv value mapping known issue](includes/known-issue-csv-mapping.md)]
+
 ## Next steps
 
 - Use the [Work from anywhere report](work-from-anywhere.md).

memdocs/analytics/work-from-anywhere.md

@@ -2,7 +2,7 @@
 title: Work from anywhere report in Endpoint analytics
 titleSuffix: Microsoft Endpoint Manager
 description: The Work from anywhere report in Endpoint analytics provides insights to help your end users be productive from anywhere.
-ms.date: 02/23/2022
+ms.date: 03/31/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-analytics
 ms.topic: conceptual
@@ -93,6 +93,9 @@ In the **Windows** tab, a device-by-device view of Windows 11 hardware readiness
 
 The built-in baseline of **All organizations (median)** doesn't currently have metrics for the subscore metrics listed in the sections above.
 
+## Known issues
+
+[!INCLUDE [Endpoint analytics export to csv value mapping known issue](includes/known-issue-csv-mapping.md)]
 ## Next steps
 
 - View [Startup performance](startup-performance.md)

memdocs/autopilot/windows-autopilot-hybrid.md

@@ -126,10 +126,13 @@ The Intune Connector requires the [same endpoints as Intune](../intune/fundament
 4. Open the downloaded Connector setup file, *ODJConnectorBootstrapper.exe*, to install the Connector.
 5. At the end of the setup, select **Configure**.
 6. Select **Sign In**.
-7. Enter the user Global Administrator or Intune Administrator role credentials. 
+7. Enter the Global administrator or Intune administrator role credentials. 
  The user account must have an assigned Intune license.
 8. Go to **Devices** > **Windows** > **Windows enrollment** > **Intune Connector for Active Directory**, and then confirm that the connection status is **Active**.
 
+> [!NOTE]
+> The Global administrator role is a temporary requirement at the time of installation.
+
 > [!NOTE]
 > After you sign in to the Connector, it might take a couple of minutes to appear in the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431). It appears only if it can successfully communicate with the Intune service.
 
@@ -204,6 +207,7 @@ Here is a list of VPN clients that are known to be tested and validated:
 - Checkpoint (Win32 client)
 - Citrix NetScaler (Win32 client)
 - SonicWall (Win32 client)
+- FortiClient VPN (Win32 client)
 
 **Not supported clients:**
 - UWP-based VPN plug-ins
@@ -246,9 +250,10 @@ It takes about 15 minutes for the device profile status to change from *Not assi
     - **Name**: Enter a descriptive name for the new profile.
     - **Description**: Enter a description for the profile.
     - **Platform**: Select **Windows 10 and later**.
-    - **Profile type**: Select **Domain Join**.
-3. Select **Settings**, and then provide a **Computer name prefix**, **Domain name**.
-4. (Optional) Provide an **Organizational unit** (OU) in [DN format](/windows/desktop/ad/object-names-and-identities#distinguished-name). Your options include:
+    - **Profile type**: Select **Templates**, choose the template name **Domain Join** and select **Create**.
+3. Enter the **Name** and **Description** and select **Next**. 
+5. Provide a **Computer name prefix** and **Domain name**.
+6. (Optional) Provide an **Organizational unit** (OU) in [DN format](/windows/desktop/ad/object-names-and-identities#distinguished-name). Your options include:
     - Provide an OU in which you've delegated control to your Windows 2016 device that is running the Intune Connector.
     - Provide an OU in which you've delegated control to the root computers in your on-prem Active Directory.
     - If you leave this blank, the computer object will be created in the Active Directory default container (CN=Computers if you never [changed it](https://support.microsoft.com/help/324949/redirecting-the-users-and-computers-containers-in-active-directory-dom)).

memdocs/configmgr/develop/core/clients/asset-intelligence/how-to-initiate-a-synchronization.md

@@ -1,4 +1,5 @@
 ---
+description: Learn how to synchronize the asset intelligence catalog outside the normal synchronization schedule.
 title: "Initiate a Synchronization"
 titleSuffix: "Configuration Manager"
 ms.date: "09/20/2016"

memdocs/configmgr/develop/core/clients/programming/how-to-connect-to-the-client-wmi-namespace.md

@@ -1,4 +1,5 @@
 ---
+description: Learn how to connect to the Configuration Manager client Windows Management Instrumentation (WMI) provider, you create a ManagementScope object in the \\\Client\root\ccm namespace.
 title: "Connect to the Client WMI Namespace"
 titleSuffix: "Configuration Manager"
 ms.date: "09/20/2016"

memdocs/configmgr/develop/core/clients/remote-control/how-to-configure-remote-tools-settings.md

@@ -1,6 +1,7 @@
 ---
 title: "Configure Remote Tools Settings"
 titleSuffix: "Configuration Manager"
+description: "Learn how to use the Remote Tools Client Agent settings by modifying the necessary site control file settings."
 ms.date: "09/20/2016"
 ms.prod: "configuration-manager"
 ms.technology: configmgr-sdk

memdocs/configmgr/develop/core/servers/configure/how-to-assign-an-advertisement-to-a-collection-of-computers.md

@@ -1,4 +1,5 @@
 ---
+description: Learn how to use the SMS_Advertisement class to assign an advertisement to a collection of computers.
 title: "Assign an Advertisement to a Collection of Computers"
 titleSuffix: "Configuration Manager"
 ms.date: "09/20/2016"