Skip to content

Commit a79bff7

Browse files
committed
merge
2 parents 1bf8a4f + b298001 commit a79bff7

154 files changed

Lines changed: 1642 additions & 549 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ For more information see the [Code of Conduct FAQ](https://opensource.microsoft.
55

66
# GitHub repository for Microsoft technical documentation
77

8-
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.
8+
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.
99

1010
## Contribute to your documentation
1111

@@ -36,7 +36,7 @@ We **want and encourage contributions** from our community (users, customers, pa
3636

3737
* **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:
3838

39-
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.
39+
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.
4040

4141
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.
4242

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
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/).
66

7-
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.
7+
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.
88

99
## Reporting Security Issues
1010

memdocs/autopilot/dfci-management.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ author: aczechowski
1313
ms.author: aaroncz
1414
ms.reviewer: jubaptis
1515
manager: dougeby
16-
ms.date: 09/24/2021
16+
ms.date: 09/19/2022
1717
ms.collection: M365-modern-desktop
1818
ms.topic: conceptual
1919
---
@@ -73,8 +73,9 @@ You can also [change existing DFCI settings](/intune/configuration/device-firmwa
7373
## OEMs that support DFCI
7474

7575
- [Microsoft Surface](/surface/surface-manage-dfci-guide)
76+
- Acer
7677

77-
Additional OEMs are pending.
78+
Other OEMs are pending.
7879

7980
## See also
8081

memdocs/cloud-native-endpoints-known-issues.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ The following list includes common features and services that might use machine
120120
For more information, go to:
121121

122122
- [Add PowerShell scripts to Windows 10/11 devices in Microsoft Intune](./intune/apps/intune-management-extension.md)
123-
- [Introduction to OneDrive in Microsoft 365](/learn/modules/m365-onedrive-collaboration-use/)
123+
- [Introduction to OneDrive in Microsoft 365](/training/modules/m365-onedrive-collaboration-use/)
124124

125125
## Group policy objects might not apply
126126

@@ -176,4 +176,4 @@ For more specific information, go to [Implement password hash synchronization wi
176176
3. [Concept: Azure AD joined vs. Hybrid Azure AD joined](azure-ad-joined-hybrid-azure-ad-joined.md)
177177
4. [Concept: Cloud-native endpoints and on-premises resources](cloud-native-endpoints-on-premises.md)
178178
5. [High level planning guide](cloud-native-endpoints-planning-guide.md)
179-
6. 🡺 **Known issues and important information** (*You are here*)
179+
6. 🡺 **Known issues and important information** (*You are here*)

memdocs/configmgr/comanage/index.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ landingContent:
2828
- text: What is co-management?
2929
url: overview.md
3030
- text: Understand co-management (step-by-step)
31-
url: /learn/modules/understand-co-management/
31+
url: /training/modules/understand-co-management/
3232
- text: Paths to co-management
3333
url: quickstart-paths.md
3434

@@ -54,4 +54,3 @@ landingContent:
5454
url: autopilot-enrollment.md
5555
- text: Use the Company Portal app on co-managed devices
5656
url: company-portal.md
57-

memdocs/configmgr/comanage/workloads.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ ms.collection: highpri
1515

1616
# Co-management workloads
1717

18-
You don't have to switch the workloads, or you can do them individually when you're ready. Configuration Manager continues to manage all other workloads, including those workloads that you don't switch to Intune, and all other features of Configuration Manager that co-management doesn't support.
18+
You don't have to switch any of the workloads. When you're ready, you can switch them individually, several at once, or all at the same time. However, until you switch the workloads over to Intune, Configuration Manager continues to manage the workloads that you don't switch to Intune, along with all other features of Configuration Manager that co-management doesn't support.
1919

20-
If you switch a workload to Intune, but later change your mind, you can switch it back to Configuration Manager.
20+
If you switch a workload to Intune, but later change your mind, you can switch it back to Configuration Manager, although there might be an impact. For example, Windows and Office versions will remain at a later version if installed by Intune.
2121

2222
Co-management supports the following workloads:
2323

@@ -45,6 +45,9 @@ For more information on the Intune feature, see [Use compliance policies to set
4545

4646
Windows Update for Business policies let you configure deferral policies for Windows 10 or later feature updates or quality updates for Windows 10 or later devices managed directly by Windows Update for Business.
4747

48+
> [!NOTE]
49+
> To use Windows Autopatch with these devices, this workload needs to be managed by Intune. For more information, see [Prerequisites for Windows Autopatch](/windows/deployment/windows-autopatch/prepare/windows-autopatch-prerequisites).
50+
4851
For more information on the Intune feature, see [Manage Windows software updates in Intune](../../intune/protect/windows-update-for-business-configure.md).
4952

5053
## Resource access policies
@@ -96,6 +99,8 @@ The device configuration workload includes settings that you manage for devices
9699

97100
You can still deploy settings from Configuration Manager to co-managed devices even though Intune is the device configuration authority. This exception might be used to configure settings that your organization requires but aren't yet available in Intune. Specify this exception on a [Configuration Manager configuration baseline](../compliance/deploy-use/create-configuration-baselines.md). Enable the option to **Always apply this baseline even for co-managed clients** when creating the baseline. You can change it later on the **General** tab of the properties of an existing baseline.
98101

102+
To use Windows Autopatch with these devices, this workload needs to be managed by Intune. For more information, see [Prerequisites for Windows Autopatch](/windows/deployment/windows-autopatch/prepare/windows-autopatch-prerequisites).
103+
99104
For more information on the Intune feature, see [Create a device profile in Microsoft Intune](../../intune/configuration/device-profile-create.md).
100105

101106
> [!NOTE]
@@ -125,6 +130,9 @@ Updates can be managed using either of the following features:
125130
- [Use Update Channel and Target Version settings to update Microsoft 365 with Microsoft Intune Administrative Templates](../../intune/configuration/administrative-templates-update-office.md)
126131
- [Manage Microsoft 365 Apps with Configuration Manager](../sum/deploy-use/manage-office-365-proplus-updates.md).
127132

133+
> [!NOTE]
134+
> To use Windows Autopatch with these devices, this workload needs to be managed by Intune. For more information, see [Prerequisites for Windows Autopatch](/windows/deployment/windows-autopatch/prepare/windows-autopatch-prerequisites).
135+
128136
For more information on the Intune feature, see [Add Microsoft 365 apps to Windows devices with Microsoft Intune](../../intune/apps/apps-add-office365.md).
129137

130138
## Client apps

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ For information about what's new in the *current branch* of Configuration Manage
2929
> [!TIP]
3030
> 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).
3131
<!-- > To get notified when this page is updated, copy and paste the following URL into your RSS feed reader:
32-
> `https://docs.microsoft.com/api/search/rss?search=%22technical+preview+releases+-+Configuration+Manager%22&locale=en-us` -->
32+
> `https://learn.microsoft.com/api/search/rss?search=%22technical+preview+releases+-+Configuration+Manager%22&locale=en-us` -->
3333
3434
## <a name="bkmk_reqs"></a> Requirements and limitations
3535

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ ms.localizationpriority: medium
1616
<!--
1717
- Feature 1357546
1818
- This page displays in-console, under the Community workspace, Documentation node.
19-
- Don't use any relative links; must be full https://docs.microsoft.com and language neutral
19+
- Don't use any relative links; must be full https://learn.microsoft.com and language neutral
2020
21-
All docs.ms links should include `?WT.mc_id=configmgr-console` campaign ID at the end for tracking links from the console.
21+
All learn.microsoft.com links should include `?WT.mc_id=configmgr-console` campaign ID at the end for tracking links from the console.
2222
-->
2323

2424
# Microsoft Endpoint Configuration Manager documentation
@@ -29,56 +29,56 @@ This content can assist you in learning and supporting Configuration Manager.
2929

3030
For more information, see the following articles:
3131

32-
- [Configuration Manager documentation library](/mem/configmgr?WT.mc_id=configmgr-console)
33-
- [Get started with Configuration Manager PowerShell cmdlets](/powershell/sccm/overview?WT.mc_id=configmgr-console)
34-
- [How to use the Configuration Manager docs](/mem/use-docs?WT.mc_id=configmgr-console)
32+
- [Configuration Manager documentation library](https://learn.microsoft.com/mem/configmgr?WT.mc_id=configmgr-console)
33+
- [Get started with Configuration Manager PowerShell cmdlets](https://learn.microsoft.com/powershell/sccm/overview?WT.mc_id=configmgr-console)
34+
- [How to use the Configuration Manager docs](https://learn.microsoft.com/mem/use-docs?WT.mc_id=configmgr-console)
3535

3636
For the latest product changes, see the following articles:<!-- 8625956 -->
3737

38-
- [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)
39-
- [Technical preview releases](/mem/configmgr/core/get-started/technical-preview?WT.mc_id=configmgr-console)
38+
- [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)
39+
- [Technical preview releases](https://learn.microsoft.com/mem/configmgr/core/get-started/technical-preview?WT.mc_id=configmgr-console)
4040

4141
## Recommended
4242

4343
A curated list of important articles.
4444

45-
- [Microsoft Endpoint Manager tenant attach](/mem/configmgr/tenant-attach/?WT.mc_id=configmgr-console)
46-
- [Endpoint analytics](/mem/analytics/?WT.mc_id=configmgr-console)
47-
- [Desktop Analytics](/mem/configmgr/desktop-analytics/?WT.mc_id=configmgr-console)
48-
- [Co-management for Windows devices](/mem/configmgr/comanage/?WT.mc_id=configmgr-console)
49-
- [CMPivot](/mem/configmgr/core/servers/manage/cmpivot?WT.mc_id=configmgr-console)
50-
- [Plan for BitLocker management](/mem/configmgr/protect/plan-design/bitlocker-management?WT.mc_id=configmgr-console)
51-
- [Microsoft Edge management](/mem/configmgr/apps/deploy-use/deploy-edge?WT.mc_id=configmgr-console)
52-
- [Manage Microsoft 365 Apps updates](/mem/configmgr/sum/deploy-use/manage-office-365-proplus-updates?WT.mc_id=configmgr-console)
53-
- [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)
54-
- [Optimize Windows update delivery with Configuration Manager](/mem/configmgr/sum/deploy-use/optimize-windows-10-update-delivery?WT.mc_id=configmgr-console)
45+
- [Microsoft Endpoint Manager tenant attach](https://learn.microsoft.com/mem/configmgr/tenant-attach/?WT.mc_id=configmgr-console)
46+
- [Endpoint analytics](https://learn.microsoft.com/mem/analytics/?WT.mc_id=configmgr-console)
47+
- [Desktop Analytics](https://learn.microsoft.com/mem/configmgr/desktop-analytics/?WT.mc_id=configmgr-console)
48+
- [Co-management for Windows devices](https://learn.microsoft.com/mem/configmgr/comanage/?WT.mc_id=configmgr-console)
49+
- [CMPivot](https://learn.microsoft.com/mem/configmgr/core/servers/manage/cmpivot?WT.mc_id=configmgr-console)
50+
- [Plan for BitLocker management](https://learn.microsoft.com/mem/configmgr/protect/plan-design/bitlocker-management?WT.mc_id=configmgr-console)
51+
- [Microsoft Edge management](https://learn.microsoft.com/mem/configmgr/apps/deploy-use/deploy-edge?WT.mc_id=configmgr-console)
52+
- [Manage Microsoft 365 Apps updates](https://learn.microsoft.com/mem/configmgr/sum/deploy-use/manage-office-365-proplus-updates?WT.mc_id=configmgr-console)
53+
- [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)
54+
- [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)
5555

5656
## Troubleshooting articles
5757

5858
Guided walkthroughs to assist with troubleshooting Configuration Manager components and features.
5959

60-
- [Troubleshoot application deployments](/mem/configmgr/apps/understand/app-deployment-technical-reference?WT.mc_id=configmgr-console)
61-
- [Application installation common error codes reference](/mem/configmgr/tenant-attach/app-install-error-reference?WT.mc_id=configmgr-console)
62-
- [Troubleshooting PXE boot issues](/troubleshoot/mem/configmgr/troubleshoot-pxe-boot-issues)
63-
- [Understand and troubleshoot updates and servicing in Configuration Manager](/troubleshoot/mem/configmgr/understand-troubleshoot-updates-servicing)
64-
- [Troubleshooting software update synchronization issues](/troubleshoot/mem/configmgr/troubleshoot-software-update-synchronization)
65-
- [Understanding and troubleshooting content distribution](/troubleshoot/mem/configmgr/content-distribution-introduction)
66-
- [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)
67-
- [Software update management troubleshooting](/troubleshoot/mem/configmgr/troubleshoot-software-update-management)
68-
- [Troubleshooting the Install Application task sequence step](/troubleshoot/mem/configmgr/troubleshoot-install-application-step)
69-
- [Troubleshoot Desktop Analytics](/mem/configmgr/desktop-analytics/troubleshooting?WT.mc_id=configmgr-console)
70-
- [Troubleshoot Microsoft Connected Cache](/mem/configmgr/core/servers/deploy/configure/troubleshoot-microsoft-connected-cache?WT.mc_id=configmgr-console)
71-
- [Troubleshoot BitLocker](/mem/configmgr/protect/tech-ref/bitlocker/troubleshoot?WT.mc_id=configmgr-console)
72-
73-
For more information, see [Microsoft Endpoint Configuration Manager troubleshooting](/troubleshoot/mem/configmgr/welcome-configuration-manager).
60+
- [Troubleshoot application deployments](https://learn.microsoft.com/mem/configmgr/apps/understand/app-deployment-technical-reference?WT.mc_id=configmgr-console)
61+
- [Application installation common error codes reference](https://learn.microsoft.com/mem/configmgr/tenant-attach/app-install-error-reference?WT.mc_id=configmgr-console)
62+
- [Troubleshooting PXE boot issues](https://learn.microsoft.com/troubleshoot/mem/configmgr/troubleshoot-pxe-boot-issues)
63+
- [Understand and troubleshoot updates and servicing in Configuration Manager](https://learn.microsoft.com/troubleshoot/mem/configmgr/understand-troubleshoot-updates-servicing)
64+
- [Troubleshooting software update synchronization issues](https://learn.microsoft.com/troubleshoot/mem/configmgr/troubleshoot-software-update-synchronization)
65+
- [Understanding and troubleshooting content distribution](https://learn.microsoft.com/troubleshoot/mem/configmgr/content-distribution-introduction)
66+
- [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)
67+
- [Software update management troubleshooting](https://learn.microsoft.com/troubleshoot/mem/configmgr/troubleshoot-software-update-management)
68+
- [Troubleshooting the Install Application task sequence step](https://learn.microsoft.com/troubleshoot/mem/configmgr/troubleshoot-install-application-step)
69+
- [Troubleshoot Desktop Analytics](https://learn.microsoft.com/mem/configmgr/desktop-analytics/troubleshooting?WT.mc_id=configmgr-console)
70+
- [Troubleshoot Microsoft Connected Cache](https://learn.microsoft.com/mem/configmgr/core/servers/deploy/configure/troubleshoot-microsoft-connected-cache?WT.mc_id=configmgr-console)
71+
- [Troubleshoot BitLocker](https://learn.microsoft.com/mem/configmgr/protect/tech-ref/bitlocker/troubleshoot?WT.mc_id=configmgr-console)
72+
73+
For more information, see [Microsoft Endpoint Configuration Manager troubleshooting](https://learn.microsoft.com/troubleshoot/mem/configmgr/welcome-configuration-manager).
7474

7575
## Support articles
7676

77-
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).
77+
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).
7878

7979
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).
8080
Hotfix related articles for version 2006 and prior are still available on support.microsoft.com.
8181

82-
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.
82+
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.
8383

8484
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ If your environment has proxy rules to allow only specific certificate revocatio
3030
- `http://ocsp.msocsp.com`
3131
- `http://www.microsoft.com/pkiops`
3232

33-
<!-- list from https://docs.microsoft.com/azure/security/fundamentals/tls-certificate-changes#will-this-change-affect-me -->
33+
<!-- list from https://learn.microsoft.com/azure/security/fundamentals/tls-certificate-changes#will-this-change-affect-me -->

0 commit comments

Comments
 (0)