Skip to content

Commit e2a4e80

Browse files
committed
Merge branch 'main' into release-intune-2112
2 parents 7f7a3e0 + 093d5f8 commit e2a4e80

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

memdocs/intune/protect/certificate-connector-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Use the following procedure to both configure a new connector and modify a previ
101101
- **SYSTEM**
102102
- **Domain user account** – Use any domain user account that is an administrator on the Windows Server.
103103

104-
4. On the *Proxy* page, add details for your proxy server if you require a proxy for internet access. For example, *http://proxy.contoso.com*.
104+
4. On the *Proxy* page, add details for your proxy server if you require a proxy for internet access. For example, `http://proxy.contoso.com`.
105105

106106
5. On the *Prerequisites* page, the wizard runs several checks on the server before the configuration can begin. Review and resolve any errors or warnings before you continue.
107107

memdocs/intune/protect/device-compliance-partners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Sign in to the Azure portal and go to **Azure AD** > **Devices** > [**All device
139139

140140
Use additional documentation from your third-party partner to create compliance policies for devices.
141141

142-
- [Blackberry UEM](https://docs.blackberry.com/en/endpoint-management/blackberry-uem/12_15/installation-configuration/cloud-configuration/get15233768326701/Configure-Azure-AD-Conditional-Access)
142+
- [Blackberry UEM](https://docs.blackberry.com/en/id-comm-collab/blackberry-workspaces/blackberry-workspaces-plug-in-for-blackberry-uem/4_9/compatibility-matrix/imm1460398825659/ioz1460399956336)
143143
- [Citrix Endpoint Management - Integrate with Azure AD Conditional Access](https://docs.citrix.com/en-us/citrix-endpoint-management/prepare-to-enroll-devices-and-deliver-resources.html#integrate-with-azure-ad-conditional-access)
144144
- [MobileIron Device Compliance Cloud](https://forums.ivanti.com/s/article/MobileIron-Cloud-Azure-Device-Compliance-for-iOS-and-Android)
145145
- [VMware Workspace ONE UEM](https://docs.vmware.com/en/VMware-Workspace-ONE-UEM/services/Directory_Service_Integration/GUID-800FB831-AA66-4094-8F5A-FA5899A3C70C.html)

memdocs/intune/protect/windows-10-feature-updates.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: brenduns
88
ms.author: brenduns
99
manager: dougeby
10-
ms.date: 10/04/2021
10+
ms.date: 12/07/2021
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: protect
@@ -102,7 +102,17 @@ The following are prerequisites for Intune's Feature updates for Windows 10 and
102102

103103
- If you co-manage devices with Configuration Manager, feature updates policies might not immediately take effect on devices when you newly configure the [Windows Update policies workload](../../configmgr/comanage/workloads.md#windows-update-policies) to Intune. This delay is temporary but can initially result in devices updating to a later feature update version than is configured in the policy.
104104

105-
To prevent this initial delay from impacting your co-managed devices, configure a [Feature updates for Windows 10 and later](../protect/windows-10-feature-updates.md) policy and target the policy to your devices before you configure them for co-management or you shift the Windows Update workload to Intune. You can validate whether a device is enrolled for the feature update profile by checking the [Windows feature update report](../protect/windows-update-compliance-reports.md#use-the-windows-10-and-later-feature-updates-organizational-report) under the Reporting node in the Microsoft Endpoint Management admin console.
105+
To prevent this initial delay from impacting your co-managed devices:
106+
107+
1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
108+
2. Go to **Devices** > **Windows** > **Feature updates for Windows 10 and later** > **Create profile**.
109+
3. For **Deployment settings**, enter a meaningful name and a description for the policy. Then, Specify the feature update you want devices to be running.
110+
4. Complete the policy configuration, including assigning the policy to devices. The policy deploys to devices, though any device that already has the version you’ve selected, or a newer version, won’t be offered the update.
111+
112+
Monitor the report for the policy. To do so, go to **Reports** > **Windows Updates** > **Reports** Tab > **Feature Updates report**. Select the policy you created and then generate the report.
113+
114+
5. Devices that have a state of *OfferReady* or later, are enrolled for feature updates and protected from updating to anything newer than the update you specified in step 3. See, [Use the Windows 10 and later feature updates (Organizational) report](../protect/windows-update-compliance-reports.md#use-the-windows-10-and-later-feature-updates-organizational-report).
115+
6. With devices enrolled for updates and protected, you can safely change the *Windows Update policies* workload from Configuration Manager to Intune. See, [Switch workloads to Intune](/configmgr/comanage/how-to-switch-workloads) in the co-management documentation.
106116

107117
- When the device checks in to the Windows Update service, the device's group membership is validated against the security groups assigned to the feature updates policy settings for any feature update holds.
108118

0 commit comments

Comments
 (0)