Skip to content

Commit 753a8e4

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/memdocs (branch main)
2 parents da36d21 + b9f1066 commit 753a8e4

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

memdocs/intune/protect/microsoft-tunnel-conditional-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Before you can configure Conditional Access policies for the tunnel, you must en
3737

3838
1. [Download and install](/powershell/azure/active-directory/install-adv2?view=azureadps-2.0&preserve-view=true) the **AzureAD PowerShell module**.
3939

40-
2. Download the PowerShell script named **mst-CA-readiness.ps1** from aka.ms/mst-ca-provisioning.
40+
2. Download the PowerShell script named **mst-ca-provisioning.ps1** from aka.ms/mst-ca-provisioning.
4141

4242
3. Using credentials that have the Azure Role permissions [equivalent to **Application Administrator**](/azure/active-directory/users-groups-roles/directory-assign-admin-roles#application-administrator-permissions), run the script from any location in your environment, to provision your tenant.
4343

memdocs/intune/protect/windows-10-update-rings.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,15 @@ The following prerequisites must be met to use Windows updates for Windows 10/11
6262

6363
For more information, see [Manage Windows Holographic](../fundamentals/windows-holographic-for-business.md).
6464

65-
> [!NOTE]
66-
> **Unsupported versions and editions**:
67-
> *Windows 10/11 Enterprise LTSC*: Windows Update for Business (WUfB) does not support the *Long Term Service Channel* release. Plan to use alternative patching methods, like WSUS or Configuration Manager.
65+
- Windows 10/11 Enterprise LTSC - While LTSC is supported, the following ring controls are not supported for LTSC:
66+
- [Pause](../intune/protect/windows-10-update-rings.md#pause) of *Feature* updates
67+
- [Feature Update Deferral period (days)](../protect/windows-update-settings.md#update-settings)
68+
- [Set feature update uninstall period (2 - 60 days)](../protect/windows-update-settings.md#update-setting)
69+
- [Enable pre-release builds](../protect/windows-update-settings.md#update-setting), which includes the following build options:
70+
- Windows Insider – Release Preview
71+
- Beta Channel
72+
- Dev Channel
73+
- [Use deadline settings](../protect/windows-update-settings.md#user-experience-settings) for *Feature* updates.
6874

6975
## Create and assign update rings
7076

0 commit comments

Comments
 (0)