Skip to content

Commit 0ca9172

Browse files
authored
Merge pull request #252424 from MicrosoftDocs/main
Release arcscvmm pup2 ---scheduled release at 7:45am of 9/21
2 parents 9e7da3d + 0afa95a commit 0ca9172

File tree

63 files changed

+1472
-1124
lines changed

Some content is hidden

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

63 files changed

+1472
-1124
lines changed

articles/active-directory/conditional-access/concept-conditional-access-grant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ See [Require approved client apps for cloud app access with Conditional Access](
136136

137137
In Conditional Access policy, you can require that an [Intune app protection policy](/intune/app-protection-policy) is present on the client app before access is available to the selected applications. These mobile application management (MAM) app protection policies allow you to manage and protect your organization's data within specific applications.
138138

139-
To apply this grant control, Conditional Access requires that the device is registered in Microsoft Entra ID, which requires using a broker app. The broker app can be either Microsoft Authenticator for iOS or Microsoft Company Portal for Android devices. If a broker app isn't installed on the device when the user attempts to authenticate, the user is redirected to the app store to install the broker app. App protection policies are generally available for iOS and Android, and in public preview for Microsoft Edge on Windows. [Windows devices support no more than 3 Microsoft Entra user accounts in the same session](../devices/faq.yml#i-can-t-add-more-than-3-azure-ad-user-accounts-under-the-same-user-session-on-a-windows-10-11-device--why). For more information about how to apply policy to Windows devices, see the article [Require an app protection policy on Windows devices (preview)](how-to-app-protection-policy-windows.md).
139+
To apply this grant control, Conditional Access requires that the device is registered in Microsoft Entra ID, which requires using a broker app. The broker app can be either Microsoft Authenticator for iOS or Microsoft Company Portal for Android devices. If a broker app isn't installed on the device when the user attempts to authenticate, the user is redirected to the app store to install the broker app. App protection policies are generally available for iOS and Android, and in public preview for Microsoft Edge on Windows. [Windows devices support no more than 3 Microsoft Entra user accounts in the same session](../devices/faq.yml#i-can-t-add-more-than-3-microsoft-entra-user-accounts-under-the-same-user-session-on-a-windows-10-11-device--why). For more information about how to apply policy to Windows devices, see the article [Require an app protection policy on Windows devices (preview)](how-to-app-protection-policy-windows.md).
140140

141141
Applications must meet certain requirements to support app protection policies. Developers can find more information about these requirements in the section [Apps you can manage with app protection policies](/mem/intune/apps/app-protection-policy#apps-you-can-manage-with-app-protection-policies).
142142

articles/active-directory/develop/scenario-web-app-call-api-acquire-token.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public async Task<IActionResult> Profile()
6161

6262
// Use the access token to call a protected web API.
6363
HttpClient client = new HttpClient();
64-
client.DefaultRequestHeaders.Add("Authorization", authorizationHeader);
64+
client.DefaultRequestHeaders.Add("Authorization", accessToken);
6565
string json = await client.GetStringAsync(url);
6666
}
6767
```

articles/active-directory/devices/TOC.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
- name: Tutorials
88
expanded: false
99
items:
10-
- name: Azure AD join a new Windows device
10+
- name: Microsoft Entra join a new Windows device
1111
href: device-join-out-of-box.md
1212
- name: Concepts
1313
expanded: true
1414
items:
15-
- name: Azure AD registered devices
15+
- name: Microsoft Entra registered devices
1616
href: concept-device-registration.md
17-
- name: Azure AD joined devices
17+
- name: Microsoft Entra joined devices
1818
href: concept-directory-join.md
19-
- name: Hybrid Azure AD joined devices
19+
- name: Microsoft Entra hybrid joined devices
2020
href: concept-hybrid-join.md
2121
- name: Device registration flows
2222
href: device-registration-how-it-works.md
@@ -27,36 +27,36 @@
2727
- name: How-to guides
2828
expanded: false
2929
items:
30-
- name: Plan your Azure AD device deployment
30+
- name: Plan your Microsoft Entra device deployment
3131
href: plan-device-deployment.md
32-
- name: Azure AD join
32+
- name: Microsoft Entra join
3333
expanded: false
3434
items:
35-
- name: Plan your Azure AD join implementation
35+
- name: Plan your Microsoft Entra join implementation
3636
href: device-join-plan.md
37-
- name: Assign local admins to Azure AD joined devices
37+
- name: Assign local admins to Microsoft Entra joined devices
3838
href: assign-local-admin.md
39-
- name: Hybrid Azure AD join
39+
- name: Microsoft Entra hybrid join
4040
expanded: false
4141
items:
42-
- name: Plan your hybrid Azure AD join implementation
42+
- name: Plan your Microsoft Entra hybrid join implementation
4343
href: hybrid-join-plan.md
44-
- name: Targeted hybrid Azure AD join deployment
44+
- name: Targeted Microsoft Entra hybrid join deployment
4545
href: hybrid-join-control.md
46-
- name: Configure hybrid Azure AD join
46+
- name: Configure Microsoft Entra hybrid join
4747
href: how-to-hybrid-join.md
48-
- name: Verifying hybrid Azure AD join
48+
- name: Verifying Microsoft Entra hybrid join
4949
href: how-to-hybrid-join-verify.md
50-
- name: Troubleshoot hybrid Azure AD join
50+
- name: Troubleshoot Microsoft Entra hybrid join
5151
expanded: false
5252
items:
53-
- name: Troubleshoot hybrid Azure AD joined Windows current version
53+
- name: Troubleshoot Microsoft Entra hybrid joined Windows current version
5454
href: troubleshoot-hybrid-join-windows-current.md
5555
- name: Troubleshoot pending device state
5656
href: /troubleshoot/azure/active-directory/pending-devices?toc=/azure/active-directory/fundamentals/toc.json
5757
- name: Troubleshoot using dsregcmd
5858
href: troubleshoot-device-dsregcmd.md
59-
- name: Troubleshoot hybrid Azure AD joined down level Windows devices
59+
- name: Troubleshoot Microsoft Entra hybrid joined down level Windows devices
6060
href: troubleshoot-hybrid-join-windows-legacy.md
6161
- name: Local Administrator Password Solution
6262
href: howto-manage-local-admin-passwords.md
@@ -69,9 +69,9 @@
6969
href: troubleshoot-primary-refresh-token.md
7070
- name: Manage stale devices
7171
href: manage-stale-devices.md
72-
- name: Azure Linux VMs and Azure AD
72+
- name: Azure Linux VMs and Microsoft Entra ID
7373
href: howto-vm-sign-in-azure-ad-linux.md
74-
- name: Azure Windows VMs and Azure AD
74+
- name: Azure Windows VMs and Microsoft Entra ID
7575
href: howto-vm-sign-in-azure-ad-windows.md
7676
- name: Virtual desktop infrastructure
7777
href: howto-device-identity-virtual-desktop-infrastructure.md
@@ -93,10 +93,10 @@
9393
href: troubleshoot-mac-sso-extension-plugin.md
9494
- name: Reference
9595
items:
96-
- name: Hybrid Azure AD join reference
96+
- name: Microsoft Entra hybrid join reference
9797
expanded: false
9898
items:
99-
- name: Configure hybrid Azure AD join manually
99+
- name: Configure Microsoft Entra hybrid join manually
100100
href: hybrid-join-manual.md
101101
- name: Enable older operating systems
102102
href: how-to-hybrid-join-downlevel.md

0 commit comments

Comments
 (0)