Skip to content

Commit f5317a3

Browse files
committed
Merge branch 'main' of https://github.com/microsoftdocs/memdocs-pr into 9851681-ios-tunnel-mde
2 parents fbbc5fc + 6435624 commit f5317a3

89 files changed

Lines changed: 1267 additions & 1252 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.

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,11 @@
10821082
"source_path": "memdocs/configmgr/develop/core/understand/sqlviews/reports-supplied-with-configuration-manager.md",
10831083
"redirect_url": "/mem/configmgr/core/servers/manage/list-of-reports",
10841084
"redirect_document_id": true
1085+
},
1086+
{
1087+
"source_path": "memdocs/configmgr/core/plan-design/hierarchy/state-messaging-system-center-configuration-manager.md",
1088+
"redirect_url": "/mem/configmgr/core/plan-design/hierarchy/state-messages",
1089+
"redirect_document_id": true
10851090
}
10861091
]
10871092
}

memdocs/autopilot/add-devices.md

Lines changed: 109 additions & 81 deletions
Large diffs are not rendered by default.

memdocs/autopilot/existing-devices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ author: greg-lindsay
1313
ms.author: greglin
1414
ms.reviewer: jubaptis
1515
manager: dougeby
16-
ms.date: 10/05/2021
16+
ms.date: 01/05/2022
1717
ms.collection:
1818
- M365-modern-desktop
1919
- highpri
@@ -34,7 +34,7 @@ This topic describes how to convert Windows 7 or Windows 8.1 domain-joined compu
3434
Converting all targeted devices to Autopilot isn't supported for transforming a hybrid Azure AD device into a Azure AD Autopilot device.
3535

3636
> [!NOTE]
37-
> Windows Autopilot for existing devices only supports user-driven Azure Active Directory and Hybrid Azure AD profiles. Self-deploying profiles are not supported.
37+
> Windows Autopilot for existing devices only supports user-driven Azure Active Directory and Hybrid Azure AD profiles. Self-deploying and pre-provisioning profiles are not supported.
3838
3939
## Prerequisites
4040

@@ -253,7 +253,7 @@ See the following examples.
253253
- **AutopilotConfigurationFile.json** must be the name of the JSON file present in the Autopilot for existing devices package that was created earlier.
254254
255255
> [!IMPORTANT]
256-
> TThe AutopilotConfigurationFile.json file will persist on the device across all future device wipes and resets. The only way for the JSON file to be fully removed is to perform a clean install of the operating system.
256+
> The AutopilotConfigurationFile.json file will persist on the device across all future device wipes and resets. The only way for the JSON file to be fully removed is to perform a clean install of the operating system.
257257
258258
259259
17. In the **Apply Autopilot for existing devices config file** step, select the **Package** > **Browse**.

memdocs/autopilot/known-issues.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ This article describes known issues that can often be resolved by configuration
2828

2929
## Known issues
3030

31+
### Duplicate device objects with hybrid Azure AD deployments
32+
33+
A device object is pre-created in Azure AD once a device is registered in Autopilot. If a device goes through a hybrid Azure AD deployment, by design, another device object is created resulting in duplicate entries.
34+
3135
### TPM attestation failure on Windows 11 error code 0x81039024
3236

3337
Some devices may fail TPM attestation on Windows 11 during the pre-provisioning technician flow or self-deployment mode with the error code 0x81039024. This error code indicates that there are known vulnerabilities detected with the TPM and as a result will fail attestation. If you receive this error, please visit your PC manufacturer’s website to update the TPM firmware.

memdocs/autopilot/windows-autopilot-hybrid.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ After your Autopilot devices are *enrolled*, they're displayed in four places:
190190
- The **All Devices** pane in the Intune in the Azure portal. Select **Devices** > **All Devices**.
191191

192192
After your Autopilot devices are enrolled, their names become the hostname of the device. By default, the hostname begins with *DESKTOP-*.
193+
A device object is pre-created in Azure AD once a device is registered in Autopilot. When a device goes through a hybrid Azure AD deployment, by design, another device object is created resulting in duplicate entries.
193194

194195
## Supported BYO VPNs
195196

memdocs/configmgr/apps/deploy-use/share-applications.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Share applications in the Software Center
33
titleSuffix: Configuration Manager
44
description: Share a link to an application in the Software Center in Configuration Manager.
5-
ms.date: 07/31/2017
5+
ms.date: 01/11/2022
66
ms.prod: configuration-manager
77
ms.technology: configmgr-app
88
ms.topic: conceptual
@@ -19,11 +19,9 @@ ms.localizationpriority: medium
1919
You can copy a hyperlink to an application in Software Center using the ![Share](media/share15.png) **Share** button in the Application Details view. You can only share hyperlinks for applications. If the application becomes unavailable, the hyperlink opens a window with an application unavailable message.
2020

2121
1. Choose **Applications**, and then choose the application.
22-
2. Click the ![Share](media/share15.png) **Share** button.
23-
3. Click **Copy** in the window.
24-
4. Paste the URL into an email to share the application.
22+
2. Select the ![Share](media/share15.png) **Share** button.
23+
3. Select **Copy** in the window.
24+
4. Paste the URL into an email to share the application.
2525

26-
> [!TIP]
27-
> To create a link in an Outlook email, press **CTRL** + **K** and then paste the URL.
28-
>
29-
> By default, Outlook shows a security alert for the Software Center protocol when the recipient clicks the link. Prevent this in your environment by adding a trusted protocol key to the registry. For example, `HKCU\Software\Policies\Microsoft\Office\16.0\Common\Security\Trusted Protocols\All Applications\softwarecenter:`
26+
> [!TIP]
27+
> To create a link in an Outlook email, press **CTRL** + **K** and then paste the URL.

memdocs/configmgr/apps/get-started/creating-mac-computer-applications.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create Mac computer applications
33
titleSuffix: Configuration Manager
44
description: See which considerations you must take into account when you create and deploy applications for Mac computers.
5-
ms.date: 10/06/2016
5+
ms.date: 01/05/2022
66
ms.prod: configuration-manager
77
ms.technology: configmgr-app
88
ms.topic: conceptual
@@ -15,6 +15,9 @@ ms.localizationpriority: medium
1515

1616
*Applies to: Configuration Manager (current branch)*
1717

18+
> [!IMPORTANT]
19+
> Starting in January 2022, this feature of Configuration Manager is deprecated.<!-- 12927803 --> For more information, see [Mac computers](../../core/plan-design/configs/supported-operating-systems-for-clients-and-devices.md#mac-computers).
20+
1821
Keep the following considerations in mind when you create and deploy applications for Mac computers.
1922

2023
> [!IMPORTANT]

memdocs/configmgr/comanage/faq.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
ms.author: aaroncz
88
ms.reviewer: crosorio
99
manager: dougeby
10-
ms.date: 10/05/2021
10+
ms.date: 01/10/2021
1111
ms.topic: reference
1212
ms.prod: configuration-manager
1313
ms.technology: configmgr-comanage
@@ -46,6 +46,11 @@ sections:
4646
4747
For more information on tenant attach and how to configure it, see [Microsoft Endpoint Manager tenant attach](../tenant-attach/device-sync-actions.md).
4848
49+
- question: |
50+
Can I co-manage Windows 365 Cloud PCs?
51+
answer: |
52+
Yes! You can co-manage Windows 365 Cloud PCs.
53+
4954
- name: Authentication
5055
questions:
5156
- question: |

memdocs/configmgr/comanage/index.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ landingContent:
2929
url: overview.md
3030
- text: Paths to co-management
3131
url: quickstart-paths.md
32-
- linkListType: video
33-
links:
34-
- text: Conditional access with co-management
35-
url: https://channel9.msdn.com/Series/Endpoint-Zone/The-Security-Benefits-of-Conditional-Access/player
32+
3633

3734
# Card
3835
- title: Get started
@@ -43,10 +40,6 @@ landingContent:
4340
url: tutorial-co-manage-clients.md
4441
- text: Enable co-management for new internet-based devices
4542
url: tutorial-co-manage-new-devices.md
46-
- linkListType: video
47-
links:
48-
- text: Upgrade Windows for co-management
49-
url: https://channel9.msdn.com/Series/Endpoint-Zone/Upgrading-to-Windows-10-to-Enable-Co-Management/player
5043

5144
# Card
5245
- title: Top tasks
@@ -59,7 +52,4 @@ landingContent:
5952
url: how-to-monitor.md
6053
- text: Use the Company Portal app on co-managed devices
6154
url: company-portal.md
62-
- linkListType: video
63-
links:
64-
- text: Windows Autopilot with co-management
65-
url: https://channel9.msdn.com/Series/Endpoint-Zone/Using-Windows-Autopilot-with-Co-Management/player
55+

memdocs/configmgr/comanage/quickstart-autopilot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Windows Autopilot supports several scenarios, all of which are maximized with co
3131

3232
- With Windows Autopilot for existing devices, use Configuration Manager to migrate an existing device from earlier versions of Windows and Active Directory to later versions of Windows and Azure AD
3333

34-
In the following video, senior program manager Danny Guillory and principal program manager Andrew McMurray discuss and demo Windows Autopilot with co-management:
34+
<!--In the following video, senior program manager Danny Guillory and principal program manager Andrew McMurray discuss and demo Windows Autopilot with co-management:
3535
36-
> [!VIDEO https://channel9.msdn.com/Series/Endpoint-Zone/Using-Windows-Autopilot-with-Co-Management/player]
36+
> [!VIDEO https://channel9.msdn.com/Series/Endpoint-Zone/Using-Windows-Autopilot-with-Co-Management/player] -->
3737

3838
## Benefits
3939

0 commit comments

Comments
 (0)