Skip to content

Commit 4149a97

Browse files
authored
Merge pull request #8708 from MandiOhlinger/ado15367747
ADO 15367747: Round 1 - Removing "Endpoint Manager"
2 parents ebb35f9 + 05084f7 commit 4149a97

20 files changed

Lines changed: 86 additions & 54 deletions

memdocs/autopilot/known-issues.md

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

2525
## Known issues
2626

27+
### TPM attestation failure with error code 0x81039001
28+
29+
Some devices may intermittently fail TPM attestation during Windows Autopilot pre-provisioning technician flow or self-deployment mode with the error code 0x81039001 E_AUTOPILOT_CLIENT_TPM_MAX_ATTESTATION_RETRY_EXCEEDED. This failure occurs during the 'Securing your hardware' step for Windows Autopilot devices deployed using self-deploying mode or pre-provisioning mode. Subsequent attempts to provision may resolve the issue. A fix is expected by the end of October 2022.
30+
2731
### Autopilot deployment report shows "failure" status on a successful deployment
2832

2933
The Autopilot deployment report (preview) will show a failed status for any device that experiences an initial deployment failure. For subsequent deployment attempts, using the **Try again** or **Continue to desktop** options, it won't update the deployment state in the report. If the user resets the device, it will show as a new deployment row in the report with the previous attempt remaining as failed.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ The following features are no longer supported. In some cases, they're no longer
8686
|Task sequences: <br /> - OSDPreserveDriveLetter <br /><br /> During an operating system deployment, by default, Windows Setup now determines the best drive letter to use (typically C:). If you want to specify a different drive to use, you can change the location in the Apply Operating System task sequence step. Go to the **Select the location where you want to apply this operating system** setting. Select **Specific logical drive letter** and choose the drive that you want to use. |June 20, 2016 |Version 1606 |
8787
|[Network Access Protection](#network-access-protection) (NAP) - as found in System Center 2012 Configuration Manager|July 10, 2015|Version 1511|
8888
|[Out of Band Management](#out-of-band-management) - as found in System Center 2012 Configuration Manager|October 16, 2015|Version 1511|
89-
|[System Center Configuration Manager Management Pack - for System Center Operations Manager is not available for download |October 16, 2015|Version 1511|
89+
|System Center Configuration Manager Management Pack - for System Center Operations Manager is not available for download |October 16, 2015|Version 1511|
9090

9191
### WINS
9292

memdocs/intune/configuration/administrative-templates-configure-edge.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: Deploy Microsoft Edge policy using ADMX template in Microsoft Intune
3-
description: Add or create settings using ADMX administrative templates to configure Microsoft Edge on Windows devices. Using Microsoft Intune and Endpoint Manager, you can configure group policy settings, and deploy these settings to Microsoft Edge users.
3+
description: Add or create settings using ADMX administrative templates to configure Microsoft Edge on Windows devices. Using Microsoft Intune, you can configure group policy settings, and deploy these settings to Microsoft Edge users.
44
ms.author: mandia
55
author: MandiOhlinger
66
manager: dougeby
7-
ms.date: 01/18/2022
7+
ms.date: 10/10/2022
88
audience: ITPro
99
ms.topic: how-to
1010
ms.service: microsoft-intune

memdocs/intune/configuration/administrative-templates-import-custom.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# required metadata
33

44
title: Import custom and third party partner ADMX templates in Microsoft Intune
5-
description: You can add, upload, or import custom and third party partner ADMX and ADML files in Microsoft Intune and Endpoint Manager. When they're imported, create a device configuration profile and assign the profile to your Windows 10/11 devices.
5+
description: You can add, upload, or import custom and third party partner ADMX and ADML files in Microsoft Intune. When they're imported, create a device configuration profile and assign the profile to your Windows 10/11 devices.
66
keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 08/15/2022
10+
ms.date: 10/10/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -29,7 +29,7 @@ ms.collection:
2929

3030
---
3131

32-
# Import custom ADMX and ADML administrative templates into Endpoint Manager (public preview)
32+
# Import custom ADMX and ADML administrative templates into Microsoft Intune (public preview)
3333

3434
You can import custom and third party/partner ADMX and ADML templates into the Endpoint Manager admin center. Once imported, you can create a device configuration policy using these settings, and then assign the policy to your managed devices.
3535

@@ -38,10 +38,10 @@ This feature applies to:
3838
- Windows 11
3939
- Windows 10
4040

41-
This article shows you how to import custom ADMX and ADML files in the Endpoint Manager admin center. For more information on administrative templates in Endpoint Manager, go to [Use ADMX templates to configure policy settings in Microsoft Intune](administrative-templates-windows.md).
41+
This article shows you how to import custom ADMX and ADML files in the Endpoint Manager admin center. For more information on administrative templates in Intune, go to [Use ADMX templates to configure policy settings in Microsoft Intune](administrative-templates-windows.md).
4242

4343
> [!TIP]
44-
> The settings catalog has many settings natively built-in to Endpoint Manager, including Google Chrome. For more information, go to:
44+
> The settings catalog has many settings natively built-in to Intune, including Google Chrome. For more information, go to:
4545
>
4646
> - [Use the settings catalog to configure settings on Windows, iOS/iPadOS and macOS devices](settings-catalog.md)
4747
> - [Common tasks you can complete using the Settings Catalog](settings-catalog-common-features.md)

memdocs/intune/configuration/administrative-templates-restrict-usb.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 03/30/2022
10+
ms.date: 10/10/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -60,19 +60,19 @@ Applies to:
6060

6161
- **Prevent installation of devices not described by other policy settings**: Select **Enabled** > **OK**:
6262

63-
:::image type="content" source="media/administrative-templates-restrict-usb/prevent-installation-of-devices-not-described-setting.png" alt-text="In Intune and Endpoint Manager, set the Prevent installation of devices not described by other policy settings setting to Enabled.":::
63+
:::image type="content" source="media/administrative-templates-restrict-usb/prevent-installation-of-devices-not-described-setting.png" alt-text="In Intune, set the Prevent installation of devices not described by other policy settings setting to Enabled.":::
6464

6565
- **Allow installation of devices using drivers that match these device setup classes**: Select **Enabled**. Then, add the [class GUID of the device classes](/windows-hardware/drivers/install/system-defined-device-setup-classes-available-to-vendors) you want to allow.
6666

6767
In the following example, the **Keyboard**, **Mouse**, and **Multimedia** classes are allowed:
6868

69-
:::image type="content" source="media/administrative-templates-restrict-usb/allow-installation-of-devices-using-drivers-setting.png" alt-text="In Intune and Endpoint Manager, set the Allow installation of devices using drivers that match these device setup classes setting, and add your class GUIDs.":::
69+
:::image type="content" source="media/administrative-templates-restrict-usb/allow-installation-of-devices-using-drivers-setting.png" alt-text="Screenshot that shows how to set the Allow installation of devices using drivers that match these device setup classes setting in Intune and how to add your class GUIDs.":::
7070

7171
Select **OK**.
7272

7373
- **Allow installation of devices that match any of these Device IDs**: Select **Enabled**. Then, add the device/hardware IDs for devices you want to allow:
7474

75-
:::image type="content" source="media/administrative-templates-restrict-usb/allow-installation-of-devices-that-match-setting.png" alt-text="In Intune and Endpoint Manager, set the Allow installation of devices that match any of these Device IDs setting, and add your hardware IDs.":::
75+
:::image type="content" source="media/administrative-templates-restrict-usb/allow-installation-of-devices-that-match-setting.png" alt-text="Screenshot that shows how to set the Allow installation of devices that match any of these Device IDs setting in Intune and how to add your hardware IDs.":::
7676

7777
To get the device/hardware ID, you can use Device Manager, find the device, and look at the properties. For the specific steps, see [find the hardware ID on a Windows device](/windows-hardware/drivers/install/hardware-ids).
7878

memdocs/intune/configuration/administrative-templates-windows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# required metadata
33

44
title: Use ADMX templates on Windows 10/11 devices in Microsoft Intune
5-
description: Use Administrative templates in Microsoft Intune and Endpoint Manager to create groups of settings for Windows 10/11 client devices. Use these settings in a device configuration profile. You can control Office programs, Microsoft Edge, secure Internet Explorer, access OneDrive, use remote desktop, enable Auto-Play, set power management settings, use HTTP printing, control user sign-in, and change the event log size.
5+
description: Use Administrative templates in Microsoft Intune to create groups of settings for Windows 10/11 client devices. Use these settings in a device configuration profile. You can control Office programs, Microsoft Edge, secure Internet Explorer, access OneDrive, use remote desktop, enable Auto-Play, set power management settings, use HTTP printing, control user sign-in, and change the event log size.
66
keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 08/15/2022
10+
ms.date: 10/10/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration

memdocs/intune/configuration/custom-settings-configure.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 09/20/2022
10+
ms.date: 10/10/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -92,8 +92,7 @@ This article shows you how to create a custom profile for Android device adminis
9292

9393
In the following example, the **Connectivity/AllowVPNOverCellular** setting is enabled. This setting allows a Windows client device to open a VPN connection when on a cellular network.
9494

95-
> [!div class="mx-imgBorder"]
96-
> ![Example of a custom policy containing VPN settings in Intune and Endpoint Manager](./media/custom-settings-configure/custom-policy-example.png)
95+
:::image type="content" source="./media/custom-settings-configure/custom-policy-example.png" alt-text="Screenshot that shows an example of a custom policy containing VPN settings in Intune.":::
9796

9897
## Next steps
9998

memdocs/intune/configuration/custom-settings-windows-10.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 01/18/2022
10+
ms.date: 10/10/2022
1111
ms.topic: conceptual
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -87,7 +87,7 @@ Additionally, Intune doesn't support all the settings listed in [Configuration s
8787
> [!NOTE]
8888
> For settings that were created by using a string, base64, or XML data type, the stored value is obscured. If the user who is accessing the value has any of the following permissions or roles, they can see the value:
8989
>
90-
> - Create, Read, and Update permissions in a Microsoft Endpoint Manager role-based access control (RBAC) role.
90+
> - Create, Read, and Update permissions in a Microsoft Intune role-based access control (RBAC) role.
9191
> - Intune Service Administrator.
9292
> - Global Administrator Azure Active Directory role.
9393
>

memdocs/intune/configuration/device-profile-assign.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 07/26/2022
10+
ms.date: 10/10/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -55,11 +55,11 @@ Be sure you have the correct role to assign profiles. For more information, see
5555
2. Select **Devices** > **Configuration profiles**. All the profiles are listed.
5656
3. Select the profile you want to assign > **Properties** > **Assignments** > **Edit**:
5757

58-
:::image type="content" source="./media/device-profile-assign/properties-select-assignments.png" alt-text="Select assignments to deploy the profile to users and groups in Microsoft Intune and Endpoint Manager":::
58+
:::image type="content" source="./media/device-profile-assign/properties-select-assignments.png" alt-text="Screenshot that shows how to select assignments to deploy the profile to users and groups in Microsoft Intune.":::
5959

6060
4. Select **Included groups** or **Excluded groups**, and then choose **Select groups to include**. When you select your groups, you're choosing an Azure AD group. To select multiple groups, hold down the **Ctrl** key, and select your groups.
6161

62-
:::image type="content" source="./media/device-profile-assign/select-included-excluded-groups-profile-assignment.png" alt-text="Include or exclude users and groups when assigning or deploying a profile in Microsoft Intune and Endpoint Manager.":::
62+
:::image type="content" source="./media/device-profile-assign/select-included-excluded-groups-profile-assignment.png" alt-text="Screenshot that shows how to include or exclude users and groups when assigning or deploying a profile in Microsoft Intune.":::
6363

6464
5. Select **Review + Save**. This step doesn't assign your profile.
6565
6. Select **Save**. When you save, your profile is assigned. Your groups will receive your profile settings when the devices check in with the Intune service.
@@ -112,7 +112,7 @@ To summarize, use user groups when you want your settings and rules to always go
112112

113113
The policy settings for Windows devices are based on the [configuration service providers (CSPs)](/windows/client-management/mdm/configuration-service-provider-reference). These settings map to registry keys or files on the devices.
114114

115-
Endpoint Manager exposes these CSPs so you can configure these settings and assign them to your Windows devices. These settings are configurable using the built-in templates and using the [settings catalog](settings-catalog.md). In the settings catalog, you'll see that some settings apply to the user scope and some settings apply to the device scope.
115+
Intune exposes these CSPs so you can configure these settings and assign them to your Windows devices. These settings are configurable using the built-in templates and using the [settings catalog](settings-catalog.md). In the settings catalog, you'll see that some settings apply to the user scope and some settings apply to the device scope.
116116

117117
For information on how user scoped and device scoped settings are applied to Windows devices, go to [Settings catalog: Device scope vs. user scope settings](settings-catalog.md#device-scope-vs-user-scope-settings).
118118

@@ -154,7 +154,7 @@ Use the following matrix to understand support for excluding groups:
154154
- ❌: Not supported
155155
- ❕ : Partially supported
156156

157-
:::image type="content" source="./media/device-profile-assign/include-exclude-user-device-groups-matrix.png" alt-text="Supported options include or exclude groups from a profile assignment":::
157+
:::image type="content" source="./media/device-profile-assign/include-exclude-user-device-groups-matrix.png" alt-text="Screenshot that shows the supported options to include or exclude groups from a profile assignment.":::
158158

159159
| Scenario | Support|
160160
| --- | --- |

memdocs/intune/configuration/device-profile-create.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 09/20/2022
10+
ms.date: 10/10/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -36,7 +36,7 @@ ms.collection:
3636

3737
Device profiles allow you to add and configure settings, and then push these settings to devices in your organization. You have some options when creating policies:
3838

39-
- **Administrative templates**: On Windows 10/11 devices, these templates are ADMX settings that you configure. If you're familiar with ADMX policies or group policy objects (GPO), then using administrative templates is a natural step to Microsoft Intune and Endpoint Manager.
39+
- **Administrative templates**: On Windows 10/11 devices, these templates are ADMX settings that you configure. If you're familiar with ADMX policies or group policy objects (GPO), then using administrative templates is a natural step to Microsoft Intune.
4040

4141
For more information, see [Administrative Templates](administrative-templates-windows.md)
4242

@@ -68,7 +68,7 @@ This article:
6868

6969
Profiles are created in the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431). In this admin center, select **Devices**. You have the following options:
7070

71-
:::image type="content" source="./media/device-profile-create/devices-overview.png" alt-text="In Endpoint Manager and Microsoft Intune, select Devices to see what you can configure and manage.":::
71+
:::image type="content" source="./media/device-profile-create/devices-overview.png" alt-text="Screenshot that shows how to select Devices to see what you can configure and manage in Microsoft Intune.":::
7272

7373
- **Overview**: Lists the status of your profiles, and provides more details on the profiles you assigned to users and devices.
7474
- **Monitor**: Check the status of your profiles for success or failure, and also view logs on your profiles.
@@ -120,11 +120,11 @@ Then, choose the profile. Depending on the platform you choose, the settings you
120120

121121
For example, if you select **iOS/iPadOS** for the platform, your options look similar to the following profile:
122122

123-
:::image type="content" source="./media/device-profile-create/create-device-profile.png" alt-text="Create an iOS/iPadOS device configuration policy and profile in Endpoint Manager and Microsoft Intune.":::
123+
:::image type="content" source="./media/device-profile-create/create-device-profile.png" alt-text="Screenshot that shows how to create an iOS/iPadOS device configuration policy and profile in Microsoft Intune.":::
124124

125125
If you select **Windows 10 and later** for the platform, your options look similar to the following profile:
126126

127-
:::image type="content" source="./media/device-profile-create/windows-create-device-profile.png" alt-text="Create a Windows device configuration policy and profile in Endpoint Manager and Microsoft Intune.":::
127+
:::image type="content" source="./media/device-profile-create/windows-create-device-profile.png" alt-text="Screenshot that shows how to create a Windows device configuration policy and profile in Microsoft Intune.":::
128128

129129
## Scope tags
130130

@@ -168,7 +168,7 @@ When you assign the profile to the groups, the applicability rules act as a filt
168168

169169
1. Select **Applicability Rules**. You can choose the **Rule**, and **Property**:
170170

171-
:::image type="content" source="./media/device-profile-create/applicability-rules.png" alt-text="Add an applicability rule to a Windows 10 device configuration profile in Endpoint Manager and Microsoft Intune.":::
171+
:::image type="content" source="./media/device-profile-create/applicability-rules.png" alt-text="Screenshot that shows how to add an applicability rule to a Windows 10 device configuration profile in Microsoft Intune.":::
172172

173173
2. In **Rule**, choose if you want to include or exclude users or groups. Your options:
174174

@@ -216,7 +216,7 @@ When creating profiles, consider the following recommendations:
216216

217217
The following image shows an example of a setting that can apply to users, apply to devices, or apply to both:
218218

219-
:::image type="content" source="./media/device-profile-create/setting-applies-to-user-and-device.png" alt-text="Intune admin template that applies to user and devices in Endpoint Manager and Microsoft Intune.":::
219+
:::image type="content" source="./media/device-profile-create/setting-applies-to-user-and-device.png" alt-text="Screenshot that shows an Intune admin template that applies to user and devices in Microsoft Intune.":::
220220

221221
- Every time you create a restrictive policy, communicate this change to your users. For example, if you're changing the passcode requirement from four (4) characters to six (6) characters, let your users know before your assign the policy.
222222

0 commit comments

Comments
 (0)