Fix merge conflict with recent WN update for 2207

Author: Brenduns

memdocs/autopilot/known-issues.md

@@ -30,7 +30,7 @@ This article describes known issues that can often be resolved by configuration
 
 ### Autopilot profile not being applied when assigned 
 
-In Windows 10 April (KB5011831) release, there is an issue where the Autopilot profile may fail to apply to the device. As a result, any settings made in the profile may not be configured for the user such as device renaming. To resolve this issue, the May (KB5015020) cumulative update needs to be applied to the device.
+In Windows 10 April and some May update releases, there is an issue where the Autopilot profile may fail to apply to the device and the hardware hash may not be harvested. As a result, any settings made in the profile may not be configured for the user such as device renaming. To resolve this issue, the May (KB5015020) cumulative update needs to be applied to the device.
 
 ### DefaultuserX profile not deleted
 

memdocs/autopilot/profiles.md

@@ -1,23 +1,18 @@
 ---
 title: Configure Autopilot profiles
 description: Learn how to configure device profiles for Windows Autopilot deployment.
-keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
 ms.technology: windows
 ms.prod: w10
-ms.mktglfcycl: deploy
 ms.localizationpriority: medium
-ms.sitesec: library
-ms.pagetype: deploy
-audience: itpro
 author: aczechowski
 ms.author: aaroncz
 ms.reviewer: jubaptis
 manager: dougeby
-ms.date: 11/05/2021
+ms.date: 07/18/2022
 ms.collection:
   - M365-modern-desktop
   - highpri
-ms.topic: article
+ms.topic: how-to
 ---
 
 # Configure Autopilot profiles
@@ -30,6 +25,14 @@ ms.topic: article
 
 After you have [created a device group](enrollment-autopilot.md), you can apply a Windows Autopilot deployment profile to each device in the group.  Deployment profiles determine the deployment mode, and customize the OOBE for your end users.
 
+You can create Autopilot profiles through:
+
+1. [Microsoft Admin Center](https://admin.microsoft.com/)
+2. [Intune console](https://endpoint.microsoft.com/)
+3. [Intune graph](/graph/api/resources/intune-graph-overview)
+
+For Intune managed devices, pre-provisioning, self-deploying, and co-management profiles can only be created and assigned in Intune.
+
 ## Create an Autopilot deployment profile
 
 Autopilot deployment profiles are used to configure the Autopilot devices. You can create up to 350 profiles per tenant.

memdocs/azure-ad-joined-hybrid-azure-ad-joined.md

@@ -9,7 +9,7 @@ author: MandiOhlinger
 
 ms.author: mandia
 manager: dougeby
-ms.date: 06/01/2022
+ms.date: 07/13/2022
 ms.topic: conceptual
 ms.service: mem
 ms.subservice: fundamentals
@@ -38,7 +38,7 @@ Many critical and valuable services, including [Conditional Access](/azure/activ
 
 When moving to cloud-native endpoints, you need to understand the differences between Azure AD joined and hybrid Azure AD joined devices:
 
-- **Azure AD joined** (AADJ): Devices are joined to an Azure Active Directory (Azure AD). They're not joined to on-premises Azure AD.
+- **Azure AD joined** (AADJ): Devices are joined to an Azure Active Directory (Azure AD). They're not joined to on-premises AD.
 
   For more specific information, go to [Azure AD joined devices](/azure/active-directory/devices/concept-azure-ad-join) (opens another Microsoft website).
 
@@ -112,10 +112,7 @@ If your organization is ready and wants to be cloud-native, then [Azure AD joine
 
 ### Hybrid Azure AD joined resources
 
-For information on how to register your existing domain joined devices to Azure AD, go to:
-
-- [Configure hybrid Azure AD join for managed domains](/azure/active-directory/devices/hybrid-azuread-join-managed-domains)
-- [Configure hybrid Azure AD join for federated domains](/azure/active-directory/devices/hybrid-azuread-join-federated-domains)
+For information on how to register your existing domain joined devices to Azure AD, go to [Configure hybrid Azure AD join](/azure/active-directory/devices/howto-hybrid-azure-ad-join). [Configure hybrid Azure AD join](/azure/active-directory/devices/howto-hybrid-azure-ad-join) includes information for managed domains and federated domains.
 
 ## Which option is right for your organization
 
@@ -141,4 +138,4 @@ Consider the following scenarios:
 3. 🡺 **Concept: Azure AD joined vs. Hybrid Azure AD joined** (*You are here*)
 4. [Concept: Cloud-native endpoints and on-premises resources](cloud-native-endpoints-on-premises.md)
 5. [High level planning guide](cloud-native-endpoints-planning-guide.md)
-6. [Known issues and important information](cloud-native-endpoints-known-issues.md)
+6. [Known issues and important information](cloud-native-endpoints-known-issues.md)

memdocs/configmgr/compliance/deploy-use/create-configuration-items-for-windows-10-devices-managed-with-the-client.md

@@ -118,6 +118,9 @@ Use the Configuration Manager **Windows 10 or later** configuration item to mana
 
 ### Windows Information Protection
 
+[!INCLUDE [wip-deprecation](../../../includes/wip-deprecation.md)]
+<!-- MAXADO-6010051 -->
+
 With the increase of employee-owned devices in the enterprise, there's also an increasing risk of accidental data leaks through apps and services, like email, social media, and the public cloud. These are outside of the organization's control. Examples include when an employee:
 
 - Sends the latest engineering pictures from their personal email account.

memdocs/configmgr/core/get-started/azure-template.md

@@ -16,7 +16,7 @@ ms.localizationpriority: medium
 
 *Applies to: Configuration Manager (current branch, technical preview branch)*
 
-<!--3556017-->
+<!--3556017
 > [!Important]
 > As of June 20, 2022, there is a known issue with the Azure templates for lab environments. We are working on resolving the issue and we will update this message when it's resolved. For more information, see [known issues](#known-issues). <!--icm 314312504-->
 
@@ -154,9 +154,9 @@ The prefix that you specified in the deployment template is the VM name prefix.
 - Windows 10
 - Configuration Manager client
 
-
+<!--icm 314312504
 ## Known issues
-<!--icm 314312504-->
+<!--icm 314312504
 As of June 20, 2022, there is a known issue with the Azure templates for lab environments. We are working on resolving the issue and we will update this message when it's resolved. This issue occurs during deployment of the template and the following error message is displayed:
 
 ```text
@@ -169,3 +169,4 @@ As of June 20, 2022, there is a known issue with the Azure templates for lab env
 }
 
 ```
+-->

memdocs/configmgr/core/get-started/technical-preview.md

@@ -97,7 +97,7 @@ Install a baseline version for up to one year after its release. When you instal
 
 - **Technical preview version 2206**
 
-Download a baseline version from the [Evaluation Center](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager-technical-preview).
+Download a baseline version from the [Evaluation Center](https://www.microsoft.com/en-in/evalcenter/evaluate-microsoft-endpoint-configuration-manager-technical-preview).
 
 <!--
 > [!NOTE]
@@ -156,7 +156,7 @@ The following features were released with previous versions of the Configuration
 
 - [Default site boundary group behavior to support cloud source selection](2022/technical-preview-2206.md#bkmk_dbgmp) <!--10674394-->
 - [PowerShell release notes preview](2022/technical-preview-2206.md#bkmk_powershell) <!--14431761-->
-- 
+
 ### Technical preview version 2205
 
 - [Offset for reoccurring monthly maintenance window schedules](2022/technical-preview-2205.md#bkmk_offset) <!--3601127-->

memdocs/configmgr/core/plan-design/changes/deprecated/removed-and-deprecated-cmfeatures.md

@@ -5,7 +5,7 @@ description: Learn about the features that Configuration Manager no longer suppo
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-ms.date: 04/11/2022
+ms.date: 07/21/2022
 author: mestew
 ms.author: mstewart
 manager: dougeby
@@ -31,6 +31,7 @@ The following features are deprecated. You can still use them now, but Microsoft
 
 |Feature|Deprecation first announced|Planned end of support|
 |-------|---------------------------|----------------------|
+| [Windows Information Protection](../../../../compliance/deploy-use/create-configuration-items-for-windows-10-devices-managed-with-the-client.md#windows-information-protection) <!-- MAXADO-6010051 --> | July 2022 | TBD |
 | Upgrade from any version of System Center 2012 Configuration Manager to current branch. For more information, see [Upgrade to Configuration Manager current branch](../../../servers/deploy/install/upgrade-to-configuration-manager.md)<!-- 13846745 --> | April 2022 | Version 2303 |
 | The Configuration Manager client for **macOS** and Mac client management. For more information, see [Supported clients: Mac computers](../../configs/supported-operating-systems-for-clients-and-devices.md#mac-computers).<!-- 12927803 --> Migrate management of macOS devices to Microsoft Intune. For more information, see [Deployment guide: Manage macOS devices in Microsoft Intune](../../../../../intune/fundamentals/deployment-guide-platform-macos.md). | January 2022 | December 31, 2022 |
 | The site system roles for on-premises MDM and macOS clients: **enrollment proxy point and enrollment point**.<!-- 12454901,12927803 --> | January 2022 | December 31, 2022 |
@@ -62,7 +63,7 @@ The following features are no longer supported. In some cases, they're no longer
 | Third-party add-ons that use Microsoft .NET Framework version 4.6.1 or earlier, and rely on Configuration Manager libraries. Such add-ons need to use .NET 4.6.2 or later. For more information, see [External dependencies require .NET 4.6.2](../../../get-started/2021/technical-preview-2109.md#bkmk_dotnetsdk)<!--10529267-->. | September 2021 | Version 2111 |
 | [Log Analytics connector for Azure Monitor.](/azure/azure-monitor/platform/collect-sccm?context=%2fmem%2fconfigmgr%2fcore%2fcontext%2fcore-context)<!-- 8269855,9649296 --> This feature is called the *OMS Connector* in the Azure Services node. | November 2020 | Version 2107 |
 | Microsoft Edge legacy [browser profiles](../../../../compliance/deploy-use/browser-profiles.md).<!-- 9388900 --> For more information, see [New Microsoft Edge to replace Microsoft Edge Legacy with April’s Windows 10 Update Tuesday release](https://techcommunity.microsoft.com/t5/microsoft-365-blog/new-microsoft-edge-to-replace-microsoft-edge-legacy-with-april-s/ba-p/2114224) | March 2021 | April 2021 |
-| The [collection evaluation viewer](../../../support/ceviewer.md)<!-- 8509484 -->, which was integrated in version 2010. The standalone tool is still available with the [System Center 2012 R2 Configuration Manager Toolkit](https://www.microsoft.com/download/details.aspx?id=50012).| November 2020 | Version 2103 |
+| The [collection evaluation viewer](../../../support/ceviewer.md)<!-- 8509484 -->, which was integrated in version 2010. | November 2020 | Version 2103 |
 | Desktop Analytics tile and page for **Security Updates**<!-- 8099536 --> | December 2020 | March 2021 |
 | Desktop Analytics option to **View recent data** for device enrollment and security updates.<!-- 7080949 --> For more information, see [Data latency](../../../../desktop-analytics/troubleshooting.md#data-latency).|May 2020|July 2020|
 | Windows Analytics and Upgrade Readiness integration. For more information, see [KB 4521815: Windows Analytics retirement on January 31, 2020](https://support.microsoft.com/help/4521815/windows-analytics-retirement). | October 14, 2019 | January 31, 2020 |
@@ -73,7 +74,7 @@ The following features are no longer supported. In some cases, they're no longer
 |System Center Endpoint Protection for Mac and Linux<br>For more information, see [End of support blog post](https://techcommunity.microsoft.com/t5/configuration-manager-blog/end-of-support-for-scep-for-mac-and-scep-for-linux-on-december/ba-p/286257).|October 2018|December 31, 2018|
 |On-premises conditional access<br>For more information, see [What happened to hybrid MDM](../../../../mdm/understand/what-happened-to-hybrid.md).|January 30, 2019|September 1, 2019|
 |Hybrid mobile device management (MDM)<br>For more information, see [What happened to hybrid MDM](../../../../mdm/understand/what-happened-to-hybrid.md).<br><br>Starting with the 1902 Intune service release, expected at the end of February 2019, new customers can't create a new hybrid connection.<!--Intune feature 2683117-->|August 14, 2018|September 1, 2019|
-|Security Content Automation Protocol (SCAP) extensions. <!--3607889--><br>The previous certified version is still available on the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=48741).|September 2018|Version 1810|
+|Security Content Automation Protocol (SCAP) extensions. <!--3607889--><br>|September 2018|Version 1810|
 |The **Silverlight user experience** for the application catalog website point is no longer supported. Users should use the new Software Center. For more information, see [Configure Software Center](../../../../apps/plan-design/plan-for-software-center.md#configure-software-center).<!--1358309-->|August 11, 2017| Version 1806|
 |The previous version of Software Center.<br><br>For more information about the new Software Center, see [Plan for and configure application management](../../../../apps/plan-design/plan-for-software-center.md).|December 13, 2016|Version 1802|
 |Management of Virtual Hard Disks (VHDs) with Configuration Manager. <br><br>This deprecation includes removal of options to create a new VHD or manage a VHD using a task sequence, and the removal of the Virtual Hard Disks node from the Configuration Manager console. <br><br>Existing VHDs are not deleted, but are no longer accessible from within the Configuration Manager console. |January 6, 2017 |Version 1710|

memdocs/configmgr/core/support/tools.md

@@ -23,7 +23,7 @@ These tools are included in the `CD.Latest\SMSSETUP\Tools` folder on the site se
 All Windows operating systems listed as supported clients in [Supported operating systems for clients and devices](../plan-design/configs/supported-operating-systems-for-clients-and-devices.md) are supported for use with these tools.
 
 > [!NOTE]
-> The [System Center 2012 R2 Configuration Manager Toolkit](https://www.microsoft.com/download/details.aspx?id=50012) is still available from the Microsoft Download Center. For supported versions of Configuration Manager current branch, use the versions of the tools in the CD.Latest folder on the site server. Some tools were formerly in the toolkit but not included current branch. These legacy tools are no longer supported.
+> For supported versions of Configuration Manager current branch, use the versions of the tools in the CD.Latest folder on the site server. Some tools were formerly in the toolkit but not included current branch. These legacy tools are no longer supported.
 
 ## Client tools
 

memdocs/configmgr/develop/compliance/how-to-assign-configuration-baselines.md

@@ -11,6 +11,7 @@ ms.author: aaroncz
 manager: dougeby
 ms.localizationpriority: null
 ms.collection: openauth
+description: Learn how to assign a configuration baseline to a collection by creating an assignment instance, populated with a minimum set of required values, and saving.
 
 
 ---

memdocs/configmgr/develop/core/servers/configure/how-to-list-the-maintenance-windows-and-properties-for-a-specific-collection.md

@@ -11,7 +11,7 @@ ms.author: aaroncz
 manager: dougeby
 ms.localizationpriority: null
 ms.collection: openauth
-
+description: Learn how to list the maintenance windows and properties for a specific collection with provided examples and links.
 
 ---
 # How to List the Maintenance Windows and Properties for a Specific Collection
@@ -167,7 +167,7 @@ public void ListMaintenanceWindowsAndPropertiesForASpecificCollection(WqlConnect
 ## .NET Framework Security  
  For more information about securing Configuration Manager applications, see [Configuration Manager role-based administration](../../../../develop/core/servers/configure/role-based-administration.md).  
 
-## See Also  
+## See also  
  [About maintenance windows](about-maintenance-windows.md)
  [Software distribution overview](software-distribution-overview.md)
  [About deployments](about-software-distribution-deployments.md)