Skip to content

Commit c8faddd

Browse files
authored
Merge pull request #194058 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 5860739 + 35b1f20 commit c8faddd

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,18 @@ This setting works with all browsers. However, to satisfy a device policy, like
107107
| Windows 10 + | Microsoft Edge, [Chrome](#chrome-support), [Firefox 91+](https://support.mozilla.org/kb/windows-sso) |
108108
| Windows Server 2022 | Microsoft Edge, [Chrome](#chrome-support) |
109109
| Windows Server 2019 | Microsoft Edge, [Chrome](#chrome-support) |
110-
| iOS | Microsoft Edge, Safari |
110+
| iOS | Microsoft Edge, Safari (see the notes) |
111111
| Android | Microsoft Edge, Chrome |
112112
| macOS | Microsoft Edge, Chrome, Safari |
113113

114114
These browsers support device authentication, allowing the device to be identified and validated against a policy. The device check fails if the browser is running in private mode or if cookies are disabled.
115115

116116
> [!NOTE]
117-
> Edge 85+ requires the user to be signed in to the browser to properly pass device identity. Otherwise, it behaves like Chrome without the accounts extension. This sign-in might not occur automatically in a Hybrid Azure AD Join scenario.
117+
> Edge 85+ requires the user to be signed in to the browser to properly pass device identity. Otherwise, it behaves like Chrome without the accounts extension. This sign-in might not occur automatically in a Hybrid Azure AD Join scenario.
118+
>
118119
> Safari is supported for device-based Conditional Access, but it can not satisfy the **Require approved client app** or **Require app protection policy** conditions. A managed browser like Microsoft Edge will satisfy approved client app and app protection policy requirements.
120+
> On iOS with 3rd party MDM solution only Microsoft Edge browser supports device policy.
121+
>
119122
> [Firefox 91+](https://support.mozilla.org/kb/windows-sso) is supported for device-based Conditional Access, but "Allow Windows single sign-on for Microsoft, work, and school accounts" needs to be enabled.
120123
121124
#### Why do I see a certificate prompt in the browser

articles/active-directory/hybrid/plan-connect-design-concepts.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ When you are selecting the attribute for providing the value of UPN to be used i
180180

181181
In express settings, the assumed choice for the attribute is userPrincipalName. If the userPrincipalName attribute does not contain the value you want your users to sign in to Azure, then you must choose **Custom Installation**.
182182

183+
>[!NOTE]
184+
>It's recommended as a best practice that the UPN prefix contains more than one character.
185+
183186
### Custom domain state and UPN
184187
It is important to ensure that there is a verified domain for the UPN suffix.
185188

articles/storage/blobs/lifecycle-management-policy-configure.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@ To define a lifecycle management policy with an Azure Resource Manager template,
211211

212212
A lifecycle management policy must be read or written in full. Partial updates are not supported.
213213

214+
215+
> [!NOTE]
216+
> Each rule can have up to 10 case-sensitive prefixes and up to 10 blob index tag conditions.
217+
214218
> [!NOTE]
215219
> If you enable firewall rules for your storage account, lifecycle management requests may be blocked. You can unblock these requests by providing exceptions for trusted Microsoft services. For more information, see the **Exceptions** section in [Configure firewalls and virtual networks](../common/storage-network-security.md#exceptions).
216220

0 commit comments

Comments
 (0)