Merge pull request #8508 from dougeby/ebyignite

Updates from main- fix conflicts

Author: dougeby

README.md

@@ -5,7 +5,7 @@ For more information see the [Code of Conduct FAQ](https://opensource.microsoft.
 
 # GitHub repository for Microsoft technical documentation
 
-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.
+You've found one of the GitHub repositories that houses the source for content published to [Microsoft Learn](https://learn.microsoft.com/), home of all technical content for Microsoft's Cloud and Enterprise Division.
 
 ## Contribute to your documentation
 
@@ -36,7 +36,7 @@ We **want and encourage contributions** from our community (users, customers, pa
 
 * **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 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.
+  1. On a device with access to corpnet, go to [GitHub account setup](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=main). 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.
 

SECURITY.md

@@ -4,7 +4,7 @@
 
 Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
 
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below.
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [Microsoft's definition of a security vulnerability](https://learn.microsoft.com/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below.
 
 ## Reporting Security Issues
 

memdocs/autopilot/dfci-management.md

@@ -13,7 +13,7 @@ author: aczechowski
 ms.author: aaroncz
 ms.reviewer: jubaptis
 manager: dougeby
-ms.date: 09/24/2021
+ms.date: 09/19/2022
 ms.collection: M365-modern-desktop
 ms.topic: conceptual
 ---
@@ -73,8 +73,9 @@ You can also [change existing DFCI settings](/intune/configuration/device-firmwa
 ## OEMs that support DFCI
 
 - [Microsoft Surface](/surface/surface-manage-dfci-guide)
+- Acer
 
-Additional OEMs are pending.
+Other OEMs are pending.
 
 ## See also
 

memdocs/configmgr/comanage/index.yml

@@ -28,7 +28,7 @@ landingContent:
           - text: What is co-management?
             url: overview.md
           - text: Understand co-management (step-by-step)
-            url: /learn/modules/understand-co-management/         
+            url: /training/modules/understand-co-management/         
           - text: Paths to co-management
             url: quickstart-paths.md
 
@@ -54,4 +54,3 @@ landingContent:
             url: autopilot-enrollment.md
           - text: Use the Company Portal app on co-managed devices
             url: company-portal.md
-

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

@@ -29,7 +29,7 @@ For information about what's new in the *current branch* of Configuration Manage
 > [!TIP]
 > You can use RSS to be notified when this page is updated. For more information, see [How to use the docs](../../../use-docs.md#notifications).
 <!-- > To get notified when this page is updated, copy and paste the following URL into your RSS feed reader:
-> `https://docs.microsoft.com/api/search/rss?search=%22technical+preview+releases+-+Configuration+Manager%22&locale=en-us` -->
+> `https://learn.microsoft.com/api/search/rss?search=%22technical+preview+releases+-+Configuration+Manager%22&locale=en-us` -->
 
 ## <a name="bkmk_reqs"></a> Requirements and limitations
 

memdocs/configmgr/core/misc/in-console-documentation.md

@@ -16,9 +16,9 @@ ms.localizationpriority: medium
 <!-- 
 - Feature 1357546
 - This page displays in-console, under the Community workspace, Documentation node.
-- Don't use any relative links; must be full https://docs.microsoft.com and language neutral
+- Don't use any relative links; must be full https://learn.microsoft.com and language neutral
 
-All docs.ms links should include `?WT.mc_id=configmgr-console` campaign ID at the end for tracking links from the console.
+All learn.microsoft.com links should include `?WT.mc_id=configmgr-console` campaign ID at the end for tracking links from the console.
 -->
 
 # Microsoft Endpoint Configuration Manager documentation
@@ -29,56 +29,56 @@ This content can assist you in learning and supporting Configuration Manager.
 
 For more information, see the following articles:
 
-- [Configuration Manager documentation library](/mem/configmgr?WT.mc_id=configmgr-console)
-- [Get started with Configuration Manager PowerShell cmdlets](/powershell/sccm/overview?WT.mc_id=configmgr-console)
-- [How to use the Configuration Manager docs](/mem/use-docs?WT.mc_id=configmgr-console)
+- [Configuration Manager documentation library](https://learn.microsoft.com/mem/configmgr?WT.mc_id=configmgr-console)
+- [Get started with Configuration Manager PowerShell cmdlets](https://learn.microsoft.com/powershell/sccm/overview?WT.mc_id=configmgr-console)
+- [How to use the Configuration Manager docs](https://learn.microsoft.com/mem/use-docs?WT.mc_id=configmgr-console)
 
 For the latest product changes, see the following articles:<!-- 8625956 -->
 
-- [What's new in current branch](/mem/configmgr/core/plan-design/changes/whats-new-incremental-versions#whats-new-in-configuration-manager-incremental-versions?WT.mc_id=configmgr-console)
-- [Technical preview releases](/mem/configmgr/core/get-started/technical-preview?WT.mc_id=configmgr-console)
+- [What's new in current branch](https://learn.microsoft.com/mem/configmgr/core/plan-design/changes/whats-new-incremental-versions#whats-new-in-configuration-manager-incremental-versions?WT.mc_id=configmgr-console)
+- [Technical preview releases](https://learn.microsoft.com/mem/configmgr/core/get-started/technical-preview?WT.mc_id=configmgr-console)
 
 ## Recommended
 
 A curated list of important articles.
 
-- [Microsoft Endpoint Manager tenant attach](/mem/configmgr/tenant-attach/?WT.mc_id=configmgr-console)
-- [Endpoint analytics](/mem/analytics/?WT.mc_id=configmgr-console)
-- [Desktop Analytics](/mem/configmgr/desktop-analytics/?WT.mc_id=configmgr-console)
-- [Co-management for Windows devices](/mem/configmgr/comanage/?WT.mc_id=configmgr-console)
-- [CMPivot](/mem/configmgr/core/servers/manage/cmpivot?WT.mc_id=configmgr-console)
-- [Plan for BitLocker management](/mem/configmgr/protect/plan-design/bitlocker-management?WT.mc_id=configmgr-console)
-- [Microsoft Edge management](/mem/configmgr/apps/deploy-use/deploy-edge?WT.mc_id=configmgr-console)
-- [Manage Microsoft 365 Apps updates](/mem/configmgr/sum/deploy-use/manage-office-365-proplus-updates?WT.mc_id=configmgr-console)
-- [Fundamentals of Configuration Manager current branch and Windows as a service](/mem/configmgr/core/understand/configuration-manager-and-windows-as-service?WT.mc_id=configmgr-console)
-- [Optimize Windows update delivery with Configuration Manager](/mem/configmgr/sum/deploy-use/optimize-windows-10-update-delivery?WT.mc_id=configmgr-console)
+- [Microsoft Endpoint Manager tenant attach](https://learn.microsoft.com/mem/configmgr/tenant-attach/?WT.mc_id=configmgr-console)
+- [Endpoint analytics](https://learn.microsoft.com/mem/analytics/?WT.mc_id=configmgr-console)
+- [Desktop Analytics](https://learn.microsoft.com/mem/configmgr/desktop-analytics/?WT.mc_id=configmgr-console)
+- [Co-management for Windows devices](https://learn.microsoft.com/mem/configmgr/comanage/?WT.mc_id=configmgr-console)
+- [CMPivot](https://learn.microsoft.com/mem/configmgr/core/servers/manage/cmpivot?WT.mc_id=configmgr-console)
+- [Plan for BitLocker management](https://learn.microsoft.com/mem/configmgr/protect/plan-design/bitlocker-management?WT.mc_id=configmgr-console)
+- [Microsoft Edge management](https://learn.microsoft.com/mem/configmgr/apps/deploy-use/deploy-edge?WT.mc_id=configmgr-console)
+- [Manage Microsoft 365 Apps updates](https://learn.microsoft.com/mem/configmgr/sum/deploy-use/manage-office-365-proplus-updates?WT.mc_id=configmgr-console)
+- [Fundamentals of Configuration Manager current branch and Windows as a service](https://learn.microsoft.com/mem/configmgr/core/understand/configuration-manager-and-windows-as-service?WT.mc_id=configmgr-console)
+- [Optimize Windows update delivery with Configuration Manager](https://learn.microsoft.com/mem/configmgr/sum/deploy-use/optimize-windows-10-update-delivery?WT.mc_id=configmgr-console)
 
 ## Troubleshooting articles
 
 Guided walkthroughs to assist with troubleshooting Configuration Manager components and features.
 
-- [Troubleshoot application deployments](/mem/configmgr/apps/understand/app-deployment-technical-reference?WT.mc_id=configmgr-console)
-- [Application installation common error codes reference](/mem/configmgr/tenant-attach/app-install-error-reference?WT.mc_id=configmgr-console)
-- [Troubleshooting PXE boot issues](/troubleshoot/mem/configmgr/troubleshoot-pxe-boot-issues)
-- [Understand and troubleshoot updates and servicing in Configuration Manager](/troubleshoot/mem/configmgr/understand-troubleshoot-updates-servicing)
-- [Troubleshooting software update synchronization issues](/troubleshoot/mem/configmgr/troubleshoot-software-update-synchronization)
-- [Understanding and troubleshooting content distribution](/troubleshoot/mem/configmgr/content-distribution-introduction)
-- [Understanding and troubleshooting the Microsoft Store for Business integration](/mem/configmgr/apps/deploy-use/troubleshoot-microsoft-store-for-business-integration?WT.mc_id=configmgr-console)
-- [Software update management troubleshooting](/troubleshoot/mem/configmgr/troubleshoot-software-update-management)
-- [Troubleshooting the Install Application task sequence step](/troubleshoot/mem/configmgr/troubleshoot-install-application-step)
-- [Troubleshoot Desktop Analytics](/mem/configmgr/desktop-analytics/troubleshooting?WT.mc_id=configmgr-console)
-- [Troubleshoot Microsoft Connected Cache](/mem/configmgr/core/servers/deploy/configure/troubleshoot-microsoft-connected-cache?WT.mc_id=configmgr-console)
-- [Troubleshoot BitLocker](/mem/configmgr/protect/tech-ref/bitlocker/troubleshoot?WT.mc_id=configmgr-console)
-
-For more information, see [Microsoft Endpoint Configuration Manager troubleshooting](/troubleshoot/mem/configmgr/welcome-configuration-manager).
+- [Troubleshoot application deployments](https://learn.microsoft.com/mem/configmgr/apps/understand/app-deployment-technical-reference?WT.mc_id=configmgr-console)
+- [Application installation common error codes reference](https://learn.microsoft.com/mem/configmgr/tenant-attach/app-install-error-reference?WT.mc_id=configmgr-console)
+- [Troubleshooting PXE boot issues](https://learn.microsoft.com/troubleshoot/mem/configmgr/troubleshoot-pxe-boot-issues)
+- [Understand and troubleshoot updates and servicing in Configuration Manager](https://learn.microsoft.com/troubleshoot/mem/configmgr/understand-troubleshoot-updates-servicing)
+- [Troubleshooting software update synchronization issues](https://learn.microsoft.com/troubleshoot/mem/configmgr/troubleshoot-software-update-synchronization)
+- [Understanding and troubleshooting content distribution](https://learn.microsoft.com/troubleshoot/mem/configmgr/content-distribution-introduction)
+- [Understanding and troubleshooting the Microsoft Store for Business integration](https://learn.microsoft.com/mem/configmgr/apps/deploy-use/troubleshoot-microsoft-store-for-business-integration?WT.mc_id=configmgr-console)
+- [Software update management troubleshooting](https://learn.microsoft.com/troubleshoot/mem/configmgr/troubleshoot-software-update-management)
+- [Troubleshooting the Install Application task sequence step](https://learn.microsoft.com/troubleshoot/mem/configmgr/troubleshoot-install-application-step)
+- [Troubleshoot Desktop Analytics](https://learn.microsoft.com/mem/configmgr/desktop-analytics/troubleshooting?WT.mc_id=configmgr-console)
+- [Troubleshoot Microsoft Connected Cache](https://learn.microsoft.com/mem/configmgr/core/servers/deploy/configure/troubleshoot-microsoft-connected-cache?WT.mc_id=configmgr-console)
+- [Troubleshoot BitLocker](https://learn.microsoft.com/mem/configmgr/protect/tech-ref/bitlocker/troubleshoot?WT.mc_id=configmgr-console)
+
+For more information, see [Microsoft Endpoint Configuration Manager troubleshooting](https://learn.microsoft.com/troubleshoot/mem/configmgr/welcome-configuration-manager).
 
 ## Support articles
 
-The complete list of all hotfix and update rollup related articles, starting with Configuration Manager version 2010, is published to [Configuration Manager hotfixes and update rollups](/mem/configmgr/hotfix?WT.mc_id=configmgr-console).
+The complete list of all hotfix and update rollup related articles, starting with Configuration Manager version 2010, is published to [Configuration Manager hotfixes and update rollups](https://learn.microsoft.com/mem/configmgr/hotfix?WT.mc_id=configmgr-console).
 
 The short form URL for version 2010 and newer hotfix related articles is `https://aka.ms/KB#######`. For example, [https://aka.ms/KB9210721](https://aka.ms/KB9210721).
 Hotfix related articles for version 2006 and prior are still available on support.microsoft.com.
 
-The Microsoft knowledge base articles previously found at support.microsoft.com are published to [Microsoft Endpoint Configuration Manager Troubleshooting](/troubleshoot/mem/configmgr/welcome-configuration-manager). Troubleshooting articles created after October 2020 don't have a KB article ID.
+The Microsoft knowledge base articles previously found at support.microsoft.com are published to [Microsoft Endpoint Configuration Manager Troubleshooting](https://learn.microsoft.com/troubleshoot/mem/configmgr/welcome-configuration-manager). Troubleshooting articles created after October 2020 don't have a KB article ID.
 
 To subscribe to Atom or RSS notification of new Configuration Manager support articles, see [Support content updates](https://support.microsoft.com/help/4089498/) and select **Microsoft Endpoint Configuration Manager (current branch)**.

memdocs/configmgr/core/plan-design/network/includes/internet-endpoints-tenant-attach.md

@@ -30,4 +30,4 @@ If your environment has proxy rules to allow only specific certificate revocatio
 - `http://ocsp.msocsp.com`
 - `http://www.microsoft.com/pkiops`
 
-<!-- list from https://docs.microsoft.com/azure/security/fundamentals/tls-certificate-changes#will-this-change-affect-me -->
+<!-- list from https://learn.microsoft.com/azure/security/fundamentals/tls-certificate-changes#will-this-change-affect-me -->

memdocs/configmgr/core/servers/deploy/configure/azure-services-wizard.md

@@ -45,6 +45,8 @@ Configure the following Azure services using this wizard:
 - **Microsoft Store for Business**: Connect to the [Microsoft Store for Business](../../../../apps/deploy-use/manage-apps-from-the-windows-store-for-business.md). Get store apps for your organization that you can deploy with Configuration Manager.  
 
 - **Administration Service Management**: When configuring Azure Services, for enhanced security you can select Administration Service Management option. Selecting this option allows administrators to segment their admin privileges between [cloud management](../../../clients/manage/cmg/overview.md) and [administration service](../../../../develop/adminservice/overview.md). By enabling this option, access is restricted to only administration service endpoints. Configuration Management clients will authenticate to the site using Azure Active Directory. *(version 2207 or later)*
+    > [!NOTE]
+    > Only CMG VMSS customers can enable administrative service management option. This option is not applicable for classic CMG customers. 
 
 ### Service details
 

memdocs/configmgr/core/servers/deploy/install/release-notes.md

@@ -33,7 +33,7 @@ For information about the new features introduced with different versions, see t
 > [!TIP]
 > You can use RSS to be notified when this page is updated. For more information, see [How to use the docs](../../../../../use-docs.md#notifications).
 <!-- > To get notified when this page is updated, copy and paste the following URL into your RSS feed reader:
-> `https://docs.microsoft.com/api/search/rss?search=%22release+notes+-+Configuration+Manager%22&locale=en-us` -->
+> `https://learn.microsoft.com/api/search/rss?search=%22release+notes+-+Configuration+Manager%22&locale=en-us` -->
 
 ## Client management